diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:01:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:01:49 +0200 |
| commit | 25b91c3f13affc1b58169240894b206ff34b1db3 (patch) | |
| tree | 4042ba02c9777eabc030c80f376cd6e25114ac6d /mysql-test/suite/encryption | |
| parent | dbcbee10176dde410867a3762385a9e5ee63e1d3 (diff) | |
| parent | a8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (diff) | |
| download | mariadb-git-25b91c3f13affc1b58169240894b206ff34b1db3.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/encryption')
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb-bad-key-change2.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb_import.result | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-bad-key-change2.result b/mysql-test/suite/encryption/r/innodb-bad-key-change2.result index 7e59ad4aec3..3cda2bd537b 100644 --- a/mysql-test/suite/encryption/r/innodb-bad-key-change2.result +++ b/mysql-test/suite/encryption/r/innodb-bad-key-change2.result @@ -50,7 +50,6 @@ restore: t1 .ibd and .cfg files # restart: --plugin-load-add=file_key_management --file-key-management --file-key-management-filename=MYSQL_TEST_DIR/std_data/keys2.txt ALTER TABLE t1 DISCARD TABLESPACE; Warnings: -Warning 1814 Tablespace has been discarded for table `t1` Warning 1812 Tablespace is missing for table 'test/t1' restore: t1 .ibd and .cfg files ALTER TABLE t1 IMPORT TABLESPACE; diff --git a/mysql-test/suite/encryption/r/innodb_import.result b/mysql-test/suite/encryption/r/innodb_import.result index 169af37f404..54b95ab26d4 100644 --- a/mysql-test/suite/encryption/r/innodb_import.result +++ b/mysql-test/suite/encryption/r/innodb_import.result @@ -11,9 +11,10 @@ UNLOCK TABLES; ALTER TABLE t2 IMPORT TABLESPACE; ERROR HY000: Internal error: Drop all secondary indexes before importing table test/t2 when .cfg file is missing. ALTER TABLE t2 DROP KEY idx; -ALTER TABLE t2 IMPORT TABLESPACE; Warnings: Warning 1814 Tablespace has been discarded for table `t2` +ALTER TABLE t2 IMPORT TABLESPACE; +Warnings: Warning 1810 IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification SELECT * FROM t2; f1 f2 |