From 5bf14f93a41ccf9a1aaf943b8c11ab88186ae436 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Mon, 4 Dec 2017 00:07:33 +0300 Subject: [PATCH] Tests: fix combinations --- mysql-test/suite/versioning/common.inc | 2 + mysql-test/suite/versioning/common.opt | 16 --- ...eate.combinations => engines.combinations} | 0 mysql-test/suite/versioning/engines.inc | 1 + mysql-test/suite/versioning/innodb.inc | 0 mysql-test/suite/versioning/innodb.opt | 16 +++ .../r/{rpl_mixed.result => rpl.result} | 0 mysql-test/suite/versioning/r/rpl_row.result | 118 ------------------ mysql-test/suite/versioning/r/rpl_stmt.result | 118 ------------------ mysql-test/suite/versioning/t/create.test | 3 +- .../suite/versioning/t/partition.combinations | 7 -- mysql-test/suite/versioning/t/partition.opt | 1 + .../versioning/t/{rpl_test.opt => rpl.opt} | 0 .../versioning/t/{rpl_test.inc => rpl.test} | 18 +++ .../suite/versioning/t/rpl_mixed.combinations | 5 - mysql-test/suite/versioning/t/rpl_mixed.test | 7 -- .../suite/versioning/t/rpl_row.combinations | 5 - mysql-test/suite/versioning/t/rpl_row.test | 7 -- .../suite/versioning/t/rpl_stmt.combinations | 5 - mysql-test/suite/versioning/t/rpl_stmt.test | 7 -- .../suite/versioning/t/select.combinations | 5 - mysql-test/suite/versioning/t/select.test | 3 +- .../suite/versioning/t/select_sp.combinations | 5 - mysql-test/suite/versioning/t/select_sp.test | 3 +- .../suite/versioning/t/truncate.combinations | 5 - mysql-test/suite/versioning/t/truncate.test | 2 +- .../suite/versioning/t/view.combinations | 5 - mysql-test/suite/versioning/t/view.test | 3 +- 28 files changed, 47 insertions(+), 320 deletions(-) rename mysql-test/suite/versioning/{t/create.combinations => engines.combinations} (100%) create mode 100644 mysql-test/suite/versioning/engines.inc create mode 100644 mysql-test/suite/versioning/innodb.inc create mode 100644 mysql-test/suite/versioning/innodb.opt rename mysql-test/suite/versioning/r/{rpl_mixed.result => rpl.result} (100%) delete mode 100644 mysql-test/suite/versioning/r/rpl_row.result delete mode 100644 mysql-test/suite/versioning/r/rpl_stmt.result delete mode 100644 mysql-test/suite/versioning/t/partition.combinations rename mysql-test/suite/versioning/t/{rpl_test.opt => rpl.opt} (100%) rename mysql-test/suite/versioning/t/{rpl_test.inc => rpl.test} (87%) delete mode 100644 mysql-test/suite/versioning/t/rpl_mixed.combinations delete mode 100644 mysql-test/suite/versioning/t/rpl_mixed.test delete mode 100644 mysql-test/suite/versioning/t/rpl_row.combinations delete mode 100644 mysql-test/suite/versioning/t/rpl_row.test delete mode 100644 mysql-test/suite/versioning/t/rpl_stmt.combinations delete mode 100644 mysql-test/suite/versioning/t/rpl_stmt.test delete mode 100644 mysql-test/suite/versioning/t/select.combinations delete mode 100644 mysql-test/suite/versioning/t/select_sp.combinations delete mode 100644 mysql-test/suite/versioning/t/truncate.combinations delete mode 100644 mysql-test/suite/versioning/t/view.combinations diff --git a/mysql-test/suite/versioning/common.inc b/mysql-test/suite/versioning/common.inc index 830203f251f..f296b631f94 100644 --- a/mysql-test/suite/versioning/common.inc +++ b/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); diff --git a/mysql-test/suite/versioning/common.opt b/mysql-test/suite/versioning/common.opt index 2c7eb20a1cb..9baff80804d 100644 --- a/mysql-test/suite/versioning/common.opt +++ b/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 diff --git a/mysql-test/suite/versioning/t/create.combinations b/mysql-test/suite/versioning/engines.combinations similarity index 100% rename from mysql-test/suite/versioning/t/create.combinations rename to mysql-test/suite/versioning/engines.combinations diff --git a/mysql-test/suite/versioning/engines.inc b/mysql-test/suite/versioning/engines.inc new file mode 100644 index 00000000000..a6213ecc437 --- /dev/null +++ b/mysql-test/suite/versioning/engines.inc @@ -0,0 +1 @@ +--source suite/versioning/innodb.inc diff --git a/mysql-test/suite/versioning/innodb.inc b/mysql-test/suite/versioning/innodb.inc new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/suite/versioning/innodb.opt b/mysql-test/suite/versioning/innodb.opt new file mode 100644 index 00000000000..da687df2f0f --- /dev/null +++ b/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 diff --git a/mysql-test/suite/versioning/r/rpl_mixed.result b/mysql-test/suite/versioning/r/rpl.result similarity index 100% rename from mysql-test/suite/versioning/r/rpl_mixed.result rename to mysql-test/suite/versioning/r/rpl.result diff --git a/mysql-test/suite/versioning/r/rpl_row.result b/mysql-test/suite/versioning/r/rpl_row.result deleted file mode 100644 index b91c8fd33c8..00000000000 --- a/mysql-test/suite/versioning/r/rpl_row.result +++ /dev/null @@ -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 diff --git a/mysql-test/suite/versioning/r/rpl_stmt.result b/mysql-test/suite/versioning/r/rpl_stmt.result deleted file mode 100644 index b91c8fd33c8..00000000000 --- a/mysql-test/suite/versioning/r/rpl_stmt.result +++ /dev/null @@ -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 diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test index 1401ab22a9c..ba04817580d 100644 --- a/mysql-test/suite/versioning/t/create.test +++ b/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; diff --git a/mysql-test/suite/versioning/t/partition.combinations b/mysql-test/suite/versioning/t/partition.combinations deleted file mode 100644 index 5f3df27e1bd..00000000000 --- a/mysql-test/suite/versioning/t/partition.combinations +++ /dev/null @@ -1,7 +0,0 @@ -# [innodb] -# partition -# default-storage-engine=innodb - -[myisam] -partition -default-storage-engine=myisam diff --git a/mysql-test/suite/versioning/t/partition.opt b/mysql-test/suite/versioning/t/partition.opt index c1a585b67eb..8608eed372b 100644 --- a/mysql-test/suite/versioning/t/partition.opt +++ b/mysql-test/suite/versioning/t/partition.opt @@ -1 +1,2 @@ +--partition --versioning-hide=implicit diff --git a/mysql-test/suite/versioning/t/rpl_test.opt b/mysql-test/suite/versioning/t/rpl.opt similarity index 100% rename from mysql-test/suite/versioning/t/rpl_test.opt rename to mysql-test/suite/versioning/t/rpl.opt diff --git a/mysql-test/suite/versioning/t/rpl_test.inc b/mysql-test/suite/versioning/t/rpl.test similarity index 87% rename from mysql-test/suite/versioning/t/rpl_test.inc rename to mysql-test/suite/versioning/t/rpl.test index 5beee9f9dc6..342d58626b7 100644 --- a/mysql-test/suite/versioning/t/rpl_test.inc +++ b/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 diff --git a/mysql-test/suite/versioning/t/rpl_mixed.combinations b/mysql-test/suite/versioning/t/rpl_mixed.combinations deleted file mode 100644 index 9a1c771672c..00000000000 --- a/mysql-test/suite/versioning/t/rpl_mixed.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[myisam] -default-storage-engine=myisam - -[innodb] -default-storage-engine=innodb diff --git a/mysql-test/suite/versioning/t/rpl_mixed.test b/mysql-test/suite/versioning/t/rpl_mixed.test deleted file mode 100644 index 09612e664dc..00000000000 --- a/mysql-test/suite/versioning/t/rpl_mixed.test +++ /dev/null @@ -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 diff --git a/mysql-test/suite/versioning/t/rpl_row.combinations b/mysql-test/suite/versioning/t/rpl_row.combinations deleted file mode 100644 index 9a1c771672c..00000000000 --- a/mysql-test/suite/versioning/t/rpl_row.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[myisam] -default-storage-engine=myisam - -[innodb] -default-storage-engine=innodb diff --git a/mysql-test/suite/versioning/t/rpl_row.test b/mysql-test/suite/versioning/t/rpl_row.test deleted file mode 100644 index cf04c52dd16..00000000000 --- a/mysql-test/suite/versioning/t/rpl_row.test +++ /dev/null @@ -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 diff --git a/mysql-test/suite/versioning/t/rpl_stmt.combinations b/mysql-test/suite/versioning/t/rpl_stmt.combinations deleted file mode 100644 index 75fb20d9f5e..00000000000 --- a/mysql-test/suite/versioning/t/rpl_stmt.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[innodb] -default-storage-engine=innodb - -[myisam] -default-storage-engine=myisam diff --git a/mysql-test/suite/versioning/t/rpl_stmt.test b/mysql-test/suite/versioning/t/rpl_stmt.test deleted file mode 100644 index bc4e76cdf5d..00000000000 --- a/mysql-test/suite/versioning/t/rpl_stmt.test +++ /dev/null @@ -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 diff --git a/mysql-test/suite/versioning/t/select.combinations b/mysql-test/suite/versioning/t/select.combinations deleted file mode 100644 index 75fb20d9f5e..00000000000 --- a/mysql-test/suite/versioning/t/select.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[innodb] -default-storage-engine=innodb - -[myisam] -default-storage-engine=myisam diff --git a/mysql-test/suite/versioning/t/select.test b/mysql-test/suite/versioning/t/select.test index dd7289fa9c7..51b10d420e8 100644 --- a/mysql-test/suite/versioning/t/select.test +++ b/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 diff --git a/mysql-test/suite/versioning/t/select_sp.combinations b/mysql-test/suite/versioning/t/select_sp.combinations deleted file mode 100644 index 75fb20d9f5e..00000000000 --- a/mysql-test/suite/versioning/t/select_sp.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[innodb] -default-storage-engine=innodb - -[myisam] -default-storage-engine=myisam diff --git a/mysql-test/suite/versioning/t/select_sp.test b/mysql-test/suite/versioning/t/select_sp.test index bd165c3bd16..a84a3c51358 100644 --- a/mysql-test/suite/versioning/t/select_sp.test +++ b/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() diff --git a/mysql-test/suite/versioning/t/truncate.combinations b/mysql-test/suite/versioning/t/truncate.combinations deleted file mode 100644 index 75fb20d9f5e..00000000000 --- a/mysql-test/suite/versioning/t/truncate.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[innodb] -default-storage-engine=innodb - -[myisam] -default-storage-engine=myisam diff --git a/mysql-test/suite/versioning/t/truncate.test b/mysql-test/suite/versioning/t/truncate.test index 18fc1e838a3..f4a20ed7af2 100644 --- a/mysql-test/suite/versioning/t/truncate.test +++ b/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 diff --git a/mysql-test/suite/versioning/t/view.combinations b/mysql-test/suite/versioning/t/view.combinations deleted file mode 100644 index 75fb20d9f5e..00000000000 --- a/mysql-test/suite/versioning/t/view.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[innodb] -default-storage-engine=innodb - -[myisam] -default-storage-engine=myisam diff --git a/mysql-test/suite/versioning/t/view.test b/mysql-test/suite/versioning/t/view.test index c48ebef8fa5..960adbf8b2f 100644 --- a/mysql-test/suite/versioning/t/view.test +++ b/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);