From a82cfe109cbc033253ddaba82f9c2de663601002 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 27 Mar 2019 16:35:19 +0100
Subject: [PATCH] cleanup: move rbr-only test to rpl_row.test

---
 mysql-test/suite/versioning/r/rpl.result     | 13 -------------
 mysql-test/suite/versioning/r/rpl_row.result | 14 ++++++++++++++
 mysql-test/suite/versioning/t/rpl.test       | 17 -----------------
 mysql-test/suite/versioning/t/rpl_row.test   | 18 ++++++++++++++++++
 4 files changed, 32 insertions(+), 30 deletions(-)
 create mode 100644 mysql-test/suite/versioning/r/rpl_row.result
 create mode 100644 mysql-test/suite/versioning/t/rpl_row.test

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