cleanup: remove *.opt files from the versioning suite

use include/have_xxx.inc when some feature needs to be present (because --xxx in the opt file will fail if the xxx is not compiled in) set variables in the test, not on the command line, to avoid unnecessary server restarts (they're must slower than SET).
MariaDB · Feb 23, 2018 · f38ef43 · f38ef43
1 parent f1bd02d
commit f38ef43
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 4 deletions.
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
@@ -1,3 +1,4 @@
+set system_versioning_alter_history=keep;
 # Check conventional partitioning on temporal tables
 create table t1 (x int)
 with system versioning

diff --git a/mysql-test/suite/versioning/t/partition.opt b/mysql-test/suite/versioning/t/partition.opt
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
@@ -1,6 +1,7 @@
 -- source include/have_partition.inc
 -- source suite/versioning/common.inc
 
+set system_versioning_alter_history=keep;
 --echo # Check conventional partitioning on temporal tables
 
 create table t1 (x int)

diff --git a/mysql-test/suite/versioning/t/truncate.opt b/mysql-test/suite/versioning/t/truncate.opt
diff --git a/mysql-test/suite/versioning/t/truncate.test b/mysql-test/suite/versioning/t/truncate.test
@@ -1,3 +1,4 @@
+--source include/have_partition.inc
 --source suite/versioning/engines.inc
 
 create table t (a int);

diff --git a/mysql-test/suite/versioning/t/vtmd.opt b/mysql-test/suite/versioning/t/vtmd.opt
diff --git a/mysql-test/suite/versioning/t/vtmd.test b/mysql-test/suite/versioning/t/vtmd.test
@@ -1,4 +1,6 @@
 -- source include/have_innodb.inc
+set default_storage_engine=innodb;
+
 delimiter ~~;
 create or replace procedure drop_archives (in vtmd_name varchar(64))
 begin

diff --git a/mysql-test/suite/versioning/t/vtmd_show.opt b/mysql-test/suite/versioning/t/vtmd_show.opt
diff --git a/mysql-test/suite/versioning/t/vtmd_show.test b/mysql-test/suite/versioning/t/vtmd_show.test
@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+
 delimiter ~~;
 create or replace procedure drop_archives (in vtmd_name varchar(64))
 begin