remove @@system_versioning_innodb_algorithm_simple

and delete few garbage-in-garbage-out tests

6 files changed, 0 insertions, 79 deletions

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index cd65578d64a..09ac37198f0 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -4086,20 +4086,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	DEFAULT
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
-VARIABLE_NAME	SYSTEM_VERSIONING_INNODB_ALGORITHM_SIMPLE
-SESSION_VALUE	ON
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TABLE_DEFINITION_CACHE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	400
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 920796404b6..63f50e34ed3 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -5038,20 +5038,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	DEFAULT
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
-VARIABLE_NAME	SYSTEM_VERSIONING_INNODB_ALGORITHM_SIMPLE
-SESSION_VALUE	ON
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TABLE_DEFINITION_CACHE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	400
diff --git a/mysql-test/suite/versioning/r/select.result b/mysql-test/suite/versioning/r/select.result
index 2ece11fdf6b..88ad054058b 100644
--- a/mysql-test/suite/versioning/r/select.result
+++ b/mysql-test/suite/versioning/r/select.result
@@ -330,25 +330,14 @@ trx_start_good
 select x from t1 for system_time as of timestamp @ts;
 x
 1
-select x from t1 for system_time as of timestamp unix_timestamp(@ts);
-x
-1
-select x from t1 for system_time as of timestamp @trx_start;
-x
 set @ts= timestamp'1-1-1 0:0:0';
 ## TRANSACTION specifier
-select x from t1 for system_time as of transaction @ts;
-x
-select x from t1 for system_time as of transaction unix_timestamp(@ts);
-x
 select x from t1 for system_time as of transaction @trx_start;
 x
 1
 ## no specifier (auto-detection)
 select x from t1 for system_time as of @ts;
 x
-select x from t1 for system_time as of unix_timestamp(@ts);
-x
 select x from t1 for system_time as of @trx_start;
 x
 1
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result
index 1b371ff9a34..30ca278eaea 100644
--- a/mysql-test/suite/versioning/r/trx_id.result
+++ b/mysql-test/suite/versioning/r/trx_id.result
@@ -103,32 +103,6 @@ select @trx_id1 < @trx_id2, @trx_id2 < @trx_id3;
 select @ts1 < @ts2, @ts2 < @ts3;
 @ts1 < @ts2	@ts2 < @ts3
 1	1
-# MVCC is not resolved
-select * from t1 for system_time as of transaction @trx_id1;
-x
-1
-select * from t1 for system_time as of timestamp @ts1;
-x
-3
-select * from t1 for system_time as of transaction @trx_id2;
-x
-1
-2
-select * from t1 for system_time as of timestamp @ts2;
-x
-2
-3
-select * from t1 for system_time as of transaction @trx_id3;
-x
-1
-2
-3
-select * from t1 for system_time as of timestamp @ts3;
-x
-1
-2
-3
-set system_versioning_innodb_algorithm_simple= off;
 # MVCC is resolved
 select * from t1 for system_time as of transaction @trx_id1;
 x
diff --git a/mysql-test/suite/versioning/t/select.test b/mysql-test/suite/versioning/t/select.test
index beadbd5c9a8..8f3e0a401f3 100644
--- a/mysql-test/suite/versioning/t/select.test
+++ b/mysql-test/suite/versioning/t/select.test
@@ -216,19 +216,14 @@ select @trx_start < unix_timestamp(@ts) - 100 as trx_start_good;
 
 --echo ## TIMESTAMP specifier
 select x from t1 for system_time as of timestamp @ts;
-select x from t1 for system_time as of timestamp unix_timestamp(@ts);
-select x from t1 for system_time as of timestamp @trx_start;
 
 set @ts= timestamp'1-1-1 0:0:0';
 
 --echo ## TRANSACTION specifier
-select x from t1 for system_time as of transaction @ts;
-select x from t1 for system_time as of transaction unix_timestamp(@ts);
 select x from t1 for system_time as of transaction @trx_start;
 
 --echo ## no specifier (auto-detection)
 select x from t1 for system_time as of @ts;
-select x from t1 for system_time as of unix_timestamp(@ts);
 select x from t1 for system_time as of @trx_start;
 
 
diff --git a/mysql-test/suite/versioning/t/trx_id.test b/mysql-test/suite/versioning/t/trx_id.test
index 09d8690b1b7..f1dbbf66cae 100644
--- a/mysql-test/suite/versioning/t/trx_id.test
+++ b/mysql-test/suite/versioning/t/trx_id.test
@@ -108,15 +108,6 @@ select sys_start from t1 where x = 3 into @trx_id3;
 select @trx_id1 < @trx_id2, @trx_id2 < @trx_id3;
 select @ts1 < @ts2, @ts2 < @ts3;
 
---echo # MVCC is not resolved
-select * from t1 for system_time as of transaction @trx_id1;
-select * from t1 for system_time as of timestamp @ts1;
-select * from t1 for system_time as of transaction @trx_id2;
-select * from t1 for system_time as of timestamp @ts2;
-select * from t1 for system_time as of transaction @trx_id3;
-select * from t1 for system_time as of timestamp @ts3;
-
-set system_versioning_innodb_algorithm_simple= off;
 --echo # MVCC is resolved
 select * from t1 for system_time as of transaction @trx_id1;
 select * from t1 for system_time as of timestamp @ts1;