diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 15:48:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 15:48:08 +0200 |
| commit | 85cbfaefee694cdd490b357444f24ff16b8042e8 (patch) | |
| tree | 11f7a96caf686598c6155cc5e2a098617cf077cb /mysql-test/suite | |
| parent | f169dfb41adcb637732507ed56d3038003170a15 (diff) | |
| parent | 1495f057c8a3aa5783de0993f6f95aae3e352f7a (diff) | |
| download | mariadb-git-85cbfaefee694cdd490b357444f24ff16b8042e8.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-key-rotation-disable.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb_encryption_is.test | 1 |
2 files changed, 3 insertions, 0 deletions
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 96b62f7c05b..d360d5f8af7 100644 --- a/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test +++ b/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test @@ -31,8 +31,10 @@ insert into t8 values (1, 'publicmessage'); insert into t9 values (1, 'pugliccompressedaaaaaaaaabbbbbbbbbbbbbbccccccccccccccc'); --echo # should list tables t1-t6 +--sorted_result SELECT NAME,ENCRYPTION_SCHEME,CURRENT_KEY_ID FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'enctests%'; --echo # should list tables t7-t9 +--sorted_result SELECT NAME,ENCRYPTION_SCHEME,CURRENT_KEY_ID FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 and NAME LIKE 'enctests%'; --let $MYSQLD_DATADIR=`select @@datadir` diff --git a/mysql-test/suite/encryption/t/innodb_encryption_is.test b/mysql-test/suite/encryption/t/innodb_encryption_is.test index 52574aa2b9d..9e15cebb1da 100644 --- a/mysql-test/suite/encryption/t/innodb_encryption_is.test +++ b/mysql-test/suite/encryption/t/innodb_encryption_is.test @@ -9,6 +9,7 @@ INSERT INTO t2 VALUES ('foobar'); # # MDEV-9640: Add used key_id to INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION # +--sorted_result SELECT NAME, ENCRYPTION_SCHEME, MIN_KEY_VERSION, CURRENT_KEY_VERSION, CURRENT_KEY_ID FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION |