[Commits] Rev 4294: MDEV-6465 - rpl.rpl_gtid_master_promote fails on PPC64 in lp:maria/10.0

Sergey Vojtovich svoj at mariadb.org
Mon Jul 21 12:16:17 EEST 2014


At lp:maria/10.0

------------------------------------------------------------
revno: 4294
revision-id: svoj at mariadb.org-20140721091608-n9fcgun66m3iimzh
parent: svoj at mariadb.org-20140718154521-mwoz6ezimga0axcj
committer: Sergey Vojtovich <svoj at mariadb.org>
branch nick: 10.0
timestamp: Mon 2014-07-21 13:16:08 +0400
message:
  MDEV-6465 - rpl.rpl_gtid_master_promote fails on PPC64
  
  GTID order in @@gtid_binlog_pos depends on internal hash order,
  so requires --replace_result for stable test output.
=== modified file 'mysql-test/suite/rpl/r/rpl_gtid_master_promote.result'
--- a/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result	2013-05-28 11:28:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result	2014-07-21 09:16:08 +0000
@@ -119,7 +119,7 @@ a	b
 2	3
 *** Now replicate all extra changes from 3,4,5 to 2, in preparation for making 2 the new master. ***
 CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_3;
-START SLAVE UNTIL master_gtid_pos = "1-1-1,0-1-3,3-1-7,2-1-4";
+START SLAVE UNTIL master_gtid_pos = "SERVER3_POS";
 include/wait_for_slave_to_stop.inc
 SELECT * FROM t1 ORDER BY a;
 a
@@ -142,7 +142,7 @@ a	b
 3	1
 3	3
 CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_4;
-START SLAVE UNTIL master_gtid_pos = "1-1-7,0-1-3,3-1-4,2-1-1";
+START SLAVE UNTIL master_gtid_pos = "SERVER4_POS";
 include/wait_for_slave_to_stop.inc
 SELECT * FROM t1 ORDER BY a;
 a
@@ -168,7 +168,7 @@ a	b
 3	1
 3	3
 CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_5;
-START SLAVE UNTIL master_gtid_pos = "1-1-4,0-1-3,3-1-1,2-1-7";
+START SLAVE UNTIL master_gtid_pos = "SERVER5_POS";
 include/wait_for_slave_to_stop.inc
 SELECT * FROM t1 ORDER BY a;
 a

=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_master_promote.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test	2013-05-22 15:36:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test	2014-07-21 09:16:08 +0000
@@ -139,6 +139,7 @@ SELECT * FROM t4 ORDER BY a,b;
 --connection server_2
 --replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_3;
+--replace_result $server3_pos SERVER3_POS
 eval START SLAVE UNTIL master_gtid_pos = "$server3_pos";
 --source include/wait_for_slave_to_stop.inc
 SELECT * FROM t1 ORDER BY a;
@@ -151,6 +152,7 @@ SELECT * FROM t4 ORDER BY a,b;
 --connection server_2
 --replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_4;
+--replace_result $server4_pos SERVER4_POS
 eval START SLAVE UNTIL master_gtid_pos = "$server4_pos";
 --source include/wait_for_slave_to_stop.inc
 SELECT * FROM t1 ORDER BY a;
@@ -163,6 +165,7 @@ SELECT * FROM t4 ORDER BY a,b;
 --connection server_2
 --replace_result $SERVER_MYPORT_5 SERVER_MYPORT_5
 eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_5;
+--replace_result $server5_pos SERVER5_POS
 eval START SLAVE UNTIL master_gtid_pos = "$server5_pos";
 --source include/wait_for_slave_to_stop.inc
 SELECT * FROM t1 ORDER BY a;



More information about the commits mailing list