From 9f252fceaba95a1c1b39183f61266e5408f7ad39 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Wed, 6 Aug 2014 13:07:16 +0400 Subject: [PATCH] MDEV-6469 - rpl.rpl_gtid_basic, rpl.rpl_gtid_stop_start, rpl.rpl_gtid_crash fail on PPC64 This is an addition to the original patch. Restored show binlog events output and adjusted filters to replace [\d-\d-\d,\d-\d-\d,\d-\d-\d] with [#-#-#]. --- mysql-test/include/show_events.inc | 2 +- mysql-test/suite/rpl/r/rpl_gtid_basic.result | 5 +++++ mysql-test/suite/rpl/t/rpl_gtid_basic.test | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/show_events.inc b/mysql-test/include/show_events.inc index f7b0931c812..9a39ec67d0e 100644 --- a/mysql-test/include/show_events.inc +++ b/mysql-test/include/show_events.inc @@ -83,7 +83,7 @@ let $script= s{block_len=[0-9]+}{block_len=#}; s{Server ver:.*DOLLAR}{SERVER_VERSION, BINLOG_VERSION}; s{GTID [0-9]+-[0-9]+-[0-9]+}{GTID #-#-#}; - s{\[[0-9]-[0-9]-[0-9]+\]}{[#-#-#]}; + s{\[([0-9]-[0-9]-[0-9]+,?)+\]}{[#-#-#]}; s{cid=[0-9]+}{cid=#}; s{SQL_LOAD-[a-z,0-9,-]*.[a-z]*}{SQL_LOAD---.}; s{rand_seed1=[0-9]*,rand_seed2=[0-9]*}{rand_seed1=,rand_seed2=}; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_basic.result b/mysql-test/suite/rpl/r/rpl_gtid_basic.result index e4aafcab389..e8e5bf36f84 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_basic.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_basic.result @@ -182,6 +182,11 @@ SET GLOBAL gtid_binlog_state = '0-1-10,1-2-20,0-3-30'; show binary logs; Log_name File_size master-bin.000001 # +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION +master-bin.000001 # Gtid_list # # [#-#-#] +master-bin.000001 # Binlog_checkpoint # # master-bin.000001 SET GLOBAL gtid_binlog_state = @old_state; ERROR HY000: This operation is not allowed if any GTID has been logged to the binary log. Run RESET MASTER first to erase the log RESET MASTER; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_basic.test b/mysql-test/suite/rpl/t/rpl_gtid_basic.test index ebe9b05912d..5ecff519aef 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_basic.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_basic.test @@ -175,7 +175,7 @@ SET GLOBAL gtid_binlog_state = '0-1-10,1-2-20,0-3-30'; --source include/show_binary_logs.inc --let $binlog_file= master-bin.000001 --let $binlog_start= 4 -#--source include/show_binlog_events.inc +--source include/show_binlog_events.inc #SELECT @@GLOBAL.gtid_binlog_pos; #SELECT @@GLOBAL.gtid_binlog_state; --error ER_BINLOG_MUST_BE_EMPTY