bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3420)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/6.3/ based on revid:magnus.blaudd@stripped

 3420 Magnus Blåudd	2011-04-08
      ndb
       - fix rpl_change_master test to restore the orignal Master_bind value
          which was used when test was started

    modified:
      mysql-test/suite/rpl/r/rpl_change_master.result
      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	2011-04-07 19:57:33 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2011-04-08 12:10:46 +0000
@@ -203,7 +203,7 @@ n
 1
 2
 stop slave;
-change master to master_bind='127.0.0.1';
+change master to master_bind='<save_master_bind>';
 start slave;
 select * from t1;
 n

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test	2011-04-07 19:57:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test	2011-04-08 12:10:46 +0000
@@ -51,6 +51,7 @@ sync_with_master;
 # End of 4.1 tests
 --echo master_bind tests
 connection slave;
+let $save_master_bind= query_get_value(SHOW SLAVE STATUS, Master_Bind, 1);
 stop slave;
 --replace_column 1 # 7 # 8 # 9 # 22 # 23 #
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -88,7 +89,8 @@ select * from t1;
 
 connection slave;
 stop slave;
-change master to master_bind='127.0.0.1';
+--replace_result $save_master_bind <save_master_bind>
+eval change master to master_bind='$save_master_bind';
 start slave;
 sync_with_master;
 select * from t1;

Attachment: [text/bzr-bundle] bzr/[e-mail]