MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Chuck Bell Date:May 27 2009 8:11pm
Subject:bzr commit into mysql-6.0-backup branch (charles.bell:2817) Bug#45108
View as plain text  
#At file:///D:/source/bzr/mysql-6.0-pushes/ based on revid:jorgen.loland@stripped

 2817 Chuck Bell	2009-05-27
      BUG#45108 : Slave skip counter not working as expected on debian platform
      
      This patch attempts to fix the problem by removing the STOP SLAVE
      call prior to the restart.
      modified:
        mysql-test/suite/rpl/r/rpl_backup_block.result
        mysql-test/suite/rpl/t/rpl_backup_block.test

=== modified file 'mysql-test/suite/rpl/r/rpl_backup_block.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_block.result	2009-05-26 21:28:55 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_block.result	2009-05-27 20:11:45 +0000
@@ -134,6 +134,12 @@ a
 5
 # Get master's binlog position before restore.
 #
+# Case 4 - Verify slaves can connect after restore
+#
+# Connecting to slave 1...
+SET global sql_slave_skip_counter=1;
+START SLAVE;
+#
 # Cleanup
 #
 # Connecting to slave 1...

=== modified file 'mysql-test/suite/rpl/t/rpl_backup_block.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_block.test	2009-05-26 21:28:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_block.test	2009-05-27 20:11:45 +0000
@@ -171,24 +171,23 @@ let $master_after_pos = query_get_value(
 #
 # BUG#45108 : Slave skip counter not working as expected on debian platform
 #
-#--echo #
-#--echo # Case 4 - Verify slaves can connect after restore
-#--echo #
-#
-#--echo # Connecting to slave 1...
-#connection slave;
-#
-#STOP SLAVE;
-#--source include/wait_for_slave_to_stop.inc
-#
-#SET global sql_slave_skip_counter=1;
-#
-#START SLAVE;
-#--source include/wait_for_slave_to_start.inc
-#
-## Sync with master to ensure nothing is replicated after incident event.
-#sync_with_master;
-#
+--echo #
+--echo # Case 4 - Verify slaves can connect after restore
+--echo #
+
+--echo # Connecting to slave 1...
+connection slave;
+
+--source include/wait_for_slave_sql_to_stop.inc
+
+SET global sql_slave_skip_counter=1;
+
+START SLAVE;
+--source include/wait_for_slave_to_start.inc
+
+# Sync with master to ensure nothing is replicated after incident event.
+sync_with_master;
+
 #--echo # Showing tables on slave.
 #SHOW FULL TABLES FROM rpl_backup_block;
 #
@@ -210,7 +209,6 @@ let $master_after_pos = query_get_value(
 #--echo # Connecting to slave 2...
 #connection slave2;
 #
-#STOP SLAVE;
 #--source include/wait_for_slave_to_stop.inc
 #
 #SET global sql_slave_skip_counter=1;

Thread
bzr commit into mysql-6.0-backup branch (charles.bell:2817) Bug#45108Chuck Bell27 May