1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Follow-up to MDEV-12042 (test innodb_page_size variants)

Browse Source 
innodb_page_size_small: A new set of combinations, for
innodb_page_size up to 16k. In MariaDB 10.0, this does not
make a difference, but in 10.1 and later, innodb_page_size
would cover 32k and 64k, for which ROW_FORMAT=COMPRESSED
is not available.

Enable these combinations in a few InnoDB tests.
This commit is contained in:
Marko Mäkelä 2017-06-06 09:34:09 +03:00
parent 151daaf480
commit d8d39721df
15 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/include/innodb_page_size_small.combinations Normal file
View File

@ -0,0 +1,8 @@
[16k]
innodb-page-size=16K
[8k]
innodb-page-size=8K
[4k]
innodb-page-size=4K

4
mysql-test/include/innodb_page_size_small.inc Normal file
View File

@ -0,0 +1,4 @@
# The goal of including this file is to enable innodb_page_size combinations
# (see include/innodb_page_size.combinations)
--source include/have_innodb.inc

2
mysql-test/suite/innodb/t/innodb-alter-debug.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size.inc
--source include/have_debug.inc
--source include/have_debug_sync.inc

2
mysql-test/suite/innodb/t/innodb-alter-discard.test
View File

@ -1,7 +1,7 @@
#Bug#13955083 ALLOW IN-PLACE DDL OPERATIONS ON MISSING OR DISCARDED TABLESPACES
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/innodb_page_size.inc
let $MYSQLD_DATADIR=`select @@datadir`;
SET GLOBAL innodb_file_per_table=1;

2
mysql-test/suite/innodb/t/innodb-alter-nullable.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size.inc
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc

2
mysql-test/suite/innodb/t/innodb-alter-table.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size.inc
#
# MMDEV-8386: MariaDB creates very big tmp file and hangs on xtradb

3
mysql-test/suite/innodb/t/innodb-alter-tempfile.test
View File

@ -10,8 +10,7 @@
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
# InnoDB is required
--source include/have_innodb.inc
--source include/innodb_page_size.inc
--echo #
--echo # Bug #18734396 INNODB IN-PLACE ALTER FAILURES BLOCK FUTURE ALTERS

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

@ -1,4 +1,3 @@
DROP DATABASE IF EXISTS mysqltest_innodb_zip;
CREATE DATABASE mysqltest_innodb_zip;
USE mysqltest_innodb_zip;
SELECT table_name, row_format, data_length, index_length
@ -379,5 +378,4 @@ select @@innodb_file_format_max;
@@innodb_file_format_max
Barracuda
drop table normal_table, zip_table;
USE test;
DROP DATABASE mysqltest_innodb_zip;

2
mysql-test/suite/innodb_zip/t/innodb-create-options.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
# Tests for various combinations of ROW_FORMAT and KEY_BLOCK_SIZE
# Related bugs;
# Bug#54679: ALTER TABLE causes compressed row_format to revert to compact

11
mysql-test/suite/innodb_zip/t/innodb-zip.test
View File

@ -1,9 +1,4 @@
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mysqltest_innodb_zip;
--enable_warnings
--source include/innodb_page_size_small.inc
CREATE DATABASE mysqltest_innodb_zip;
USE mysqltest_innodb_zip;
@ -13,7 +8,6 @@ SELECT table_name, row_format, data_length, index_length
let $per_table=`select @@innodb_file_per_table`;
let $format=`select @@innodb_file_format`;
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;
@ -363,12 +357,9 @@ drop table normal_table, zip_table;
-- disable_query_log
eval set global innodb_file_format=$format;
eval set global innodb_file_per_table=$per_table;
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;
--enable_query_log
USE test;
DROP DATABASE mysqltest_innodb_zip;

2
mysql-test/suite/innodb_zip/t/innodb_bug36169.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
#
# Bug#36169 create innodb compressed table with too large row size crashed
# http://bugs.mysql.com/36169

2
mysql-test/suite/innodb_zip/t/innodb_bug36172.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
#
# Test case for bug 36172
#

2
mysql-test/suite/innodb_zip/t/innodb_bug52745.test
View File

@ -1,4 +1,4 @@
-- source include/have_innodb.inc
--source include/innodb_page_size_small.inc
let $file_format=`select @@innodb_file_format`;
let $file_per_table=`select @@innodb_file_per_table`;

2
mysql-test/suite/innodb_zip/t/innodb_bug53591.test
View File

@ -1,4 +1,4 @@
-- source include/have_innodb.inc
--source include/innodb_page_size_small.inc
let $file_format=`select @@innodb_file_format`;
let $file_per_table=`select @@innodb_file_per_table`;

2
mysql-test/suite/innodb_zip/t/innodb_bug56680.test
View File

@ -1,4 +1,4 @@
--source include/have_innodb.inc
--source include/innodb_page_size_small.inc
#
# Bug #56680 InnoDB may return wrong results from a case-insensitive index
#