cleanup: vers tests, remove create_table procedure

4 files changed, 48 insertions, 32 deletions

diff --git a/mysql-test/suite/versioning/key_type.combinations b/mysql-test/suite/versioning/key_type.combinations
deleted file mode 100644
index 1929aee9a84..00000000000
--- a/mysql-test/suite/versioning/key_type.combinations
+++ /dev/null
@@ -1,2 +0,0 @@
-[unique]
-[pk]
diff --git a/mysql-test/suite/versioning/key_type.inc b/mysql-test/suite/versioning/key_type.inc
deleted file mode 100644
index 648430771cf..00000000000
--- a/mysql-test/suite/versioning/key_type.inc
+++ /dev/null
@@ -1,23 +0,0 @@
---disable_query_log
-if ($MTR_COMBINATION_UNIQUE)
-{
-    set @KEY_TYPE= 'unique';
-}
-if ($MTR_COMBINATION_PK)
-{
-    set @KEY_TYPE= 'primary key';
-}
-
-delimiter ~~;
-create procedure create_table(name varchar(255), cols varchar(255))
-begin
-  if (cols is null or cols = '') then
-    set cols= '';
-  else
-    set cols= concat(', ', cols);
-  end if;
-  set @str= concat('create or replace table ', name, '(id int ', @KEY_TYPE, cols, ') with system versioning');
-  prepare stmt from @str; execute stmt; drop prepare stmt;
-end~~
-delimiter ;~~
---enable_query_log
diff --git a/mysql-test/suite/versioning/r/replace.result b/mysql-test/suite/versioning/r/replace.result
index 54ab5b49c2a..a3bd3239a5e 100644
--- a/mysql-test/suite/versioning/r/replace.result
+++ b/mysql-test/suite/versioning/r/replace.result
@@ -1,4 +1,10 @@
-call create_table('t', 'x int');
+create table t (
+id int primary key,
+x int,
+row_start SYS_DATATYPE as row start invisible,
+row_end SYS_DATATYPE as row end invisible,
+period for system_time (row_start, row_end)
+) with system versioning;
 insert t values (1, 2);
 replace t values (1, 3);
 select *, row_end>TIMESTAMP'2038-01-01 00:00:00' as current from t for system_time all
@@ -6,5 +12,19 @@ order by x;
 id	x	current
 1	2	0
 1	3	1
-drop database test;
-create database test;
+drop table t;
+create table t (
+id int unique,
+x int,
+row_start SYS_DATATYPE as row start invisible,
+row_end SYS_DATATYPE as row end invisible,
+period for system_time (row_start, row_end)
+) with system versioning;
+insert t values (1, 2);
+replace t values (1, 3);
+select *, row_end>TIMESTAMP'2038-01-01 00:00:00' as current from t for system_time all
+order by x;
+id	x	current
+1	2	0
+1	3	1
+drop table t;
diff --git a/mysql-test/suite/versioning/t/replace.test b/mysql-test/suite/versioning/t/replace.test
index 194606555db..0a100c66607 100644
--- a/mysql-test/suite/versioning/t/replace.test
+++ b/mysql-test/suite/versioning/t/replace.test
@@ -1,13 +1,34 @@
 --source suite/versioning/common.inc
---source suite/versioning/key_type.inc
 --source suite/versioning/engines.inc
 
-call create_table('t', 'x int');
+--replace_result $sys_datatype_expl SYS_DATATYPE
+eval create table t (
+  id int primary key,
+  x int,
+  row_start $sys_datatype_expl as row start invisible,
+  row_end $sys_datatype_expl as row end invisible,
+  period for system_time (row_start, row_end)
+) with system versioning;
 
 insert t values (1, 2);
 replace t values (1, 3);
 select *, row_end>TIMESTAMP'2038-01-01 00:00:00' as current from t for system_time all
 order by x;
+drop table t;
 
-drop database test;
-create database test;
+--replace_result $sys_datatype_expl SYS_DATATYPE
+eval create table t (
+  id int unique,
+  x int,
+  row_start $sys_datatype_expl as row start invisible,
+  row_end $sys_datatype_expl as row end invisible,
+  period for system_time (row_start, row_end)
+) with system versioning;
+
+insert t values (1, 2);
+replace t values (1, 3);
+select *, row_end>TIMESTAMP'2038-01-01 00:00:00' as current from t for system_time all
+order by x;
+drop table t;
+
+--source suite/versioning/common_finish.inc