summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Nesterenko <brandon.nesterenko@mariadb.com>2023-04-24 09:52:28 -0600
committerBrandon Nesterenko <brandon.nesterenko@mariadb.com>2023-04-24 09:52:28 -0600
commitc209688b8d23a61b5d018cd7b55cbffcf0909fd6 (patch)
tree5d976657f4cac287678d5a985830204cae352f6c
parent7859ef041444f7a7c25f63cd4a975dd9ee73ecfb (diff)
downloadmariadb-git-bb-10.4-MDEV-30430.tar.gz
MDEV-30430: Needed primary-replica sync in testbb-10.4-MDEV-30430
-rw-r--r--mysql-test/suite/versioning/r/rpl.result4
-rw-r--r--mysql-test/suite/versioning/t/rpl.test4
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/versioning/r/rpl.result b/mysql-test/suite/versioning/r/rpl.result
index 9980f6851d1..17372c63e99 100644
--- a/mysql-test/suite/versioning/r/rpl.result
+++ b/mysql-test/suite/versioning/r/rpl.result
@@ -172,9 +172,11 @@ insert into t1 values (1);
delete from t1;
connection slave;
include/diff_tables.inc [master:test.t1,slave:test.t1]
-# check unversioned -> versioned replication with non-unique keys on duplicate records
connection master;
drop table t1;
+connection slave;
+# check unversioned -> versioned replication with non-unique keys on duplicate records
+connection master;
set statement sql_log_bin=0 for create table t1 (a INT NOT NULL, b INT, INDEX(a,b));
connection slave;
set statement sql_log_bin=0 for create table t1 (a INT NOT NULL, b INT, INDEX(a,b)) with system versioning;
diff --git a/mysql-test/suite/versioning/t/rpl.test b/mysql-test/suite/versioning/t/rpl.test
index 412bf00533b..9c04c27926e 100644
--- a/mysql-test/suite/versioning/t/rpl.test
+++ b/mysql-test/suite/versioning/t/rpl.test
@@ -146,10 +146,12 @@ delete from t1;
sync_slave_with_master;
--let $diff_tables= master:test.t1,slave:test.t1
--source include/diff_tables.inc
+connection master;
+drop table t1;
+sync_slave_with_master;
--echo # check unversioned -> versioned replication with non-unique keys on duplicate records
connection master;
-drop table t1;
set statement sql_log_bin=0 for create table t1 (a INT NOT NULL, b INT, INDEX(a,b));
connection slave;
set statement sql_log_bin=0 for create table t1 (a INT NOT NULL, b INT, INDEX(a,b)) with system versioning;