bzr commit into mysql-trunk-bugfixing branch (magnus.blaudd:3387)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/trunk-bugfixing-wl3127/ based on revid:marc.alff@strippedbhegu3ca

 3387 Magnus Blåudd	2010-11-25 [merge]
      Merge in patch for bug58160

    modified:
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_change_master.test
=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2010-08-05 17:45:25 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-18 15:51:24 +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
 stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;

=== 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 09:12:05 +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

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test	2010-11-17 12:21:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test	2010-11-25 09:12:05 +0000
@@ -232,6 +232,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';
@@ -240,5 +244,15 @@ 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
+}
+
 -- source include/master-slave-reset.inc
 -- source include/master-slave-end.inc

No bundle (reason: revision is a merge).