summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption/t/innodb-encryption-disable.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-19 17:30:26 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-19 17:30:26 +0200
commit601807bfbde573254258e5d3e31dde1ac0601fd7 (patch)
tree7bb49f334406a9d254b94490a78d6c725d1d1477 /mysql-test/suite/encryption/t/innodb-encryption-disable.test
parent6297a1026db4032ab7b7e28788d0b5b9a1f32aa3 (diff)
downloadmariadb-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-encryption-disable.test')
-rw-r--r--mysql-test/suite/encryption/t/innodb-encryption-disable.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-encryption-disable.test b/mysql-test/suite/encryption/t/innodb-encryption-disable.test
index 4d0aa04bc56..2097a4ad184 100644
--- a/mysql-test/suite/encryption/t/innodb-encryption-disable.test
+++ b/mysql-test/suite/encryption/t/innodb-encryption-disable.test
@@ -16,7 +16,7 @@ call mtr.add_suppression("InnoDB: Table `test`\\.`t[15]` is corrupted");
# Suppression for builds where file_key_management plugin is linked statically
call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
---let $restart_parameters=--innodb-encrypt-tables=ON --plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
+--let $restart_parameters=--innodb-encrypt-tables=ON --plugin-load-add=file_key_management --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
--source include/restart_mysqld.inc
create table t5 (
@@ -48,7 +48,7 @@ select * from t1;
--error ER_NO_SUCH_TABLE_IN_ENGINE
select * from t5;
---let $restart_parameters=--innodb-encrypt-tables=ON --plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
+--let $restart_parameters=--innodb-encrypt-tables=ON --plugin-load-add=file_key_management --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
--source include/restart_mysqld.inc
drop table t1;