diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 22:25:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-20 08:41:34 +0300 |
| commit | 45fe62b8d6d96cc8a1f4e4d55647336825cfae9f (patch) | |
| tree | d9f0f979c33876493c6d07daa822e63be149a9b7 | |
| parent | a4d4a5fe82bc87b222c50d192adf5e379fe6365d (diff) | |
| download | mariadb-git-45fe62b8d6d96cc8a1f4e4d55647336825cfae9f.tar.gz | |
Clean up a test
Changed global parameters will be reset by server restart.
There is no need to save and restore the original values.
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-key-rotation-disable.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-key-rotation-disable.test | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result index eeb338cad61..89677490d92 100644 --- a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result +++ b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result @@ -62,5 +62,4 @@ FOUND /public/ in t7.ibd FOUND /public/ in t8.ibd # t9 page compressed expecting NOT FOUND NOT FOUND /public/ in t9.ibd -use test; drop database enctests; diff --git a/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test b/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test index fdbd6c8da7c..574e0c3becc 100644 --- a/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test +++ b/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test @@ -8,9 +8,6 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ --disable_query_log --disable_warnings -let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; -let $innodb_file_format_orig = `SELECT @@innodb_file_format`; -let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`; let $encryption = `SELECT @@innodb_encrypt_tables`; SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; @@ -88,15 +85,4 @@ SET GLOBAL innodb_encrypt_tables=ON; -- source include/start_mysqld.inc -use test; drop database enctests; -# reset system - ---disable_query_log ---disable_warnings -EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig; -EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig; -EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig; -set global innodb_compression_algorithm = DEFAULT; ---enable_warnings ---enable_query_log |