Below is the list of changes that have just been committed into a local
5.1 repository of skozlov. When skozlov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-02 00:52:44+04:00, skozlov@stripped +2 -0
Bug#28772
mysql-test/suite/rpl/r/rpl_row_until.result@stripped, 2008-04-02 00:52:41+04:00, skozlov@stripped +3 -3
updated result file
mysql-test/suite/rpl/t/rpl_row_until.test@stripped, 2008-04-02 00:52:41+04:00, skozlov@stripped +2 -2
updated test file
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result
--- a/mysql-test/suite/rpl/r/rpl_row_until.result 2007-08-21 16:33:00 +04:00
+++ b/mysql-test/suite/rpl/r/rpl_row_until.result 2008-04-02 00:52:41 +04:00
@@ -150,7 +150,7 @@ Last_SQL_Errno 0
Last_SQL_Error
start slave;
stop slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=740;
+start slave sql_thread until master_log_file='master-bin.000001', master_log_pos=740;
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 127.0.0.1
@@ -162,7 +162,7 @@ Read_Master_Log_Pos 750
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
-Slave_IO_Running Yes
+Slave_IO_Running No
Slave_SQL_Running No
Replicate_Do_DB
Replicate_Ignore_DB
@@ -200,7 +200,7 @@ start slave until relay_log_file='slave-
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave sql_thread;
+start slave;
start slave until master_log_file='master-bin.000001', master_log_pos=740;
Warnings:
Note 1254 Slave is already running
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_until.test b/mysql-test/suite/rpl/t/rpl_row_until.test
--- a/mysql-test/suite/rpl/t/rpl_row_until.test 2007-10-26 18:11:18 +04:00
+++ b/mysql-test/suite/rpl/t/rpl_row_until.test 2008-04-02 00:52:41 +04:00
@@ -58,7 +58,7 @@ stop slave;
--source include/wait_for_slave_to_stop.inc
# this should stop immediately as we are already there
-start slave until master_log_file='master-bin.000001', master_log_pos=740;
+start slave sql_thread until master_log_file='master-bin.000001', master_log_pos=740;
--source include/wait_for_slave_sql_to_stop.inc
# here the sql slave thread should be stopped
--replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
@@ -76,5 +76,5 @@ start slave until relay_log_file='slave-
--error 1277
start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
# Warning should be given for second command
-start slave sql_thread;
+start slave;
start slave until master_log_file='master-bin.000001', master_log_pos=740;
