From b35e0918e19932998440ae789a6c3bc4d1962ce9 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Wed, 14 Apr 2010 15:05:56 +0300 Subject: [PATCH] Update the sys_vars.innodb_change_buffering_basic mysql-test since the imported InnoDB provides more values for "innodb_change_buffering". --- .../r/innodb_change_buffering_basic.result | 20 +++++++++---------- .../t/innodb_change_buffering_basic.test | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result b/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result index 70b0425ce6f..f80ed54100f 100644 --- a/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result @@ -1,28 +1,28 @@ SET @start_global_value = @@global.innodb_change_buffering; SELECT @start_global_value; @start_global_value -inserts -Valid values are 'inserts' and 'none' -select @@global.innodb_change_buffering in ('inserts', 'none'); -@@global.innodb_change_buffering in ('inserts', 'none') +all +Valid values are 'all', 'deletes', 'changes', 'inserts', 'none', 'purges' +select @@global.innodb_change_buffering in ('all', 'deletes', 'changes', 'inserts', 'none', 'purges'); +@@global.innodb_change_buffering in ('all', 'deletes', 'changes', 'inserts', 'none', 'purges') 1 select @@global.innodb_change_buffering; @@global.innodb_change_buffering -inserts +all select @@session.innodb_change_buffering; ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable show global variables like 'innodb_change_buffering'; Variable_name Value -innodb_change_buffering inserts +innodb_change_buffering all show session variables like 'innodb_change_buffering'; Variable_name Value -innodb_change_buffering inserts +innodb_change_buffering all select * from information_schema.global_variables where variable_name='innodb_change_buffering'; VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING inserts +INNODB_CHANGE_BUFFERING all select * from information_schema.session_variables where variable_name='innodb_change_buffering'; VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING inserts +INNODB_CHANGE_BUFFERING all set global innodb_change_buffering='none'; select @@global.innodb_change_buffering; @@global.innodb_change_buffering @@ -60,4 +60,4 @@ ERROR 42000: Variable 'innodb_change_buffering' can't be set to the value of 'so SET @@global.innodb_change_buffering = @start_global_value; SELECT @@global.innodb_change_buffering; @@global.innodb_change_buffering -inserts +all diff --git a/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test b/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test index 65e36aa9cb3..abdfddb4c4b 100644 --- a/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test @@ -11,8 +11,8 @@ SELECT @start_global_value; # # exists as global only # ---echo Valid values are 'inserts' and 'none' -select @@global.innodb_change_buffering in ('inserts', 'none'); +--echo Valid values are 'all', 'deletes', 'changes', 'inserts', 'none', 'purges' +select @@global.innodb_change_buffering in ('all', 'deletes', 'changes', 'inserts', 'none', 'purges'); select @@global.innodb_change_buffering; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.innodb_change_buffering;