#At file:///home/andrei/MySQL/BZR/MERGE/5.1-bt/ based on revid:aelkin@stripped
3360 Andrei Elkin 2010-02-26 [merge]
merging fixes of bug@51089 to 5.1-bt
modified:
mysql-test/suite/rpl/t/rpl_show_slave_running.test
=== modified file 'mysql-test/suite/rpl/t/rpl_show_slave_running.test'
--- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test 2010-02-25 10:39:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test 2010-02-26 12:07:47 +0000
@@ -22,7 +22,7 @@ SHOW STATUS LIKE 'Slave_running';
let $status= query_get_value("show slave status", Slave_IO_Running, 1);
echo Slave_IO_Running= $status;
let $status= query_get_value("show slave status", Slave_SQL_Running, 1);
-echo Slave_IO_Running= $status;
+echo Slave_SQL_Running= $status;
# Test 2. The slave IO thread is started but not yet got connected to master
# and SQL thread is not started
@@ -35,7 +35,7 @@ SHOW STATUS LIKE 'Slave_running';
let $status= query_get_value("show slave status", Slave_IO_Running, 1);
echo Slave_IO_Running= $status;
let $status= query_get_value("show slave status", Slave_SQL_Running, 1);
-echo Slave_IO_Running= $status;
+echo Slave_SQL_Running= $status;
# Test 3. The slave IO thread is started and got connected to master
# and SQL thread is still not started
@@ -51,7 +51,7 @@ SHOW STATUS LIKE 'Slave_running';
let $status= query_get_value("show slave status", Slave_IO_Running, 1);
echo Slave_IO_Running= $status;
let $status= query_get_value("show slave status", Slave_SQL_Running, 1);
-echo Slave_IO_Running= $status;
+echo Slave_SQL_Running= $status;
# Test 4. The slave IO thread is started and got connected to master
# and SQL thread is started
@@ -65,7 +65,7 @@ SHOW STATUS LIKE 'Slave_running';
let $status= query_get_value("show slave status", Slave_IO_Running, 1);
echo Slave_IO_Running= $status;
let $status= query_get_value("show slave status", Slave_SQL_Running, 1);
-echo Slave_IO_Running= $status;
+echo Slave_SQL_Running= $status;
# cleanup
Attachment: [text/bzr-bundle] bzr/aelkin@mysql.com-20100226120947-2dfn6j248i4m317f.bundle
Thread |
---|
• bzr commit into mysql-5.1-bugteam branch (aelkin:3360) | Andrei Elkin | 26 Feb |