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-alter.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-alter.test')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-encryption-alter.test | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-encryption-alter.test b/mysql-test/suite/encryption/t/innodb-encryption-alter.test index 316ece1c16b..cb7d5a47975 100644 --- a/mysql-test/suite/encryption/t/innodb-encryption-alter.test +++ b/mysql-test/suite/encryption/t/innodb-encryption-alter.test @@ -5,15 +5,9 @@ # MDEV-8817: Failing assertion: new_state->key_version != ENCRYPTION_KEY_VERSION_INVALID # ---disable_query_log -let $innodb_file_format_orig = `SELECT @@innodb_file_format`; -let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`; let $encrypt_tables = `SELECT @@innodb_encrypt_tables`; let $threads = `SELECT @@innodb_encryption_threads`; ---enable_query_log -SET GLOBAL innodb_file_format = `Barracuda`; -SET GLOBAL innodb_file_per_table = ON; SET GLOBAL innodb_encrypt_tables = ON; SET GLOBAL innodb_encryption_threads = 4; @@ -91,8 +85,6 @@ drop table t1,t2; # reset system --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; EVAL SET GLOBAL innodb_encrypt_tables = $encrypt_tables; EVAL SET GLOBAL innodb_encryption_threads = $threads; --enable_query_log |