Skip to content

Commit 9337173

Browse files
committed
MDEV-8893: Test encryption.innodb_encryption_filekeys fails on buildbot
1 parent ba0b668 commit 9337173

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

mysql-test/suite/encryption/r/innodb_encryption_filekeys.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
12
SET GLOBAL innodb_file_format = `Barracuda`;
23
SET GLOBAL innodb_file_per_table = ON;
34
SET GLOBAL innodb_encrypt_tables = OFF;

mysql-test/suite/encryption/t/innodb_encryption_filekeys.test

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# embedded does not support restart
44
-- source include/not_embedded.inc
55

6+
call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
7+
68
--disable_query_log
79
let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
810
let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
@@ -129,13 +131,15 @@ SELECT COUNT(1) FROM t3;
129131
SELECT COUNT(1) FROM t4;
130132
SELECT COUNT(1) FROM t5;
131133

132-
drop table t1,t2,t3,t4, t5;
133-
set GLOBAL innodb_default_encryption_key_id=1;
134-
135134
# reset system
136135
--disable_query_log
137136
EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
138137
EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
139138
EVAL SET GLOBAL innodb_encrypt_tables = $encrypt_tables;
140139
EVAL SET GLOBAL innodb_encryption_threads = $threads;
141140
--enable_query_log
141+
142+
drop table t1,t2,t3,t4, t5;
143+
144+
set GLOBAL innodb_default_encryption_key_id=1;
145+

0 commit comments

Comments
 (0)