diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-03-27 16:35:19 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 12:51:19 +0100 |
commit | a82cfe109cbc033253ddaba82f9c2de663601002 (patch) | |
tree | 6b976f2237552cd948d6d8ed271075e770864365 /mysql-test/suite/versioning | |
parent | 39d7e5969ba06f78d44e5cbd1ea72f882f3a5e66 (diff) | |
download | mariadb-git-a82cfe109cbc033253ddaba82f9c2de663601002.tar.gz |
cleanup: move rbr-only test to rpl_row.test
Diffstat (limited to 'mysql-test/suite/versioning')
-rw-r--r-- | mysql-test/suite/versioning/r/rpl.result | 13 | ||||
-rw-r--r-- | mysql-test/suite/versioning/r/rpl_row.result | 14 | ||||
-rw-r--r-- | mysql-test/suite/versioning/t/rpl.test | 17 | ||||
-rw-r--r-- | mysql-test/suite/versioning/t/rpl_row.test | 18 |
4 files changed, 32 insertions, 30 deletions
diff --git a/mysql-test/suite/versioning/r/rpl.result b/mysql-test/suite/versioning/r/rpl.result index 8db963f9ea4..fd62a65f473 100644 --- a/mysql-test/suite/versioning/r/rpl.result +++ b/mysql-test/suite/versioning/r/rpl.result @@ -164,17 +164,4 @@ update t1 set i = 0; connection slave; connection master; drop table t1; -# MDEV-16252: MINIMAL binlog_row_image does not work for versioned tables -set @old_row_image= @@binlog_row_image; -set binlog_row_image= minimal; -create or replace table t1 (pk int, i int, primary key(pk)) -with system versioning; -insert into t1 values (1,10),(2,20); -update t1 set i = 0; -connection slave; -connection master; -drop table t1; -set binlog_row_image= @old_row_image; -drop database test; -create database test; include/rpl_end.inc diff --git a/mysql-test/suite/versioning/r/rpl_row.result b/mysql-test/suite/versioning/r/rpl_row.result new file mode 100644 index 00000000000..03ac8dc9eb8 --- /dev/null +++ b/mysql-test/suite/versioning/r/rpl_row.result @@ -0,0 +1,14 @@ +include/master-slave.inc +[connection master] +# MDEV-16252: MINIMAL binlog_row_image does not work for versioned tables +set @old_row_image= @@binlog_row_image; +set binlog_row_image= minimal; +create or replace table t1 (pk int, i int, primary key(pk)) +with system versioning; +insert into t1 values (1,10),(2,20); +update t1 set i = 0; +connection slave; +connection master; +drop table t1; +set binlog_row_image= @old_row_image; +include/rpl_end.inc diff --git a/mysql-test/suite/versioning/t/rpl.test b/mysql-test/suite/versioning/t/rpl.test index 2549684da51..e59d41c38a3 100644 --- a/mysql-test/suite/versioning/t/rpl.test +++ b/mysql-test/suite/versioning/t/rpl.test @@ -133,21 +133,4 @@ sync_slave_with_master; connection master; drop table t1; ---echo # MDEV-16252: MINIMAL binlog_row_image does not work for versioned tables -set @old_row_image= @@binlog_row_image; -set binlog_row_image= minimal; - -create or replace table t1 (pk int, i int, primary key(pk)) -with system versioning; -insert into t1 values (1,10),(2,20); -update t1 set i = 0; - ---sync_slave_with_master ---connection master -drop table t1; -set binlog_row_image= @old_row_image; - -drop database test; -create database test; - --source include/rpl_end.inc diff --git a/mysql-test/suite/versioning/t/rpl_row.test b/mysql-test/suite/versioning/t/rpl_row.test new file mode 100644 index 00000000000..17ce2dfdcf8 --- /dev/null +++ b/mysql-test/suite/versioning/t/rpl_row.test @@ -0,0 +1,18 @@ +--source include/have_binlog_format_row.inc +--source include/master-slave.inc + +--echo # MDEV-16252: MINIMAL binlog_row_image does not work for versioned tables +set @old_row_image= @@binlog_row_image; +set binlog_row_image= minimal; + +create or replace table t1 (pk int, i int, primary key(pk)) +with system versioning; +insert into t1 values (1,10),(2,20); +update t1 set i = 0; + +--sync_slave_with_master +--connection master +drop table t1; +set binlog_row_image= @old_row_image; + +--source include/rpl_end.inc |