database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

After-merge fixes for MDEV-14180

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-21 12:09:00 +03:00
parent c9a85fb1b1
commit 241d30d3fa
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/encryption/r/innodb-first-page-read.result
View File

@ -66,6 +66,8 @@ VARIABLE_VALUE <= 29
1 1
set global innodb_encrypt_tables=OFF; set global innodb_encrypt_tables=OFF;
# wait until tables are decrypted # 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 # result should be actual number of tables except remote tables could be read twice
# i.e. < 23 + 3*2 = 29 # i.e. < 23 + 3*2 = 29
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read'; SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';

2
mysql-test/suite/encryption/r/innodb-key-rotation-disable.result
View File

@ -1,3 +1,5 @@
SET GLOBAL innodb_file_per_table = ON;
set global innodb_compression_algorithm = 1;
create database enctests; create database enctests;
use enctests; use enctests;
create table t1(a int not null primary key, b char(200)) engine=innodb; create table t1(a int not null primary key, b char(200)) engine=innodb;

8
mysql-test/suite/encryption/t/innodb-first-page-read.test
View File

@ -77,7 +77,13 @@ SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL
set global innodb_encrypt_tables=OFF; set global innodb_encrypt_tables=OFF;
--echo # wait until tables are decrypted --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 --source include/wait_condition.inc
--echo # result should be actual number of tables except remote tables could be read twice --echo # result should be actual number of tables except remote tables could be read twice

6
storage/innobase/fil/fil0fil.cc
View File

@ -1421,10 +1421,12 @@ fil_space_create(
encryption threads. */ encryption threads. */
fil_system.default_encrypt_tables.push_back(*space); fil_system.default_encrypt_tables.push_back(*space);
space->is_in_default_encrypt = true; space->is_in_default_encrypt = true;
}
mutex_exit(&fil_system.mutex); mutex_exit(&fil_system.mutex);
if (rotate && srv_n_fil_crypt_threads_started) {
os_event_set(fil_crypt_threads_event); os_event_set(fil_crypt_threads_event);
} else {
mutex_exit(&fil_system.mutex);
} }
return(space); return(space);