Bug #28289789 FORMAT OF INNODB ERROR MESSAGES TO BE CORRECTED

- Post push fix. Adjusted more supression messages in MTR tests/results.

Author: mayprasa

mysql-test/suite/auth_sec/t/fips.test

@@ -17,9 +17,9 @@
 --echo #
 
 --disable_query_log
-call mtr.add_suppression("InnoDB: Resizing redo log");
-call mtr.add_suppression("InnoDB: Starting to delete and rewrite");
-call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("Resizing redo log");
+call mtr.add_suppression("Starting to delete and rewrite");
+call mtr.add_suppression("New log files created");
 
 --enable_query_log
 

mysql-test/suite/auth_sec/t/openssl_without_fips.test

@@ -16,9 +16,9 @@
 --echo #
 
 --disable_query_log
-call mtr.add_suppression("InnoDB: Resizing redo log");
-call mtr.add_suppression("InnoDB: Starting to delete and rewrite");
-call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("Resizing redo log");
+call mtr.add_suppression("Starting to delete and rewrite");
+call mtr.add_suppression("New log files created");
 
 --enable_query_log
 

mysql-test/suite/group_replication/r/gr_crash_donor_server_continuously.result

@@ -5,7 +5,6 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection server1]
 [connection server1]
 SET SESSION sql_log_bin=0;
-call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] InnoDB: Database page corruption or a failed file read of page");
 SET SESSION sql_log_bin=1;
 SET sql_log_bin=0;
 CREATE TABLE t1(a int primary key);

mysql-test/suite/group_replication/r/gr_crash_recovery_server.result

@@ -31,8 +31,6 @@ call dml_operations(1,100);
 
 [connection server3]
 set sql_log_bin=0;
-call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
-call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] InnoDB: Database page corruption or a failed file read of page");
 CREATE TABLE t1(a int primary key);
 SET sql_log_bin=1;
 LOCK TABLES t1 READ;

mysql-test/suite/group_replication/r/gr_key_rotation.result

@@ -4,10 +4,6 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
 set sql_log_bin=0;
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Error while loading keyring content*");
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
 set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
 ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
@@ -28,19 +24,6 @@ INSERT INTO t2 VALUES(1,1);
 INSERT INTO t2 VALUEs(2,2);
 [connection server2]
 set sql_log_bin=0;
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded*");
-call mtr.add_suppression(".*Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
-call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': Error 'Can't find master key from keyring, please check keyring plugin is loaded.' on query*");
-call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.'");
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.'");
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'To prevent errors, the server read only mode was enabled following a plugin error.'");
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'The server was automatically set into read only mode after an error was detected.'");
-call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'Skipping leave operation:*");
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Error while loading keyring content*");
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'Message received while the plugin is not ready, message discarded'*");
 set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
 ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.

mysql-test/suite/group_replication/t/gr_crash_donor_server_continuously.test

@@ -33,7 +33,9 @@
 --source include/rpl_connection.inc
 
 SET SESSION sql_log_bin=0;
-call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] InnoDB: Database page corruption or a failed file read of page");
+--disable_query_log
+call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] Database page corruption or a failed file read of page");
+--enable_query_log
 SET SESSION sql_log_bin=1;
 
 # Extract the server_uuid

mysql-test/suite/group_replication/t/gr_crash_recovery_server.test

@@ -82,8 +82,10 @@ call dml_operations(1,100);
 --source include/rpl_connection.inc
 
 set sql_log_bin=0;
+--disable_query_log
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
-call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] InnoDB: Database page corruption or a failed file read of page");
+call mtr.add_suppression("\\[Warning\\] \\[[^]]*\\] Database page corruption or a failed file read of page");
+--enable_query_log
 CREATE TABLE t1(a int primary key);
 SET sql_log_bin=1;
 LOCK TABLES t1 READ;

mysql-test/suite/group_replication/t/gr_key_rotation.test

@@ -29,10 +29,12 @@
 --source include/group_replication.inc
 
 set sql_log_bin=0;
-call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
+--disable_query_log
+call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Encryption can't find master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'Error while loading keyring content*");
 call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
 call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
+--enable_query_log
 set sql_log_bin=1;
 
 # Scenario 1
@@ -70,7 +72,8 @@ INSERT INTO t2 VALUEs(2,2);
 --source include/rpl_connection.inc
 
 set sql_log_bin=0;
-call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded*");
+--disable_query_log
+call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Encryption can't find master key, please check the keyring plugin is loaded*");
 call mtr.add_suppression(".*Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': Error 'Can't find master key from keyring, please check keyring plugin is loaded.' on query*");
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
@@ -83,6 +86,7 @@ call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_fil
 call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
 call mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] \\[[^]]*\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
 call mtr.add_suppression("\\[Error\\] \\[[^]]*\\] \\[[^]]*\\] Plugin group_replication reported: 'Message received while the plugin is not ready, message discarded'*");
+--enable_query_log
 set sql_log_bin=1;
 
 # Check that keyring plugin is not installed

mysql-test/suite/memcached/t/memc_api_trx_level.test

@@ -5,7 +5,7 @@ source include/not_windows.inc;
 --disable_query_log
 CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
 CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
-CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+CALL mtr.add_suppression("Warning: MySQL is trying to drop");
 --enable_query_log
 
 --enable_connect_log