mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
366fd92e8d
More messages. Testcase for bug 651. client/mysqltest.c: More explicit error message if MASTER_POS_WAIT() returns NULL. mysql-test/r/rpl_loaddata.result: result update mysql-test/r/rpl_master_pos_wait.result: result update mysql-test/t/rpl000001.test: sync_with_master (=MASTER_POS_WAIT()) was called when we could expect the SQL slave thread had stopped. As I yesterday changed code so that "SQL thread stops => MASTER_POS_WAIT() returns NULL immediately" (bugfix), sync_with_master received NULL (on build.mysql.com, not on my machine; this is a question of milliseconds, if the slave server will process MASTER_POS_WAIT() before or after the slave SQL thread has stopped), and in mysqltest.c, sync_with_master complained that it could not sync. So I just remove this sync_with_master, which does not make sense anymore: we just wait for the slave SQL thread to stop. mysql-test/t/rpl_loaddata.test: Discovered we had wait_for_slave_to_stop, so used it as it automates things. mysql-test/t/rpl_master_pos_wait.test: Discovered we had 'send' to send a query without waiting for the resultn so could had a testcase for bug 651. Shorter timeouts as there is no risk the position is reached. sql/slave.cc: A longer DBUG_PRINT.
15 lines
493 B
Text
15 lines
493 B
Text
# See if master_pos_wait(,,timeout)
|
|
# Terminates with "timeout expired" (-1)
|
|
source include/master-slave.inc;
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
# Ask for a master log that has certainly not been reached yet
|
|
# timeout= 2 seconds
|
|
select master_pos_wait('master-bin.999999',0,2);
|
|
# Testcase for bug 651 (master_pos_wait() hangs if slave idle and STOP SLAVE).
|
|
send select master_pos_wait('master-bin.999999',0);
|
|
connection slave1;
|
|
stop slave sql_thread;
|
|
connection slave;
|
|
reap;
|