mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
BUG#41708 rpl.rpl_flushlog_loop fails in pushbuild producing non-deterministic result file
If server has not been initialized as a slave (by CHANGE MASTER), then SHOW SLAVE STATUS will return an empty set, and caused the waiting for Slave_IO_running or Slave_SQL_running to 'No' fail. This patch fixed the problem by return immediately if slave is not initialized in include/wait_for_slave_*_to_stop.inc.
This commit is contained in:
@ -11,8 +11,14 @@
|
||||
# $slave_keep_connection. See wait_for_slave_param.inc for
|
||||
# descriptions.
|
||||
|
||||
let $slave_param= Slave_SQL_Running;
|
||||
let $slave_param_value= No;
|
||||
let $slave_error_message= Failed while waiting for slave SQL thread to stop;
|
||||
source include/wait_for_slave_param.inc;
|
||||
let $slave_error_message= ;
|
||||
# if server has not used CHANGE MASTER to initiate slave, SHOW SLAVE
|
||||
# STATUS will return an empty set.
|
||||
let $_slave_io_running= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1);
|
||||
if (`SELECT '$_slave_io_running' != 'No such row'`)
|
||||
{
|
||||
let $slave_param= Slave_SQL_Running;
|
||||
let $slave_param_value= No;
|
||||
let $slave_error_message= Failed while waiting for slave SQL thread to stop;
|
||||
source include/wait_for_slave_param.inc;
|
||||
let $slave_error_message= ;
|
||||
}
|
||||
|
Reference in New Issue
Block a user