From: Mayank Prasad
Date: August 29 2012 10:28am
Subject: bzr push into mysql-trunk branch (mayank.prasad:4339 to 4340) WL#6372
List-Archive: http://lists.mysql.com/commits/144648
Message-Id: <201208291028.q7TASQH6013074@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4340 Mayank Prasad	2012-08-29
      wl#6372 : Post-Iris changes to Server defaults
                              
      Details:
       - Fixing MTR Test cases part3.

    added:
      mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func-master.opt
    modified:
      mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result*
      mysql-test/suite/sys_vars/r/thread_cache_size_basic.result
 4339 Mayank Prasad	2012-08-29
      wl#6372 : Post-Iris changes to Server defaults
                        
      Details:
       - Fixing MTR Test cases part2.

    added:
      mysql-test/suite/sys_vars/t/query_cache_limit_func-master.opt
      mysql-test/suite/sys_vars/t/query_cache_type_basic-master.opt
      mysql-test/suite/sys_vars/t/query_cache_type_func-master.opt
      mysql-test/t/query_cache_ps_ps_prot-master.opt
      mysql-test/t/user_limits-master.opt
    modified:
      mysql-test/suite/innodb/t/innodb_mysql-master.opt
      mysql-test/suite/sys_vars/r/query_cache_type_basic.result
      mysql-test/t/mysql_client_test-master.opt
=== 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	revid:mayank.prasad@stripped
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result	revid:mayank.prasad@stripped
@@ -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
-262144
+32768
 SET @@session.sort_buffer_size = 2000;
 SET @@session.sort_buffer_size = DEFAULT;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
-262144
+32768
 '#--------------------FN_DYNVARS_151_02-------------------------#'
 SET @@global.sort_buffer_size = DEFAULT;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
-262144
+32768
 SET @@session.sort_buffer_size = DEFAULT;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
-262144
+32768
 '#--------------------FN_DYNVARS_151_03-------------------------#'
 SET @@global.sort_buffer_size = 32776;
 SELECT @@global.sort_buffer_size;

=== modified file 'mysql-test/suite/sys_vars/r/thread_cache_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result	revid:mayank.prasad@stripped
+++ b/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result	revid:mayank.prasad@stripped
@@ -1,24 +1,24 @@
 SET @start_global_value = @@global.thread_cache_size;
 SELECT @start_global_value;
 @start_global_value
-0
+9
 select @@global.thread_cache_size;
 @@global.thread_cache_size
-0
+9
 select @@session.thread_cache_size;
 ERROR HY000: Variable 'thread_cache_size' is a GLOBAL variable
 show global variables like 'thread_cache_size';
 Variable_name	Value
-thread_cache_size	0
+thread_cache_size	9
 show session variables like 'thread_cache_size';
 Variable_name	Value
-thread_cache_size	0
+thread_cache_size	9
 select * from information_schema.global_variables where variable_name='thread_cache_size';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_CACHE_SIZE	0
+THREAD_CACHE_SIZE	9
 select * from information_schema.session_variables where variable_name='thread_cache_size';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_CACHE_SIZE	0
+THREAD_CACHE_SIZE	9
 set global thread_cache_size=1;
 select @@global.thread_cache_size;
 @@global.thread_cache_size
@@ -50,4 +50,4 @@ select @@global.thread_cache_size;
 SET @@global.thread_cache_size = @start_global_value;
 SELECT @@global.thread_cache_size;
 @@global.thread_cache_size
-0
+9

=== added file 'mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func-master.opt'
--- a/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func-master.opt	revid:mayank.prasad@stripped
@@ -0,0 +1 @@
+--query_cache_type=1

No bundle (reason: useless for push emails).