diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-17 18:49:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-17 18:49:34 +0200 |
| commit | b1542a0fad1eb79e5a7f98e7e2309e1f127cd3ea (patch) | |
| tree | 187153829a4250f91d5d027f0044aa9f3a9119ad /mysql-test/suite/innodb/t/innodb-index.test | |
| parent | d94d5d041f191b72b3fba0feeeb4682b7f54c381 (diff) | |
| download | mariadb-git-bb-10.2-mdev-11816.tar.gz | |
Remove references to innodb_file_format.bb-10.2-mdev-11816
innodb_file_format=Barracuda is the default in MariaDB 10.2.
Do not set it, because the option will be removed in MariaDB 10.3.
Also, do not set innodb_file_per_table=1 because it is the default.
Note that MDEV-11828 should fix the test innodb.innodb-64k
already in 10.1.
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-index.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-index.test | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test index 8598647de66..4549b3b6b47 100644 --- a/mysql-test/suite/innodb/t/innodb-index.test +++ b/mysql-test/suite/innodb/t/innodb-index.test @@ -1,15 +1,7 @@ -- 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 $per_table=`select @@innodb_file_per_table`; -let $format=`select @@innodb_file_format`; -set global innodb_file_per_table=on; -set global innodb_file_format='Barracuda'; - SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS; # Bug#13654923 BOGUS DEBUG ASSERTION IN INDEX CREATION FOR ZERO-LENGTH RECORD @@ -336,10 +328,6 @@ explain select * from t1; explain select * from t1 order by a; drop table t1; -eval set global innodb_file_per_table=$per_table; -eval set global innodb_file_format=$format; -eval set global innodb_file_format_max=$format; - # # Test to check whether CREATE INDEX handles implicit foreign key # constraint modifications (Issue #70, Bug #38786) @@ -558,8 +546,3 @@ show create table t2c; --disable_info 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 |