Commit b3b1e4c7 authored by Andrei Elkin's avatar Andrei Elkin

BUG#11763573

post-push fixes for show_slave_io_error= 1 of wait_for_slave_io_error.inc;
Unix and win format path specifically so few tests have to change show_slave_io_error
to zero.
parent c4f98591
...@@ -9,7 +9,6 @@ change master to master_log_pos=MASTER_LOG_POS; ...@@ -9,7 +9,6 @@ change master to master_log_pos=MASTER_LOG_POS;
Read_Master_Log_Pos = '75' Read_Master_Log_Pos = '75'
start slave; start slave;
include/wait_for_slave_io_error.inc [errno=1236] include/wait_for_slave_io_error.inc [errno=1236]
Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from './master-bin.000001' at 75, the last byte read was read from './master-bin.000001' at 94.''
include/stop_slave_sql.inc include/stop_slave_sql.inc
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
......
...@@ -5,7 +5,6 @@ CREATE TABLE t1(c1 INT); ...@@ -5,7 +5,6 @@ CREATE TABLE t1(c1 INT);
FLUSH LOGS; FLUSH LOGS;
call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log'); call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log');
include/wait_for_slave_io_error.inc [errno=1236] include/wait_for_slave_io_error.inc [errno=1236]
Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the last event was read from './master-bin.000002' at 237, the last byte read was read from './master-bin.000002' at 237.''
CREATE TABLE t2(c1 INT); CREATE TABLE t2(c1 INT);
FLUSH LOGS; FLUSH LOGS;
CREATE TABLE t3(c1 INT); CREATE TABLE t3(c1 INT);
......
...@@ -37,7 +37,6 @@ DROP TABLE t1; ...@@ -37,7 +37,6 @@ DROP TABLE t1;
CREATE TABLE t1 (f1 int PRIMARY KEY, f2 LONGTEXT, f3 LONGTEXT) ENGINE=MyISAM; CREATE TABLE t1 (f1 int PRIMARY KEY, f2 LONGTEXT, f3 LONGTEXT) ENGINE=MyISAM;
INSERT INTO t1(f1, f2, f3) VALUES(1, REPEAT('a', @@global.max_allowed_packet), REPEAT('b', @@global.max_allowed_packet)); INSERT INTO t1(f1, f2, f3) VALUES(1, REPEAT('a', @@global.max_allowed_packet), REPEAT('b', @@global.max_allowed_packet));
include/wait_for_slave_io_error.inc [errno=1236] include/wait_for_slave_io_error.inc [errno=1236]
Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from './master-bin.000001' at 463, the last byte read was read from './master-bin.000001' at 482.''
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
RESET MASTER; RESET MASTER;
......
...@@ -22,7 +22,12 @@ let $status_items= Read_Master_Log_Pos; ...@@ -22,7 +22,12 @@ let $status_items= Read_Master_Log_Pos;
source include/show_slave_status.inc; source include/show_slave_status.inc;
start slave; start slave;
let $slave_io_errno= 1236; let $slave_io_errno= 1236;
let $show_slave_io_error= 1; #
# Win and Unix path is printed differently: BUG#13055685. So
# show_slave_io_error is made 0 until the bug fixes provide necessary
# facilities
#
let $show_slave_io_error= 0;
source include/wait_for_slave_io_error.inc; source include/wait_for_slave_io_error.inc;
source include/stop_slave_sql.inc; source include/stop_slave_sql.inc;
......
...@@ -60,7 +60,12 @@ call mtr.add_suppression('Got fatal error 1236 from master when reading data fro ...@@ -60,7 +60,12 @@ call mtr.add_suppression('Got fatal error 1236 from master when reading data fro
connection slave; connection slave;
# 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG # 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
--let $slave_io_errno= 1236 --let $slave_io_errno= 1236
--let $show_slave_io_error= 1 #
# Win and Unix path is printed differently: BUG#13055685. So
# show_slave_io_error is made 0 until the bug fixes provide necessary
# facilities
#
--let $show_slave_io_error= 0
--source include/wait_for_slave_io_error.inc --source include/wait_for_slave_io_error.inc
connection master; connection master;
......
...@@ -125,7 +125,12 @@ connection slave; ...@@ -125,7 +125,12 @@ connection slave;
# The slave I/O thread must stop after receiving # The slave I/O thread must stop after receiving
# 1236=ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master. # 1236=ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master.
--let $slave_io_errno= 1236 --let $slave_io_errno= 1236
--let $show_slave_io_error= 1 #
# Win and Unix path is printed differently: BUG#13055685. So
# show_slave_io_error is made 0 until the bug fixes provide necessary
# facilities
#
--let $show_slave_io_error= 0
--source include/wait_for_slave_io_error.inc --source include/wait_for_slave_io_error.inc
# Remove the bad binlog and clear error status on slave. # Remove the bad binlog and clear error status on slave.
......
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