From d72f449abd6935acbaef7347fe3f1514c1c5cffa Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Wed, 14 Apr 2010 18:42:17 +0300 Subject: [PATCH] Update mysql-test innodb_file_format to match the latest behavior (different error number). --- mysql-test/r/innodb_file_format.result | 12 ++++++------ mysql-test/t/innodb_file_format.test | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mysql-test/r/innodb_file_format.result b/mysql-test/r/innodb_file_format.result index 86d60706084..6a573d8658e 100644 --- a/mysql-test/r/innodb_file_format.result +++ b/mysql-test/r/innodb_file_format.result @@ -7,7 +7,7 @@ Antelope set global innodb_file_format=antelope; set global innodb_file_format=barracuda; set global innodb_file_format=cheetah; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'cheetah' select @@innodb_file_format; @@innodb_file_format Barracuda @@ -16,16 +16,16 @@ select @@innodb_file_format; @@innodb_file_format Antelope set global innodb_file_format=on; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON' set global innodb_file_format=off; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off' select @@innodb_file_format; @@innodb_file_format Antelope set global innodb_file_format_check=antelope; set global innodb_file_format_check=barracuda; set global innodb_file_format_check=cheetah; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'cheetah' select @@innodb_file_format_check; @@innodb_file_format_check Barracuda @@ -34,9 +34,9 @@ select @@innodb_file_format_check; @@innodb_file_format_check Barracuda set global innodb_file_format=on; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON' set global innodb_file_format=off; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off' select @@innodb_file_format_check; @@innodb_file_format_check Barracuda diff --git a/mysql-test/t/innodb_file_format.test b/mysql-test/t/innodb_file_format.test index d63c9b0228f..5d094cb9dba 100644 --- a/mysql-test/t/innodb_file_format.test +++ b/mysql-test/t/innodb_file_format.test @@ -4,26 +4,26 @@ select @@innodb_file_format; select @@innodb_file_format_check; set global innodb_file_format=antelope; set global innodb_file_format=barracuda; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=cheetah; select @@innodb_file_format; set global innodb_file_format=default; select @@innodb_file_format; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=on; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=off; select @@innodb_file_format; set global innodb_file_format_check=antelope; set global innodb_file_format_check=barracuda; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_check=cheetah; select @@innodb_file_format_check; set global innodb_file_format_check=default; select @@innodb_file_format_check; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=on; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=off; select @@innodb_file_format_check; set global innodb_file_format_check=antelope;