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/encryption/t/innodb-encryption-disable.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/encryption/t/innodb-encryption-disable.test')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-encryption-disable.test | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-encryption-disable.test b/mysql-test/suite/encryption/t/innodb-encryption-disable.test index e8e2ba02402..8a8b451f5b1 100644 --- a/mysql-test/suite/encryption/t/innodb-encryption-disable.test +++ b/mysql-test/suite/encryption/t/innodb-encryption-disable.test @@ -6,14 +6,6 @@ -- source include/not_crashrep.inc -- source filekeys_plugin_exists.inc ---disable_query_log -let $innodb_file_format_orig = `SELECT @@innodb_file_format`; -let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`; ---enable_query_log - -SET GLOBAL innodb_file_format = `Barracuda`; -SET GLOBAL innodb_file_per_table = ON; - # # MDEV-9559: Server without encryption configs crashes if selecting from an implicitly encrypted table # @@ -93,9 +85,4 @@ select * from t5; drop table t1; drop table t5; ---disable_query_log -EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig; -EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig; ---enable_query_log - --remove_file $MYSQLTEST_VARDIR/encryption-disable-keys1.txt |