diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
| commit | 6286a05d80f9911b7cd6ba57b04a6f67d39e499d (patch) | |
| tree | 97a8a27c2d99a4474181e32602414d94944bfd80 /mysql-test/suite/encryption | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| parent | 3c92050d1c907cc548e848d0ab2891a06681ad92 (diff) | |
| download | mariadb-git-6286a05d80f9911b7cd6ba57b04a6f67d39e499d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/encryption')
| -rw-r--r-- | mysql-test/suite/encryption/r/debug_key_management.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/debug_key_management.test | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result index 911a369f0c6..7fe681d52ae 100644 --- a/mysql-test/suite/encryption/r/debug_key_management.result +++ b/mysql-test/suite/encryption/r/debug_key_management.result @@ -15,7 +15,6 @@ set global debug_key_management_version=10; select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10; count(*) 0 -SET GLOBAL debug_dbug = '+d,ib_log'; SET GLOBAL innodb_log_checkpoint_now = 1; SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t1 VALUES(NULL); diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test index c370ecf5bd8..15a560d4c42 100644 --- a/mysql-test/suite/encryption/t/debug_key_management.test +++ b/mysql-test/suite/encryption/t/debug_key_management.test @@ -25,7 +25,6 @@ let $wait_condition= select count(*) = $tables_count from information_schema.inn select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10; # Test redo log key rotation and crash recovery. -SET GLOBAL debug_dbug = '+d,ib_log'; SET GLOBAL innodb_log_checkpoint_now = 1; SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t1 VALUES(NULL); |