List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 25 2010 10:57am
Subject:bzr commit into mysql-trunk-bugfixing branch (magnus.blaudd:3393) Bug#58160
View as plain text  
#At file:///data0/magnus/mysql/trunk-bugfixing/ based on revid:azundris@stripped

 3393 Magnus Blåudd	2010-11-25 [merge]
      Merge patch for bug#58160 into trunk-bugfixing

    modified:
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      mysql-test/suite/rpl/t/disabled.def
=== modified file 'mysql-test/extra/rpl_tests/rpl_change_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_change_master.test	2010-11-23 22:37:59 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_change_master.test	2010-11-25 10:56:45 +0000
@@ -230,6 +230,10 @@ if ($retry_count5 != $retry_count_expect
   -- die
 }
 
+# action: change the value back to the original one
+-- source include/stop_slave.inc
+-- eval CHANGE MASTER TO master_retry_count=$retry_count0
+
 ## assert that there is a parse error if not using a numerical value
 -- error ER_PARSE_ERROR
 CHANGE MASTER TO master_retry_count='a';
@@ -238,6 +242,16 @@ CHANGE MASTER TO master_retry_count='a';
 -- error ER_PARSE_ERROR
 CHANGE MASTER TO master_retry_count=-1;
 
+-- source include/start_slave.inc
+
+## assert that the test has cleaned itself up
+-- let $retry_count6= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
+if (`SELECT $retry_count6 <> $retry_count0`)
+{
+  -- echo Unexpected retry count value! Got: $retry_count6, expected: $retry_count0
+  -- die
+}
+
 ## Checks if Replicate_Ignore_Server_Ids is correctly written to a repository.
 
 --connection slave

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-12 19:41:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-25 10:56:45 +0000
@@ -64,10 +64,13 @@ CHANGE MASTER TO master_connect_retry= 1
 ### stop slave server
 ### start slave server
 include/start_slave.inc
+include/stop_slave.inc
+CHANGE MASTER TO master_retry_count=10;
 CHANGE MASTER TO master_retry_count='a';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''a'' at line 1
 CHANGE MASTER TO master_retry_count=-1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1
+include/start_slave.inc
 include/stop_slave.inc
 CHANGE MASTER TO master_connect_retry= 200, IGNORE_SERVER_IDS= (100, 200, 300, 400, 500);
 ### stop slave server

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2010-11-12 19:41:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result	2010-11-25 10:56:45 +0000
@@ -64,10 +64,13 @@ CHANGE MASTER TO master_connect_retry= 1
 ### stop slave server
 ### start slave server
 include/start_slave.inc
+include/stop_slave.inc
+CHANGE MASTER TO master_retry_count=10;
 CHANGE MASTER TO master_retry_count='a';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''a'' at line 1
 CHANGE MASTER TO master_retry_count=-1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1
+include/start_slave.inc
 include/stop_slave.inc
 CHANGE MASTER TO master_connect_retry= 200, IGNORE_SERVER_IDS= (100, 200, 300, 400, 500);
 ### stop slave server

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2010-11-17 14:47:00 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2010-11-25 10:56:45 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 
-rpl_change_master         : Bug#58160 2010-11-12 alik Incorrect behaviour of rpl_chage_master
 rpl_row_create_table      : Bug#51574 2010-02-27 andrei failed different way than earlier with bug#45576
 rpl_spec_variables        : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
 rpl_log_pos               : BUG#55675 2010-09-10 alfranio rpl.rpl_log_pos fails sporadically with error binlog truncated in the middle

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk-bugfixing branch (magnus.blaudd:3393) Bug#58160Magnus Blåudd25 Nov