diff mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test.orig mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test --- mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test.orig 2008-10-07 11:32:30.000000000 +0300 +++ mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test 2008-10-07 11:52:14.000000000 +0300 @@ -37,10 +37,6 @@ # Check if Value can set # #################################################################### ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_file_per_table=1; ---echo Expected error 'Read only variable' - SELECT COUNT(@@GLOBAL.innodb_file_per_table); --echo 1 Expected @@ -52,7 +48,7 @@ # Check if the value in GLOBAL Table matches value in variable # ################################################################# -SELECT @@GLOBAL.innodb_file_per_table = VARIABLE_VALUE +SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_file_per_table'; --echo 1 Expected diff mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result.orig mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result --- mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result.orig 2008-10-07 11:32:02.000000000 +0300 +++ mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result 2008-10-07 11:52:47.000000000 +0300 @@ -4,18 +4,15 @@ 1 1 Expected '#---------------------BS_STVARS_028_02----------------------#' -SET @@GLOBAL.innodb_file_per_table=1; -ERROR HY000: Variable 'innodb_file_per_table' is a read only variable -Expected error 'Read only variable' SELECT COUNT(@@GLOBAL.innodb_file_per_table); COUNT(@@GLOBAL.innodb_file_per_table) 1 1 Expected '#---------------------BS_STVARS_028_03----------------------#' -SELECT @@GLOBAL.innodb_file_per_table = VARIABLE_VALUE +SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_file_per_table'; -@@GLOBAL.innodb_file_per_table = VARIABLE_VALUE +IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE 1 1 Expected SELECT COUNT(@@GLOBAL.innodb_file_per_table);