Commit fa4f0513 authored by Bjorn Munch's avatar Bjorn Munch

Bug #42408 Faulty regex for detecting [Warning] and [ERROR] in mysqld error log

Some follow-up test fixes after seeing effect in PB2
parent 9a8ef8f7
...@@ -22,6 +22,8 @@ DROP TABLE IF EXISTS t1, t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t14a,t15,t1 ...@@ -22,6 +22,8 @@ DROP TABLE IF EXISTS t1, t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t14a,t15,t1
# should stop the slave. # # should stop the slave. #
################################################# #################################################
call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
--echo **** Diff Table Def Start **** --echo **** Diff Table Def Start ****
############################################## ##############################################
......
call mtr.add_suppression("Cannot find or open table test/BUG29839 from .*"); call mtr.add_suppression("Cannot find or open table test/BUG29839 from");
DROP TABLE IF EXISTS t1,T1; DROP TABLE IF EXISTS t1,T1;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
SELECT * FROM T1; SELECT * FROM T1;
......
reset master; reset master;
call mtr.add_suppression("Failed during slave thread initialization"); call mtr.add_suppression("Failed during slave I/O thread initialization");
stop slave; stop slave;
reset slave; reset slave;
SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
......
...@@ -4,6 +4,7 @@ reset master; ...@@ -4,6 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
**** Diff Table Def Start **** **** Diff Table Def Start ****
*** On Slave *** *** On Slave ***
STOP SLAVE; STOP SLAVE;
......
...@@ -4,6 +4,7 @@ reset master; ...@@ -4,6 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
**** Diff Table Def Start **** **** Diff Table Def Start ****
*** On Slave *** *** On Slave ***
STOP SLAVE; STOP SLAVE;
......
...@@ -9,6 +9,7 @@ reset slave; ...@@ -9,6 +9,7 @@ reset slave;
SET GLOBAL debug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; SET GLOBAL debug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
start slave; start slave;
Reporting the following error: Failed during slave thread initialization Reporting the following error: Failed during slave thread initialization
call mtr.add_suppression("Failed during slave I/O thread initialization");
SET GLOBAL debug= ""; SET GLOBAL debug= "";
stop slave; stop slave;
reset slave; reset slave;
......
...@@ -15,7 +15,7 @@ reset master; ...@@ -15,7 +15,7 @@ reset master;
connection slave; connection slave;
# Add suppression for expected warnings in slaves error log # Add suppression for expected warnings in slaves error log
call mtr.add_suppression("Failed during slave thread initialization"); call mtr.add_suppression("Failed during slave I/O thread initialization");
--disable_warnings --disable_warnings
stop slave; stop slave;
......
...@@ -57,6 +57,7 @@ source include/wait_for_slave_to_stop.inc; ...@@ -57,6 +57,7 @@ source include/wait_for_slave_to_stop.inc;
let $error= query_get_value(SHOW SLAVE STATUS, Last_Error, 1); let $error= query_get_value(SHOW SLAVE STATUS, Last_Error, 1);
echo Reporting the following error: $error; echo Reporting the following error: $error;
call mtr.add_suppression("Failed during slave I/O thread initialization");
SET GLOBAL debug= ""; SET GLOBAL debug= "";
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
--source include/have_case_insensitive_file_system.inc --source include/have_case_insensitive_file_system.inc
--source include/not_windows.inc --source include/not_windows.inc
call mtr.add_suppression("Cannot find or open table test/BUG29839 from .*"); call mtr.add_suppression("Cannot find or open table test/BUG29839 from");
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1,T1; DROP TABLE IF EXISTS t1,T1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment