Tests: fix combinations

mysql-test/suite/versioning/common.inc

@@ -1,4 +1,6 @@
 --disable_query_log
+--source suite/versioning/innodb.inc
+
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from mysql.transaction_registry;
 set @test_start=now(6);

mysql-test/suite/versioning/common.opt

@@ -1,18 +1,2 @@
---innodb
---innodb-cmpmem
---innodb-cmp-per-index
---innodb-trx
---innodb-locks
---innodb-metrics
---innodb-buffer-pool-stats
---innodb-buffer-page
---innodb-buffer-page-lru
---innodb-sys-columns
---innodb-sys-fields
---innodb-sys-foreign
---innodb-sys-foreign-cols
---innodb-sys-indexes
---innodb-sys-tables
---innodb-sys-virtual
 --versioning-hide=implicit
 --plugin-load=versioning

mysql-test/suite/versioning/engines.inc

@@ -0,0 +1 @@
+--source suite/versioning/innodb.inc

mysql-test/suite/versioning/innodb.opt

@@ -0,0 +1,16 @@
+--innodb
+--innodb-cmpmem
+--innodb-cmp-per-index
+--innodb-trx
+--innodb-locks
+--innodb-metrics
+--innodb-buffer-pool-stats
+--innodb-buffer-page
+--innodb-buffer-page-lru
+--innodb-sys-columns
+--innodb-sys-fields
+--innodb-sys-foreign
+--innodb-sys-foreign-cols
+--innodb-sys-indexes
+--innodb-sys-tables
+--innodb-sys-virtual

mysql-test/suite/versioning/r/rpl_row.result

@@ -1,118 +0,0 @@
-include/master-slave.inc
-[connection master]
-connection slave;
-connection master;
-CREATE TABLE t1 (x int) with system versioning;
-insert into t1 values (1);
-SELECT * FROM t1;
-x
-1
-delete from t1;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-1
-connection slave;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-1
-connection master;
-insert into t1 values (2);
-connection slave;
-select * from t1;
-x
-2
-connection master;
-update t1 set x = 3;
-connection slave;
-select * from t1;
-x
-3
-select * from t1 for system_time all;
-x
-1
-3
-2
-connection master;
-create or replace table t1 (x int primary key);
-connection slave;
-alter table t1 with system versioning;
-connection master;
-insert into t1 values (1);
-connection slave;
-select * from t1;
-x
-1
-select * from t1 for system_time all;
-x
-1
-connection master;
-update t1 set x= 2 where x = 1;
-connection slave;
-select * from t1;
-x
-2
-select * from t1 for system_time all;
-x
-1
-2
-connection master;
-delete from t1;
-connection slave;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-1
-2
-connection master;
-create or replace table t1 (x int);
-connection slave;
-alter table t1 with system versioning;
-connection master;
-insert into t1 values (1);
-update t1 set x= 2 where x = 1;
-connection slave;
-select * from t1;
-x
-2
-select * from t1 for system_time all;
-x
-2
-1
-connection master;
-delete from t1;
-connection slave;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-2
-1
-connection master;
-create or replace table t1 (x int) with system versioning;
-create or replace table t2 (x int) with system versioning;
-insert into t1 values (1);
-insert into t2 values (2);
-update t1, t2 set t1.x=11, t2.x=22;
-connection slave;
-select * from t1;
-x
-11
-select * from t2;
-x
-22
-select * from t1 for system_time all;
-x
-11
-1
-select * from t2 for system_time all;
-x
-22
-2
-connection master;
-drop table t1, t2;
-include/rpl_end.inc

mysql-test/suite/versioning/r/rpl_stmt.result

@@ -1,118 +0,0 @@
-include/master-slave.inc
-[connection master]
-connection slave;
-connection master;
-CREATE TABLE t1 (x int) with system versioning;
-insert into t1 values (1);
-SELECT * FROM t1;
-x
-1
-delete from t1;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-1
-connection slave;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-1
-connection master;
-insert into t1 values (2);
-connection slave;
-select * from t1;
-x
-2
-connection master;
-update t1 set x = 3;
-connection slave;
-select * from t1;
-x
-3
-select * from t1 for system_time all;
-x
-1
-3
-2
-connection master;
-create or replace table t1 (x int primary key);
-connection slave;
-alter table t1 with system versioning;
-connection master;
-insert into t1 values (1);
-connection slave;
-select * from t1;
-x
-1
-select * from t1 for system_time all;
-x
-1
-connection master;
-update t1 set x= 2 where x = 1;
-connection slave;
-select * from t1;
-x
-2
-select * from t1 for system_time all;
-x
-1
-2
-connection master;
-delete from t1;
-connection slave;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-1
-2
-connection master;
-create or replace table t1 (x int);
-connection slave;
-alter table t1 with system versioning;
-connection master;
-insert into t1 values (1);
-update t1 set x= 2 where x = 1;
-connection slave;
-select * from t1;
-x
-2
-select * from t1 for system_time all;
-x
-2
-1
-connection master;
-delete from t1;
-connection slave;
-select * from t1;
-x
-select * from t1 for system_time all;
-x
-2
-1
-connection master;
-create or replace table t1 (x int) with system versioning;
-create or replace table t2 (x int) with system versioning;
-insert into t1 values (1);
-insert into t2 values (2);
-update t1, t2 set t1.x=11, t2.x=22;
-connection slave;
-select * from t1;
-x
-11
-select * from t2;
-x
-22
-select * from t1 for system_time all;
-x
-11
-1
-select * from t2 for system_time all;
-x
-22
-2
-connection master;
-drop table t1, t2;
-include/rpl_end.inc

mysql-test/suite/versioning/t/create.test

@@ -1,4 +1,5 @@
--- source suite/versioning/common.inc
+--source suite/versioning/engines.inc
+--source suite/versioning/common.inc
 
 --disable_warnings
 drop table if exists t1;

mysql-test/suite/versioning/t/partition.combinations

@@ -1,7 +0,0 @@
-# [innodb]
-# partition
-# default-storage-engine=innodb
-
-[myisam]
-partition
-default-storage-engine=myisam

mysql-test/suite/versioning/t/partition.opt

@@ -1 +1,2 @@
+--partition
 --versioning-hide=implicit

mysql-test/suite/versioning/t/rpl.test

@@ -1,3 +1,19 @@
+--source include/master-slave.inc
+
+if ($MTR_COMBINATION_STMT)
+{
+  --source include/have_binlog_format_statement.inc
+}
+if ($MTR_COMBINATION_ROW)
+{
+  --source include/have_binlog_format_row.inc
+}
+if ($MTR_COMBINATION_MIX)
+{
+  --source include/have_binlog_format_mixed.inc
+}
+--source suite/versioning/engines.inc
+
 #BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
 #Testing command counters -BEFORE.
 #Storing the before counts of Slave
@@ -88,3 +104,5 @@ select * from t2 for system_time all;
 
 connection master;
 drop table t1, t2;
+
+--source include/rpl_end.inc

mysql-test/suite/versioning/t/rpl_mixed.combinations

@@ -1,5 +0,0 @@
-[myisam]
-default-storage-engine=myisam
-
-[innodb]
-default-storage-engine=innodb

mysql-test/suite/versioning/t/rpl_mixed.test

@@ -1,7 +0,0 @@
--- source include/have_binlog_format_mixed.inc
--- source include/master-slave.inc
--- source include/have_innodb.inc
-
--- source rpl_test.inc
-
--- source include/rpl_end.inc

mysql-test/suite/versioning/t/rpl_row.combinations

@@ -1,5 +0,0 @@
-[myisam]
-default-storage-engine=myisam
-
-[innodb]
-default-storage-engine=innodb

mysql-test/suite/versioning/t/rpl_row.test

@@ -1,7 +0,0 @@
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
--- source include/have_innodb.inc
-
--- source rpl_test.inc
-
--- source include/rpl_end.inc

mysql-test/suite/versioning/t/rpl_stmt.combinations

@@ -1,5 +0,0 @@
-[innodb]
-default-storage-engine=innodb
-
-[myisam]
-default-storage-engine=myisam

mysql-test/suite/versioning/t/rpl_stmt.test

@@ -1,7 +0,0 @@
--- source include/have_binlog_format_statement.inc
--- source include/master-slave.inc
--- source include/have_innodb.inc
-
--- source rpl_test.inc
-
--- source include/rpl_end.inc

mysql-test/suite/versioning/t/select.combinations

@@ -1,5 +0,0 @@
-[innodb]
-default-storage-engine=innodb
-
-[myisam]
-default-storage-engine=myisam

mysql-test/suite/versioning/t/select.test

@@ -1,4 +1,5 @@
--- source suite/versioning/common.inc
+--source suite/versioning/engines.inc
+--source suite/versioning/common.inc
 
 # test_01
 

mysql-test/suite/versioning/t/select_sp.combinations

@@ -1,5 +0,0 @@
-[innodb]
-default-storage-engine=innodb
-
-[myisam]
-default-storage-engine=myisam

mysql-test/suite/versioning/t/select_sp.test

@@ -1,4 +1,5 @@
--- source suite/versioning/common.inc
+--source suite/versioning/engines.inc
+--source suite/versioning/common.inc
 
 delimiter ~~;
 create procedure test_01()

mysql-test/suite/versioning/t/truncate.combinations

@@ -1,5 +0,0 @@
-[innodb]
-default-storage-engine=innodb
-
-[myisam]
-default-storage-engine=myisam

mysql-test/suite/versioning/t/truncate.test

@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+--source suite/versioning/engines.inc
 
 create table t (a int);
 --error ER_VERSIONING_REQUIRED

mysql-test/suite/versioning/t/view.combinations

@@ -1,5 +0,0 @@
-[innodb]
-default-storage-engine=innodb
-
-[myisam]
-default-storage-engine=myisam

mysql-test/suite/versioning/t/view.test

@@ -1,4 +1,5 @@
--- source suite/versioning/common.inc
+--source suite/versioning/engines.inc
+--source suite/versioning/common.inc
 
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);