From: Sneha Modi Date: August 16 2011 10:41am Subject: bzr push into mysql-5.5 branch (sneha.modi:3496 to 3497) List-Archive: http://lists.mysql.com/commits/140648 Message-Id: <201108161041.p7GAfwTv001275@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3497 Sneha Modi 2011-08-16 Fixing a few broken tests. modified: mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test 3496 Joerg Bruehe 2011-08-15 [merge] Null-merge, conflict on "configure.in" which is gone from 5.5. No change. === modified file 'mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result' --- a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result 2009-08-07 20:04:53 +0000 +++ b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result 2011-08-16 10:36:34 +0000 @@ -1,13 +1,29 @@ +SET @start_global_value = @@global.innodb_file_per_table; +SELECT @start_global_value; +@start_global_value +0 '#---------------------BS_STVARS_028_01----------------------#' SELECT COUNT(@@GLOBAL.innodb_file_per_table); COUNT(@@GLOBAL.innodb_file_per_table) 1 1 Expected '#---------------------BS_STVARS_028_02----------------------#' -SELECT COUNT(@@GLOBAL.innodb_file_per_table); -COUNT(@@GLOBAL.innodb_file_per_table) +SET @@global.innodb_file_per_table = 0; +SELECT @@global.innodb_file_per_table; +@@global.innodb_file_per_table +0 +SET @@global.innodb_file_per_table ='On' ; +SELECT @@global.innodb_file_per_table; +@@global.innodb_file_per_table +1 +SET @@global.innodb_file_per_table ='Off' ; +SELECT @@global.innodb_file_per_table; +@@global.innodb_file_per_table +0 +SET @@global.innodb_file_per_table = 1; +SELECT @@global.innodb_file_per_table; +@@global.innodb_file_per_table 1 -1 Expected '#---------------------BS_STVARS_028_03----------------------#' SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -47,4 +63,7 @@ COUNT(@@GLOBAL.innodb_file_per_table) 1 Expected SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; ERROR 42S22: Unknown column 'innodb_file_per_table' in 'field list' -Expected error 'Readonly variable' +SET @@global.innodb_file_per_table = @start_global_value; +SELECT @@global.innodb_file_per_table; +@@global.innodb_file_per_table +0 === modified file 'mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result' --- a/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result 2009-08-07 20:04:53 +0000 +++ b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result 2011-08-16 10:36:34 +0000 @@ -1,13 +1,21 @@ +SET @start_global_value=@@global.innodb_lock_wait_timeout; +SELECT @start_global_value; +@start_global_value +50 '#---------------------BS_STVARS_032_01----------------------#' SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); COUNT(@@GLOBAL.innodb_lock_wait_timeout) 1 1 Expected '#---------------------BS_STVARS_032_02----------------------#' -SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); -COUNT(@@GLOBAL.innodb_lock_wait_timeout) -1 -1 Expected +SET global innodb_lock_wait_timeout=60; +SELECT @@global.innodb_lock_wait_timeout; +@@global.innodb_lock_wait_timeout +60 +SET session innodb_lock_wait_timeout=60; +SELECT @@session.innodb_lock_wait_timeout; +@@session.innodb_lock_wait_timeout +60 '#---------------------BS_STVARS_032_03----------------------#' SELECT @@GLOBAL.innodb_lock_wait_timeout = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -47,4 +55,7 @@ COUNT(@@GLOBAL.innodb_lock_wait_timeout) 1 Expected SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout; ERROR 42S22: Unknown column 'innodb_lock_wait_timeout' in 'field list' -Expected error 'Readonly variable' +SET @@global.innodb_lock_wait_timeout = @start_global_value; +SELECT @@global.innodb_lock_wait_timeout; +@@global.innodb_lock_wait_timeout +50 === modified file 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test' --- a/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test 2008-12-19 15:12:15 +0000 +++ b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test 2011-08-16 10:36:34 +0000 @@ -1,8 +1,7 @@ ################# mysql-test\t\innodb_autoinc_lock_mode_basic.test ############ # # # Variable Name: innodb_autoinc_lock_mode # -# Scope: GLOBAL # -# Access Type: Dynamic # +# Access Type: Static # # Data Type: Numeric # # Default Value: 1 # # Range: 0,1,2 # === modified file 'mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test' --- a/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test 2010-07-15 11:13:30 +0000 +++ b/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test 2011-08-16 10:36:34 +0000 @@ -3,9 +3,9 @@ # Variable Name: innodb_fast_shutdown # # Scope: GLOBAL # # Access Type: Dynamic # -# Data Type: boolean # +# Data Type: numeric # # Default Value: 1 # -# Valid Values: 0,1 # +# Valid Values: 0,1,2 # # # # # # Creation Date: 2008-02-20 # === modified file 'mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test' --- a/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test 2009-08-07 20:04:53 +0000 +++ b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test 2011-08-16 10:36:34 +0000 @@ -4,7 +4,7 @@ # # # Variable Name: innodb_file_per_table # # Scope: Global # -# Access Type: Static # +# Access Type: Dynamic # # Data Type: boolean # # # # # @@ -24,6 +24,10 @@ --source include/have_innodb.inc +SET @start_global_value = @@global.innodb_file_per_table; +SELECT @start_global_value; + + --echo '#---------------------BS_STVARS_028_01----------------------#' #################################################################### # Displaying default value # @@ -37,11 +41,17 @@ SELECT COUNT(@@GLOBAL.innodb_file_per_ta # Check if Value can set # #################################################################### -SELECT COUNT(@@GLOBAL.innodb_file_per_table); ---echo 1 Expected +SET @@global.innodb_file_per_table = 0; +SELECT @@global.innodb_file_per_table; +SET @@global.innodb_file_per_table ='On' ; +SELECT @@global.innodb_file_per_table; +SET @@global.innodb_file_per_table ='Off' ; +SELECT @@global.innodb_file_per_table; +SET @@global.innodb_file_per_table = 1; +SELECT @@global.innodb_file_per_table; --echo '#---------------------BS_STVARS_028_03----------------------#' ################################################################# @@ -93,6 +103,10 @@ SELECT COUNT(@@GLOBAL.innodb_file_per_ta --Error ER_BAD_FIELD_ERROR SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; ---echo Expected error 'Readonly variable' +# +# Cleanup +# +SET @@global.innodb_file_per_table = @start_global_value; +SELECT @@global.innodb_file_per_table; === modified file 'mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test' --- a/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test 2010-01-29 06:33:00 +0000 +++ b/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test 2011-08-16 10:36:34 +0000 @@ -54,5 +54,9 @@ select * from information_schema.global_ set global innodb_io_capacity=100; select @@global.innodb_io_capacity; +# +# cleanup +# + SET @@global.innodb_io_capacity = @start_global_value; SELECT @@global.innodb_io_capacity; === modified file 'mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test' --- a/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test 2009-08-07 20:04:53 +0000 +++ b/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test 2011-08-16 10:36:34 +0000 @@ -3,13 +3,13 @@ ################## mysql-test\t\innodb_lock_wait_timeout_basic.test ########### # # # Variable Name: innodb_lock_wait_timeout # -# Scope: Global # -# Access Type: Static # +# Scope: Global , Session # +# Access Type: Dynamic # # Data Type: numeric # # # # # # Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # +# Author : Sharique Abdullah # # # # # # Description:Test Cases of Dynamic System Variable innodb_lock_wait_timeout # @@ -24,6 +24,9 @@ --source include/have_innodb.inc +SET @start_global_value=@@global.innodb_lock_wait_timeout; +SELECT @start_global_value; + --echo '#---------------------BS_STVARS_032_01----------------------#' #################################################################### # Displaying default value # @@ -37,11 +40,10 @@ SELECT COUNT(@@GLOBAL.innodb_lock_wait_t # Check if Value can set # #################################################################### -SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); ---echo 1 Expected - - - +SET global innodb_lock_wait_timeout=60; +SELECT @@global.innodb_lock_wait_timeout; +SET session innodb_lock_wait_timeout=60; +SELECT @@session.innodb_lock_wait_timeout; --echo '#---------------------BS_STVARS_032_03----------------------#' ################################################################# @@ -89,6 +91,10 @@ SELECT COUNT(@@GLOBAL.innodb_lock_wait_t --Error ER_BAD_FIELD_ERROR SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout; ---echo Expected error 'Readonly variable' +# +# Cleanup +# +SET @@global.innodb_lock_wait_timeout = @start_global_value; +SELECT @@global.innodb_lock_wait_timeout; === modified file 'mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test' --- a/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test 2009-02-17 12:24:09 +0000 +++ b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test 2011-08-16 10:36:34 +0000 @@ -4,8 +4,8 @@ # Scope: GLOBAL # # Access Type: Dynamic # # Data Type: Numeric # -# Default Value: 90 # -# Range: 0-1000 # +# Default Value: 75 # +# Range: 0-99 # # # # # # Creation Date: 2008-02-07 # No bundle (reason: useless for push emails).