From: Tor Didriksen Date: October 28 2011 9:26am Subject: bzr push into mysql-trunk branch (tor.didriksen:3432 to 3434) Bug#11747423 List-Archive: http://lists.mysql.com/commits/141632 X-Bug: 11747423 Message-Id: <201110280926.p9S9QFnm011649@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3434 Tor Didriksen 2011-10-28 Bug#11747423 post-push fix: change of plans modified: mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result 3433 Tor Didriksen 2011-10-28 Default value for sort_buffer_size changed from 2M to 256K modified: mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result* mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result sql/sql_const.h sql/sys_vars.cc 3432 Marc Alff 2011-10-28 Merge cleanup, fixed tree name modified: .bzr-mysql/default.conf === modified file 'mysql-test/r/mysqld--help-notwin.result' --- a/mysql-test/r/mysqld--help-notwin.result 2011-10-19 06:13:35 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2011-10-28 09:18:35 +0000 @@ -1036,7 +1036,7 @@ slave-transaction-retries 10 slave-type-conversions slow-launch-time 2 slow-query-log FALSE -sort-buffer-size 2097152 +sort-buffer-size 262144 sporadic-binlog-dump-fail FALSE sql-mode symbolic-links FALSE === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2011-10-19 06:13:35 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2011-10-28 09:18:35 +0000 @@ -1042,7 +1042,7 @@ slave-transaction-retries 10 slave-type-conversions slow-launch-time 2 slow-query-log FALSE -sort-buffer-size 2097152 +sort-buffer-size 262144 sporadic-binlog-dump-fail FALSE sql-mode symbolic-links FALSE === modified file 'mysql-test/suite/opt_trace/r/range_no_prot.result' --- a/mysql-test/suite/opt_trace/r/range_no_prot.result 2011-10-19 06:13:35 +0000 +++ b/mysql-test/suite/opt_trace/r/range_no_prot.result 2011-10-28 09:25:48 +0000 @@ -5299,8 +5299,7 @@ EXPLAIN SELECT v FROM t1 WHERE i1 = 1 AN }, { "access_type": "range", - "rows": 1, - "cost": 1.1, + "cause": "covering_index_better_than_full_scan", "chosen": false } ] /* considered_access_paths */ @@ -5860,8 +5859,7 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b }, { "access_type": "range", - "rows": 1, - "cost": 1.2, + "cause": "covering_index_better_than_full_scan", "chosen": false } ] /* considered_access_paths */ === modified file 'mysql-test/suite/opt_trace/r/range_ps_prot.result' --- a/mysql-test/suite/opt_trace/r/range_ps_prot.result 2011-10-19 06:13:35 +0000 +++ b/mysql-test/suite/opt_trace/r/range_ps_prot.result 2011-10-28 09:25:48 +0000 @@ -5299,8 +5299,7 @@ EXPLAIN SELECT v FROM t1 WHERE i1 = 1 AN }, { "access_type": "range", - "rows": 1, - "cost": 1.1, + "cause": "covering_index_better_than_full_scan", "chosen": false } ] /* considered_access_paths */ @@ -5860,8 +5859,7 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b }, { "access_type": "range", - "rows": 1, - "cost": 1.2, + "cause": "covering_index_better_than_full_scan", "chosen": false } ] /* considered_access_paths */ === modified file 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result' (properties changed: -x to +x) --- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result 2009-12-22 09:35:56 +0000 +++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result 2011-10-28 09:18:35 +0000 @@ -5,21 +5,21 @@ SET @@global.sort_buffer_size = 1000; SET @@global.sort_buffer_size = DEFAULT; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -2097152 +262144 SET @@session.sort_buffer_size = 2000; SET @@session.sort_buffer_size = DEFAULT; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size -2097152 +262144 '#--------------------FN_DYNVARS_151_02-------------------------#' SET @@global.sort_buffer_size = DEFAULT; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -2097152 +262144 SET @@session.sort_buffer_size = DEFAULT; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size -2097152 +262144 '#--------------------FN_DYNVARS_151_03-------------------------#' SET @@global.sort_buffer_size = 32776; SELECT @@global.sort_buffer_size; === modified file 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result' --- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result 2009-12-22 09:35:56 +0000 +++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result 2011-10-28 09:18:35 +0000 @@ -5,21 +5,21 @@ SET @@global.sort_buffer_size = 1000; SET @@global.sort_buffer_size = DEFAULT; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -2097152 +262144 SET @@session.sort_buffer_size = 2000; SET @@session.sort_buffer_size = DEFAULT; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size -2097152 +262144 '#--------------------FN_DYNVARS_151_02-------------------------#' SET @@global.sort_buffer_size = DEFAULT; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -2097152 +262144 SET @@session.sort_buffer_size = DEFAULT; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size -2097152 +262144 '#--------------------FN_DYNVARS_151_03-------------------------#' SET @@global.sort_buffer_size = 32776; SELECT @@global.sort_buffer_size; === modified file 'sql/sql_const.h' --- a/sql/sql_const.h 2011-06-30 15:50:45 +0000 +++ b/sql/sql_const.h 2011-10-28 09:18:35 +0000 @@ -67,8 +67,8 @@ #define MAX_SELECT_NESTING (sizeof(nesting_map)*8-1) -#define MAX_SORT_MEMORY 2048*1024 -#define MIN_SORT_MEMORY 32*1024 +#define DEFAULT_SORT_MEMORY (256U* 1024U) +#define MIN_SORT_MEMORY (32U * 1024U) /* Some portable defines */ === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2011-10-05 13:16:38 +0000 +++ b/sql/sys_vars.cc 2011-10-28 09:18:35 +0000 @@ -2258,7 +2258,7 @@ static Sys_var_ulong Sys_sort_buffer( "sort_buffer_size", "Each thread that needs to do a sort allocates a buffer of this size", SESSION_VAR(sortbuff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(MIN_SORT_MEMORY, ULONG_MAX), DEFAULT(MAX_SORT_MEMORY), + VALID_RANGE(MIN_SORT_MEMORY, ULONG_MAX), DEFAULT(DEFAULT_SORT_MEMORY), BLOCK_SIZE(1)); export sql_mode_t expand_sql_mode(sql_mode_t sql_mode) No bundle (reason: useless for push emails).