Skip to content

Commit c21ddf5

Browse files
committed
WL#11345: Increase default value of optimizer_trace_max_mem_size
The value of this variable is increased from 16kB to 1MB.
1 parent b080553 commit c21ddf5

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

mysql-test/r/mysqld--help-notwin.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,i
14821482
optimizer-trace
14831483
optimizer-trace-features greedy_search=on,range_optimizer=on,dynamic_range=on,repeated_subselect=on
14841484
optimizer-trace-limit 1
1485-
optimizer-trace-max-mem-size 16384
1485+
optimizer-trace-max-mem-size 1048576
14861486
optimizer-trace-offset -1
14871487
parser-max-mem-size 18446744073709551615
14881488
password-history 0

mysql-test/r/mysqld--help-win.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,i
14771477
optimizer-trace
14781478
optimizer-trace-features greedy_search=on,range_optimizer=on,dynamic_range=on,repeated_subselect=on
14791479
optimizer-trace-limit 1
1480-
optimizer-trace-max-mem-size 16384
1480+
optimizer-trace-max-mem-size 1048576
14811481
optimizer-trace-offset -1
14821482
parser-max-mem-size 18446744073709551615
14831483
password-history 0

mysql-test/suite/sys_vars/r/optimizer_trace_max_mem_size_basic.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SELECT @@global.optimizer_trace_max_mem_size;
22
@@global.optimizer_trace_max_mem_size
3-
16384
3+
1048576
44
SET @@global.optimizer_trace_max_mem_size=5;
55
show global variables like 'optimizer_trace_max_mem_size';
66
Variable_name Value
@@ -10,13 +10,13 @@ VARIABLE_NAME VARIABLE_VALUE
1010
optimizer_trace_max_mem_size 5
1111
select @@session.optimizer_trace_max_mem_size;
1212
@@session.optimizer_trace_max_mem_size
13-
16384
13+
1048576
1414
show session variables like 'optimizer_trace_max_mem_size';
1515
Variable_name Value
16-
optimizer_trace_max_mem_size 16384
16+
optimizer_trace_max_mem_size 1048576
1717
select * from performance_schema.session_variables where variable_name='optimizer_trace_max_mem_size';
1818
VARIABLE_NAME VARIABLE_VALUE
19-
optimizer_trace_max_mem_size 16384
19+
optimizer_trace_max_mem_size 1048576
2020
set session optimizer_trace_max_mem_size=10;
2121
select @@session.optimizer_trace_max_mem_size;
2222
@@session.optimizer_trace_max_mem_size
@@ -57,10 +57,10 @@ optimizer_trace_max_mem_size 5
5757
set global optimizer_trace_max_mem_size=default;
5858
select @@global.optimizer_trace_max_mem_size;
5959
@@global.optimizer_trace_max_mem_size
60-
16384
60+
1048576
6161
show global variables like 'optimizer_trace_max_mem_size';
6262
Variable_name Value
63-
optimizer_trace_max_mem_size 16384
63+
optimizer_trace_max_mem_size 1048576
6464
set optimizer_trace_max_mem_size=1.1;
6565
ERROR 42000: Incorrect argument type to variable 'optimizer_trace_max_mem_size'
6666
set optimizer_trace_max_mem_size="foobar";

sql/sys_vars.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3154,7 +3154,7 @@ static Sys_var_ulong Sys_optimizer_trace_max_mem_size(
31543154
"optimizer_trace_max_mem_size",
31553155
"Maximum allowed cumulated size of stored optimizer traces",
31563156
SESSION_VAR(optimizer_trace_max_mem_size), CMD_LINE(REQUIRED_ARG),
3157-
VALID_RANGE(0, ULONG_MAX), DEFAULT(1024*16), BLOCK_SIZE(1));
3157+
VALID_RANGE(0, ULONG_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1));
31583158

31593159
#endif
31603160

0 commit comments

Comments
 (0)