database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Innodb tests innodb_file_format cleanup.

Browse Source
This commit is contained in:
unknown
2013-09-25 14:19:25 +03:00
parent 4a38b9db9a
commit 61ba356a9d
6 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/innodb-zip.result
View File

@ -362,3 +362,5 @@ select @@innodb_file_format_max;
@@innodb_file_format_max @@innodb_file_format_max
Barracuda Barracuda
drop table normal_table, zip_table; drop table normal_table, zip_table;
USE test;
DROP DATABASE mysqltest_innodb_zip;

1
mysql-test/suite/innodb/r/innodb_file_format.result
View File

@ -46,4 +46,3 @@ Antelope
set global innodb_file_format_max=antelope; set global innodb_file_format_max=antelope;
set global innodb_file_format_check=off; set global innodb_file_format_check=off;
ERROR HY000: Variable 'innodb_file_format_check' is a read only variable ERROR HY000: Variable 'innodb_file_format_check' is a read only variable
SET GLOBAL innodb_file_format=Antelope;

8
mysql-test/suite/innodb/t/innodb-index.test
View File

@ -1,5 +1,8 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
let $innodb_file_format_orig=`select @@innodb_file_format`;
let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
let $per_table=`select @@innodb_file_per_table`; let $per_table=`select @@innodb_file_per_table`;
@ -556,3 +559,8 @@ show create table t2c;
--disable_info --disable_info
DROP TABLE t1,t2,t2c,t2i; DROP TABLE t1,t2,t2c,t2i;
--disable_query_log
eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig;
--enable_query_log

6
mysql-test/suite/innodb/t/innodb-zip.test
View File

@ -14,6 +14,8 @@ SELECT table_name, row_format, data_length, index_length
let $per_table=`select @@innodb_file_per_table`; let $per_table=`select @@innodb_file_per_table`;
let $format=`select @@innodb_file_format`; let $format=`select @@innodb_file_format`;
let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`; let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
let $innodb_file_format_orig=`select @@innodb_file_format`;
let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata;
@ -332,8 +334,10 @@ drop table normal_table, zip_table;
eval set global innodb_file_format=$format; eval set global innodb_file_format=$format;
eval set global innodb_file_per_table=$per_table; eval set global innodb_file_per_table=$per_table;
eval set session innodb_strict_mode=$innodb_strict_mode_orig; eval set session innodb_strict_mode=$innodb_strict_mode_orig;
eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig;
SET @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata; SET @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata;
--enable_query_log
USE test; USE test;
DROP DATABASE mysqltest_innodb_zip; DROP DATABASE mysqltest_innodb_zip;

5
mysql-test/suite/innodb/t/innodb_bug47167.test
View File

@ -44,3 +44,8 @@ set global innodb_file_format_max = on;
--error ER_WRONG_VALUE_FOR_VAR --error ER_WRONG_VALUE_FOR_VAR
set global innodb_file_format_max = off; set global innodb_file_format_max = off;
--enable_warnings --enable_warnings
# Put the saved value back to 'innodb_file_format_max'
--disable_query_log
set global innodb_file_format_max = @old_innodb_file_format_max;
--enable_query_log

4
mysql-test/suite/innodb/t/innodb_file_format.test
View File

@ -2,6 +2,7 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
let $innodb_file_format_orig=`select @@innodb_file_format`; let $innodb_file_format_orig=`select @@innodb_file_format`;
let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
select @@innodb_file_format; select @@innodb_file_format;
select @@innodb_file_format_check; select @@innodb_file_format_check;
@ -37,4 +38,7 @@ set global innodb_file_format_max=antelope;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
set global innodb_file_format_check=off; set global innodb_file_format_check=off;
--disable_query_log
eval SET GLOBAL innodb_file_format=$innodb_file_format_orig; eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig;
--enable_query_log