diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 12:09:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 12:09:00 +0300 |
| commit | 241d30d3faac0fbbcb7bcfad3dcc118bb03eceb0 (patch) | |
| tree | 50d3b53160cd5d69d0a0974620a9a06e706d3407 /mysql-test/suite/encryption | |
| parent | c9a85fb1b14d9944920ebdb3514c48ea57e1647d (diff) | |
| download | mariadb-git-241d30d3faac0fbbcb7bcfad3dcc118bb03eceb0.tar.gz | |
After-merge fixes for MDEV-14180
Diffstat (limited to 'mysql-test/suite/encryption')
3 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/suite/encryption/r/innodb-first-page-read.result b/mysql-test/suite/encryption/r/innodb-first-page-read.result index 29253885e83..4c2a2116669 100644 --- a/mysql-test/suite/encryption/r/innodb-first-page-read.result +++ b/mysql-test/suite/encryption/r/innodb-first-page-read.result @@ -66,6 +66,8 @@ VARIABLE_VALUE <= 29 1 set global innodb_encrypt_tables=OFF; # wait until tables are decrypted +SET GLOBAL innodb_max_dirty_pages_pct=0.0; +SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0; # result should be actual number of tables except remote tables could be read twice # i.e. < 23 + 3*2 = 29 SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; 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 7d0267d5057..f27f5517e09 100644 --- a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result +++ b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result @@ -1,3 +1,5 @@ +SET GLOBAL innodb_file_per_table = ON; +set global innodb_compression_algorithm = 1; create database enctests; use enctests; create table t1(a int not null primary key, b char(200)) engine=innodb; diff --git a/mysql-test/suite/encryption/t/innodb-first-page-read.test b/mysql-test/suite/encryption/t/innodb-first-page-read.test index c86e16c52b8..4e6eeb25080 100644 --- a/mysql-test/suite/encryption/t/innodb-first-page-read.test +++ b/mysql-test/suite/encryption/t/innodb-first-page-read.test @@ -77,7 +77,13 @@ SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL set global innodb_encrypt_tables=OFF; --echo # wait until tables are decrypted ---let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 +SET GLOBAL innodb_max_dirty_pages_pct=0.0; +SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0; + +let $wait_condition = +SELECT variable_value = 0 +FROM information_schema.global_status +WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY'; --source include/wait_condition.inc --echo # result should be actual number of tables except remote tables could be read twice |