MDEV-14427: encryption.innodb-bad-key-change failed in buildbot

Timing problem as sometimes table is marked as encrypted but
sometimes we are not sure and table is just marked missing.

2 files changed, 16 insertions, 74 deletions

diff --git a/mysql-test/suite/encryption/r/innodb-bad-key-change.result b/mysql-test/suite/encryption/r/innodb-bad-key-change.result
index 4e4fd89d1ae..d581b98513d 100644
--- a/mysql-test/suite/encryption/r/innodb-bad-key-change.result
+++ b/mysql-test/suite/encryption/r/innodb-bad-key-change.result
@@ -28,14 +28,7 @@ foobar	2
 # Restart server with keysbad3.txt
 SELECT * FROM t1;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table test/t1 in tablespace  is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Warning	192	Table "test"."t1" in file ./test/t1.ibd is encrypted but encryption service or used key_id  is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 DROP TABLE t1;
-SHOW WARNINGS;
-Level	Code	Message
 # Start server with keys3.txt
 SET GLOBAL innodb_default_encryption_key_id=5;
 CREATE TABLE t2 (c VARCHAR(8), id int not null primary key, b int, key(b)) ENGINE=InnoDB ENCRYPTED=YES;
@@ -44,73 +37,32 @@ INSERT INTO t2 VALUES ('foobar',1,2);
 # Restart server with keys2.txt
 SELECT * FROM t2;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table test/t2 in tablespace  is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 SELECT * FROM t2 where id = 1;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 SELECT * FROM t2 where b = 1;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 INSERT INTO t2 VALUES ('tmp',3,3);
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 DELETE FROM t2 where b = 3;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 DELETE FROM t2 where id = 3;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 UPDATE t2 set b = b +1;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 OPTIMIZE TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	optimize	Warning	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
 test.t2	optimize	Error	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 test.t2	optimize	error	Corrupt
-SHOW WARNINGS;
-Level	Code	Message
 ALTER TABLE t2 ADD COLUMN d INT;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 ANALYZE TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	Warning	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
 test.t2	analyze	Error	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 test.t2	analyze	error	Corrupt
-SHOW WARNINGS;
-Level	Code	Message
 TRUNCATE TABLE t2;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-SHOW WARNINGS;
-Level	Code	Message
-Warning	192	Table "test"."t2" in file ./test/t2.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
-Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 DROP TABLE t2;
 
 # Start server with keys2.txt
diff --git a/mysql-test/suite/encryption/t/innodb-bad-key-change.test b/mysql-test/suite/encryption/t/innodb-bad-key-change.test
index 66546872c25..6fa5fc9847f 100644
--- a/mysql-test/suite/encryption/t/innodb-bad-key-change.test
+++ b/mysql-test/suite/encryption/t/innodb-bad-key-change.test
@@ -40,18 +40,18 @@ SELECT * FROM t1;
 -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
 -- source include/restart_mysqld.inc
 
+--disable_warnings
 --error ER_GET_ERRMSG
 SELECT * FROM t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+--enable_warnings
 
 -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
 -- source include/restart_mysqld.inc
 
+--disable_warnings
 --replace_regex /tablespace [0-9]*/tablespace /
 DROP TABLE t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+--enable_warnings
 
 #
 # MDEV-8591: Database page corruption on disk or a failed space, Assertion failure in file buf0buf.cc
@@ -71,51 +71,41 @@ INSERT INTO t2 VALUES ('foobar',1,2);
 -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
 -- source include/restart_mysqld.inc
 
+--disable_warnings
 --error ER_GET_ERRMSG
 SELECT * FROM t2;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 SELECT * FROM t2 where id = 1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 SELECT * FROM t2 where b = 1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --replace_regex /tablespace [0-9]*/tablespace /
 --error ER_GET_ERRMSG
 INSERT INTO t2 VALUES ('tmp',3,3);
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 DELETE FROM t2 where b = 3;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 DELETE FROM t2 where id = 3;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 UPDATE t2 set b = b +1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 OPTIMIZE TABLE t2;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 ALTER TABLE t2 ADD COLUMN d INT;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 ANALYZE TABLE t2;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
+
 --error ER_GET_ERRMSG
 TRUNCATE TABLE t2;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
-SHOW WARNINGS;
 
 DROP TABLE t2;
+--enable_warnings
 
 --echo
 --echo # Start server with keys2.txt