From bc7cf6f5fd492daa8101942e0a24668494ffa461 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Wed, 13 May 2026 22:55:45 +0000 Subject: [PATCH] MDEV-39459 Fix bad sync pattern for chain replication MTR tests In chain replication (1->2->3), syncing only server_3 after save_master_gtid on server_1 does not guarantee server_2 has committed, because server_2's binlog dump thread can send events to server_3 before commit_ordered() completes on server_2. Fix affected rpl tests by syncing server_2 before server_3, and update result files accordingly. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc. --- .../rpl/include/rpl_row_img_sequence.inc | 9 + .../rpl_xa_empty_transaction_test_case.inc | 8 + .../rpl/r/rpl_row_img_sequence_full.result | 72 ++++++++ .../rpl/r/rpl_row_img_sequence_min.result | 72 ++++++++ .../rpl/r/rpl_row_img_sequence_noblob.result | 72 ++++++++ .../rpl/r/rpl_start_alter_chain_basic.result | 3 + .../rpl/r/rpl_xa_empty_transaction.result | 171 ++++++++++++++++++ .../rpl/t/rpl_start_alter_chain_basic.test | 3 + .../suite/rpl/t/rpl_xa_empty_transaction.test | 3 + 9 files changed, 413 insertions(+) diff --git a/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc b/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc index d9ed6f278b9d9..ebb811b1f3bfb 100644 --- a/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc +++ b/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc @@ -28,6 +28,9 @@ SELECT SETVAL(s1, 10); --source include/save_master_gtid.inc --echo # Validate SETVAL replicated correctly to other servers +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc --connection server_3 --source include/sync_with_master_gtid.inc --let $diff_tables= server_1:test.s1,server_2:test.s1,server_3:test.s1 @@ -60,6 +63,9 @@ SELECT NEXTVAL(s1); --source include/save_master_gtid.inc --echo # Validate NEXTVAL replicated correctly to other servers +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc --connection server_3 --source include/sync_with_master_gtid.inc --let $diff_tables= server_1:test.s1,server_2:test.s1,server_3:test.s1 @@ -88,5 +94,8 @@ FLUSH LOGS; --connection server_1 DROP TABLE s1; --source include/save_master_gtid.inc +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc --connection server_3 --source include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc b/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc index 6368336b8e36c..aa67fab9d4011 100644 --- a/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc +++ b/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc @@ -34,6 +34,10 @@ CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; --source include/save_master_gtid.inc +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc + --connection server_3 --source include/sync_with_master_gtid.inc @@ -127,5 +131,9 @@ FLUSH LOGS; DROP TABLE ti,tm; --source include/save_master_gtid.inc +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc + --connection server_3 --source include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result index 2303911637f78..4dd186db922e2 100644 --- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result +++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result @@ -53,6 +53,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -90,6 +93,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -124,6 +130,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, MyISAM, InnoDB @@ -144,6 +153,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -181,6 +193,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -215,6 +230,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, InnoDB, MyISAM @@ -235,6 +253,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -272,6 +293,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -306,6 +330,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, InnoDB, InnoDB @@ -326,6 +353,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -363,6 +393,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -397,6 +430,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, MyISAM, MyISAM @@ -417,6 +453,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -454,6 +493,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -488,6 +530,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, MyISAM, InnoDB @@ -508,6 +553,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -545,6 +593,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -579,6 +630,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, InnoDB, MyISAM @@ -599,6 +653,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -636,6 +693,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -670,6 +730,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, InnoDB, InnoDB @@ -690,6 +753,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -727,6 +793,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -761,6 +830,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result index eaf770f245c92..b387742d5499c 100644 --- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result +++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result @@ -54,6 +54,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -91,6 +94,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -125,6 +131,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, MyISAM, InnoDB @@ -145,6 +154,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -182,6 +194,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -216,6 +231,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, InnoDB, MyISAM @@ -236,6 +254,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -273,6 +294,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -307,6 +331,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, InnoDB, InnoDB @@ -327,6 +354,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -364,6 +394,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -398,6 +431,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, MyISAM, MyISAM @@ -418,6 +454,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -455,6 +494,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -489,6 +531,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, MyISAM, InnoDB @@ -509,6 +554,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -546,6 +594,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -580,6 +631,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, InnoDB, MyISAM @@ -600,6 +654,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -637,6 +694,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -671,6 +731,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, InnoDB, InnoDB @@ -691,6 +754,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -728,6 +794,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -762,6 +831,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N' diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result index 496bd8dc6b886..8ca8ea3e3f80b 100644 --- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result +++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result @@ -53,6 +53,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -90,6 +93,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -124,6 +130,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, MyISAM, InnoDB @@ -144,6 +153,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -181,6 +193,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -215,6 +230,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, InnoDB, MyISAM @@ -235,6 +253,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -272,6 +293,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -306,6 +330,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: MyISAM, InnoDB, InnoDB @@ -326,6 +353,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -363,6 +393,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -397,6 +430,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, MyISAM, MyISAM @@ -417,6 +453,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -454,6 +493,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -488,6 +530,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, MyISAM, InnoDB @@ -508,6 +553,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -545,6 +593,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -579,6 +630,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, InnoDB, MyISAM @@ -599,6 +653,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -636,6 +693,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -670,6 +730,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc ### engines: InnoDB, InnoDB, InnoDB @@ -690,6 +753,9 @@ SETVAL(s1, 10) 10 include/save_master_gtid.inc # Validate SETVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -727,6 +793,9 @@ NEXTVAL(s1) 11 include/save_master_gtid.inc # Validate NEXTVAL replicated correctly to other servers +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1] @@ -761,6 +830,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)] connection server_1; DROP TABLE s1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N' diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result index a62b02b2f44a6..bdb4c2ae1231c 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result @@ -66,6 +66,9 @@ domain_id seq_no 0 12 connection server_1; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; diff --git a/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result b/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result index 917041c148d23..37b0b06d22250 100644 --- a/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result +++ b/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result @@ -13,6 +13,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -37,6 +40,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -46,6 +52,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -77,6 +86,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -86,6 +98,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -110,6 +125,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -119,6 +137,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -150,6 +171,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc # @@ -162,6 +186,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -188,6 +215,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -197,6 +227,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -230,6 +263,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -239,6 +275,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -265,6 +304,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -274,6 +316,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -307,6 +352,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc # @@ -323,6 +371,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -349,6 +400,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -358,6 +412,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -391,6 +448,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -400,6 +460,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -428,6 +491,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -437,6 +503,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -470,6 +539,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -485,6 +557,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -513,6 +588,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -522,6 +600,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -557,6 +638,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -566,6 +650,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -594,6 +681,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -603,6 +693,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -638,6 +731,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc # @@ -655,6 +751,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -683,6 +782,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -692,6 +794,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -727,6 +832,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -736,6 +844,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -766,6 +877,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -775,6 +889,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -810,6 +927,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -830,6 +950,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -858,6 +981,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -867,6 +993,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -902,6 +1031,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -911,6 +1043,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -941,6 +1076,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -950,6 +1088,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -985,6 +1126,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1004,6 +1148,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1032,6 +1179,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1041,6 +1191,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1076,6 +1229,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1085,6 +1241,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1115,6 +1274,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1124,6 +1286,9 @@ connection server_1; CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam; CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1159,6 +1324,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction] connection server_1; DROP TABLE ti,tm; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc connection server_1; @@ -1173,6 +1341,9 @@ create database db1; create database db2; create table db1.t1 (a int) engine=innodb; include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +include/save_master_gtid.inc connection server_3; include/sync_with_master_gtid.inc include/stop_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test index efb667ad6fad0..7918e517b4d42 100644 --- a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test +++ b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test @@ -41,6 +41,9 @@ select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; --connection server_1 --source include/save_master_gtid.inc +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc --connection server_3 --source include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test b/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test index 85b6bcdb87397..166e3829e9fd5 100644 --- a/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test +++ b/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test @@ -187,6 +187,9 @@ create database db1; create database db2; create table db1.t1 (a int) engine=innodb; --source include/save_master_gtid.inc +--connection server_2 +--source include/sync_with_master_gtid.inc +--source include/save_master_gtid.inc --connection server_3 --source include/sync_with_master_gtid.inc --source include/stop_slave.inc