database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Update mysql-test innodb_file_format to match the latest behavior

Browse Source 
(different error number).
This commit is contained in:
Vasil Dimov
2010-04-14 18:42:17 +03:00
parent 855935369d
commit d72f449abd
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/innodb_file_format.result
View File

@ -7,7 +7,7 @@ Antelope
set global innodb_file_format=antelope; set global innodb_file_format=antelope;
set global innodb_file_format=barracuda; set global innodb_file_format=barracuda;
set global innodb_file_format=cheetah; 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; select @@innodb_file_format;
@@innodb_file_format @@innodb_file_format
Barracuda Barracuda
@ -16,16 +16,16 @@ select @@innodb_file_format;
@@innodb_file_format @@innodb_file_format
Antelope Antelope
set global innodb_file_format=on; 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; 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; select @@innodb_file_format;
@@innodb_file_format @@innodb_file_format
Antelope Antelope
set global innodb_file_format_check=antelope; set global innodb_file_format_check=antelope;
set global innodb_file_format_check=barracuda; set global innodb_file_format_check=barracuda;
set global innodb_file_format_check=cheetah; 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; select @@innodb_file_format_check;
@@innodb_file_format_check @@innodb_file_format_check
Barracuda Barracuda
@ -34,9 +34,9 @@ select @@innodb_file_format_check;
@@innodb_file_format_check @@innodb_file_format_check
Barracuda Barracuda
set global innodb_file_format=on; 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; 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; select @@innodb_file_format_check;
@@innodb_file_format_check @@innodb_file_format_check
Barracuda Barracuda

12
mysql-test/t/innodb_file_format.test
View File

@ -4,26 +4,26 @@ select @@innodb_file_format;
select @@innodb_file_format_check; select @@innodb_file_format_check;
set global innodb_file_format=antelope; set global innodb_file_format=antelope;
set global innodb_file_format=barracuda; set global innodb_file_format=barracuda;
--error ER_WRONG_ARGUMENTS --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format=cheetah; set global innodb_file_format=cheetah;
select @@innodb_file_format; select @@innodb_file_format;
set global innodb_file_format=default; set global innodb_file_format=default;
select @@innodb_file_format; select @@innodb_file_format;
--error ER_WRONG_ARGUMENTS --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format=on; set global innodb_file_format=on;
--error ER_WRONG_ARGUMENTS --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format=off; set global innodb_file_format=off;
select @@innodb_file_format; select @@innodb_file_format;
set global innodb_file_format_check=antelope; set global innodb_file_format_check=antelope;
set global innodb_file_format_check=barracuda; set global innodb_file_format_check=barracuda;
--error ER_WRONG_ARGUMENTS --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format_check=cheetah; set global innodb_file_format_check=cheetah;
select @@innodb_file_format_check; select @@innodb_file_format_check;
set global innodb_file_format_check=default; set global innodb_file_format_check=default;
select @@innodb_file_format_check; select @@innodb_file_format_check;
--error ER_WRONG_ARGUMENTS --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format=on; set global innodb_file_format=on;
--error ER_WRONG_ARGUMENTS --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format=off; set global innodb_file_format=off;
select @@innodb_file_format_check; select @@innodb_file_format_check;
set global innodb_file_format_check=antelope; set global innodb_file_format_check=antelope;