merging fixes of bug@51089 to 5.1-bt

This commit is contained in:
Andrei Elkin 2010-02-26 14:10:08 +02:00
commit b3c6f110b2

View file

@ -14,14 +14,14 @@ SHOW STATUS LIKE 'Slave_running';
Variable_name Value Variable_name Value
Slave_running OFF Slave_running OFF
Slave_IO_Running= No Slave_IO_Running= No
Slave_IO_Running= No Slave_SQL_Running= No
start slave io_thread; start slave io_thread;
Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF NO NO in three following queries Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF NO NO in three following queries
SHOW STATUS LIKE 'Slave_running'; SHOW STATUS LIKE 'Slave_running';
Variable_name Value Variable_name Value
Slave_running OFF Slave_running OFF
Slave_IO_Running= No Slave_IO_Running= No
Slave_IO_Running= No Slave_SQL_Running= No
SELECT RELEASE_LOCK("debug_lock.before_get_running_status_yes"); SELECT RELEASE_LOCK("debug_lock.before_get_running_status_yes");
RELEASE_LOCK("debug_lock.before_get_running_status_yes") RELEASE_LOCK("debug_lock.before_get_running_status_yes")
1 1
@ -30,13 +30,13 @@ SHOW STATUS LIKE 'Slave_running';
Variable_name Value Variable_name Value
Slave_running OFF Slave_running OFF
Slave_IO_Running= Yes Slave_IO_Running= Yes
Slave_IO_Running= No Slave_SQL_Running= No
start slave sql_thread; start slave sql_thread;
Slave_running, Slave_IO_Running, Slave_SQL_Running must be ON, YES, YES in three following queries Slave_running, Slave_IO_Running, Slave_SQL_Running must be ON, YES, YES in three following queries
SHOW STATUS LIKE 'Slave_running'; SHOW STATUS LIKE 'Slave_running';
Variable_name Value Variable_name Value
Slave_running ON Slave_running ON
Slave_IO_Running= Yes Slave_IO_Running= Yes
Slave_IO_Running= Yes Slave_SQL_Running= Yes
set global debug= ''; set global debug= '';
End of tests End of tests