[Commits] Rev 4289: Fix test failure seen in buildbot on power8. in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Jul 11 12:17:50 EEST 2014


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4289
revision-id: knielsen at knielsen-hq.org-20140711091750-a136ax0ticxzto79
parent: svoj at mariadb.org-20140710084420-ddrl1tk674j2ipn0
committer: Kristian Nielsen <knielsen at knielsen-hq.org>
branch nick: merge-10.0
timestamp: Fri 2014-07-11 11:17:50 +0200
message:
  Fix test failure seen in buildbot on power8.
  
  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_until.result'
--- a/mysql-test/suite/rpl/r/rpl_gtid_until.result	2013-05-28 11:28:31 +0000
+++ b/mysql-test/suite/rpl/r/rpl_gtid_until.result	2014-07-11 09:17:50 +0000
@@ -168,7 +168,7 @@ SELECT * FROM t1 ORDER BY a;
 include/stop_slave.inc
 CREATE TABLE t3 (a INT);
 DROP TABLE t3;
-START SLAVE UNTIL master_gtid_pos='1-1-5,2-1-5,0-1-6';
+START SLAVE UNTIL master_gtid_pos='UNTIL_CONDITION';
 include/wait_for_slave_to_stop.inc
 SHOW CREATE TABLE t3;
 Table   Create Table

=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_until.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_until.test	2013-05-22 15:36:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_until.test	2014-07-11 09:17:50 +0000
@@ -175,6 +175,7 @@ DROP TABLE t3;
 --save_master_pos
 
 --connection server_2
+--replace_result $until_condition UNTIL_CONDITION
 eval START SLAVE UNTIL master_gtid_pos='$until_condition';
 --source include/wait_for_slave_to_stop.inc
 SHOW CREATE TABLE t3;



More information about the commits mailing list