diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-19 17:30:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-19 17:30:26 +0200 |
| commit | 601807bfbde573254258e5d3e31dde1ac0601fd7 (patch) | |
| tree | 7bb49f334406a9d254b94490a78d6c725d1d1477 /mysql-test/suite/encryption/t/innodb-remove-encryption.test | |
| parent | 6297a1026db4032ab7b7e28788d0b5b9a1f32aa3 (diff) | |
| download | mariadb-git-10.5-MDEV-15053.tar.gz | |
WIP (crashes/hangs!) MDEV-15053 Reduce buf_pool_t::mutex contention10.5-MDEV-15053
TODO: Carefully review and document the changed latching rules,
make ASAN happy, and possibly make more use of std::atomic
and make more things private in buf_pool_t to control access.
Diffstat (limited to 'mysql-test/suite/encryption/t/innodb-remove-encryption.test')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-remove-encryption.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-remove-encryption.test b/mysql-test/suite/encryption/t/innodb-remove-encryption.test index 24e00a00a02..980d61b81ae 100644 --- a/mysql-test/suite/encryption/t/innodb-remove-encryption.test +++ b/mysql-test/suite/encryption/t/innodb-remove-encryption.test @@ -9,7 +9,7 @@ set global innodb_file_per_table=OFF; -call mtr.add_suppression("mysqld: file-key-management-filename is not set"); +call mtr.add_suppression("file-key-management-filename is not set"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error."); call mtr.add_suppression("Plugin 'file_key_management' registration as a ENCRYPTION failed."); flush tables; @@ -18,7 +18,7 @@ create table t1(a int not null primary key, b char(200)) engine=innodb; --echo --echo # Restart server with encryption --- let $restart_parameters=--plugin-load-add=$FILE_KEY_MANAGEMENT_SO --loose-file-key-management --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt --file-key-management-encryption-algorithm=aes_cbc --innodb-encrypt-tables=ON --innodb-encryption-threads=4 --innodb-tablespaces-encryption --innodb-encryption-rotate-key-age=15 +-- let $restart_parameters=--plugin-load-add=file_key_management --loose-file-key-management --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt --file-key-management-encryption-algorithm=aes_cbc --innodb-encrypt-tables=ON --innodb-encryption-threads=4 --innodb-tablespaces-encryption --innodb-encryption-rotate-key-age=15 -- source include/restart_mysqld.inc --echo # Wait until encryption threads have encrypted all tablespaces |