diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-31 12:05:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-31 12:05:17 +0200 |
| commit | 377f4ec755c81ba49c7d27e510ac5a2acd74c688 (patch) | |
| tree | 62fc5164ed13a7c35260645de221c8f7e774f6a9 /mysql-test/suite/encryption/r | |
| parent | 6252a281b5020d28685777c11ee27688a9db3d66 (diff) | |
| download | mariadb-git-bb-11.0-MDEV-29985.tar.gz | |
MDEV-29985 Remove the parameter innodb_file_per_tablebb-11.0-MDEV-29985
This follows up commit e581396b7aea94485580d2c9edaa9c5df647f2b7
(MDEV-29983), which deprecated the parameter.
Diffstat (limited to 'mysql-test/suite/encryption/r')
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff | 8 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-remove-encryption.result | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff b/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff index 421c962bd2e..94d38620645 100644 --- a/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff +++ b/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff @@ -1,9 +1,7 @@ ---- innodb-remove-encryption.result 2022-09-02 20:44:59.960430396 +0530 -+++ innodb-remove-encryption,undo3.reject 2022-11-29 19:02:24.813094277 +0530 -@@ -13,6 +13,9 @@ +@@ -12,6 +12,9 @@ + innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME - innodb_system +innodb_undo001 +innodb_undo002 +innodb_undo003 @@ -21,9 +19,9 @@ mysql/innodb_table_stats mysql/transaction_registry @@ -36,6 +42,9 @@ + # restart: --skip-file-key-management --innodb-encrypt-tables=OFF --innodb-encryption-threads=0 --innodb-tablespaces-encryption SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME - innodb_system +innodb_undo001 +innodb_undo002 +innodb_undo003 diff --git a/mysql-test/suite/encryption/r/innodb-remove-encryption.result b/mysql-test/suite/encryption/r/innodb-remove-encryption.result index 22207f8184a..e8ab4145d9d 100644 --- a/mysql-test/suite/encryption/r/innodb-remove-encryption.result +++ b/mysql-test/suite/encryption/r/innodb-remove-encryption.result @@ -1,6 +1,3 @@ -set global innodb_file_per_table=OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release call mtr.add_suppression("(mysqld|mariadbd).*: file-key-management-filename is not set"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error."); call mtr.add_suppression("Plugin 'file_key_management' registration as a ENCRYPTION failed."); @@ -12,12 +9,13 @@ create table t1(a int not null primary key, b char(200)) engine=innodb; # Wait until encryption threads have encrypted all tablespaces SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME +innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME -innodb_system mysql/innodb_index_stats mysql/innodb_table_stats mysql/transaction_registry +test/t1 # Success! SELECT * from t1; a b @@ -29,6 +27,7 @@ innodb_system mysql/innodb_index_stats mysql/innodb_table_stats mysql/transaction_registry +test/t1 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME # Success! @@ -37,12 +36,13 @@ NAME # restart: --skip-file-key-management --innodb-encrypt-tables=OFF --innodb-encryption-threads=0 --innodb-tablespaces-encryption SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME -innodb_system mysql/innodb_index_stats mysql/innodb_table_stats mysql/transaction_registry +test/t1 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME +innodb_system SELECT * from t1; a b DROP TABLE t1; |