summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/r/mysqld--help,win.rdiff20
-rw-r--r--mysql-test/r/mysqld--help.result5
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_server_embedded.result14
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result14
-rw-r--r--mysql-test/suite/versioning/r/select.result11
-rw-r--r--mysql-test/suite/versioning/r/trx_id.result26
-rw-r--r--mysql-test/suite/versioning/t/select.test5
-rw-r--r--mysql-test/suite/versioning/t/trx_id.test9
-rw-r--r--sql/sql_class.h1
-rw-r--r--sql/sql_select.cc3
-rw-r--r--sql/sys_vars.cc6
11 files changed, 11 insertions, 103 deletions
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff
index 33374105fb5..367744f6f5d 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -38,14 +38,14 @@
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
@@ -1190,6 +1197,7 @@ The following options may be given as the first argument:
- EMPTY_STRING_IS_NULL
+ EMPTY_STRING_IS_NULL, SIMULTANEOUS_ASSIGNMENT
--stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.)
+ --standalone Dummy option to start as a standalone program (NT).
--standard-compliant-cte
Allow only CTEs compliant to SQL standard
(Defaults to on; use --skip-standard-compliant-cte to disable.)
-@@ -1261,6 +1269,11 @@ The following options may be given as the first argument:
+@@ -1257,6 +1265,11 @@ The following options may be given as the first argument:
--thread-pool-max-threads=#
Maximum allowed number of worker threads in the thread
pool
@@ -57,7 +57,7 @@
--thread-pool-oversubscribe=#
How many additional active worker threads in a group are
allowed.
-@@ -1299,8 +1312,8 @@ The following options may be given as the first argument:
+@@ -1295,8 +1308,8 @@ The following options may be given as the first argument:
automatically convert it to an on-disk MyISAM or Aria
table.
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
@@ -68,7 +68,7 @@
--transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
-@@ -1434,7 +1447,6 @@ key-cache-block-size 1024
+@@ -1430,7 +1443,6 @@ key-cache-block-size 1024
key-cache-division-limit 100
key-cache-file-hash-size 512
key-cache-segments 0
@@ -76,7 +76,7 @@
lc-messages en_US
lc-messages-dir MYSQL_SHAREDIR/
lc-time-names en_US
-@@ -1506,6 +1518,7 @@ myisam-sort-buffer-size 134216704
+@@ -1502,6 +1514,7 @@ myisam-sort-buffer-size 134216704
myisam-stats-method NULLS_UNEQUAL
myisam-use-mmap FALSE
mysql56-temporal-format TRUE
@@ -84,7 +84,7 @@
net-buffer-length 16384
net-read-timeout 30
net-retry-count 10
-@@ -1616,6 +1629,8 @@ session-track-schema TRUE
+@@ -1612,6 +1625,8 @@ session-track-schema TRUE
session-track-state-change FALSE
session-track-system-variables autocommit,character_set_client,character_set_connection,character_set_results,time_zone
session-track-transaction-info OFF
@@ -93,7 +93,7 @@
show-slave-auth-info FALSE
silent-startup FALSE
skip-grant-tables TRUE
-@@ -1642,6 +1657,7 @@ slave-transaction-retry-interval 0
+@@ -1638,6 +1653,7 @@ slave-transaction-retry-interval 0
slave-type-conversions
slow-launch-time 2
slow-query-log FALSE
@@ -101,10 +101,10 @@
sort-buffer-size 2097152
sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
stack-trace TRUE
-@@ -1657,9 +1673,9 @@ sync-relay-log-info 10000
+@@ -1652,9 +1668,9 @@ sync-relay-log 10000
+ sync-relay-log-info 10000
sysdate-is-now FALSE
system-versioning-alter-history ERROR
- system-versioning-innodb-algorithm-simple TRUE
-table-cache 431
+table-cache 2000
table-definition-cache 400
@@ -113,7 +113,7 @@
table-open-cache-instances 8
tc-heuristic-recover OFF
tcp-keepalive-interval 0
-@@ -1668,6 +1684,8 @@ tcp-keepalive-time 0
+@@ -1663,6 +1679,8 @@ tcp-keepalive-time 0
thread-cache-size 151
thread-pool-idle-timeout 60
thread-pool-max-threads 65536
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index ca773364c1d..add82225739 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1223,10 +1223,6 @@ The following options may be given as the first argument:
Versioning ALTER TABLE mode. ERROR: Fail ALTER with
error; KEEP: Keep historical system rows and subject them
to ALTER;
- --system-versioning-innodb-algorithm-simple
- Use simple algorithm of timestamp handling in InnoDB
- instead of TRX_SEES
- (Defaults to on; use --skip-system-versioning-innodb-algorithm-simple to disable.)
--table-cache=# Deprecated; use --table-open-cache instead.
--table-definition-cache=#
The number of cached table definitions
@@ -1656,7 +1652,6 @@ sync-relay-log 10000
sync-relay-log-info 10000
sysdate-is-now FALSE
system-versioning-alter-history ERROR
-system-versioning-innodb-algorithm-simple TRUE
table-cache 431
table-definition-cache 400
table-open-cache 431
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;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index f026e2243ab..9f2185cfbd7 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -726,7 +726,6 @@ typedef struct system_variables
uint in_subquery_conversion_threshold;
vers_asof_timestamp_t vers_asof_timestamp;
- my_bool vers_innodb_algorithm_simple;
ulong vers_alter_history;
} SV;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index e96980bc3b2..3e8c2d41813 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -865,8 +865,7 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr
// have uint64 type of sys_trx_(start|end) field.
// They need special handling.
TABLE *t= table->table;
- if (t->versioned(VERS_TIMESTAMP) ||
- thd->variables.vers_innodb_algorithm_simple)
+ if (t->versioned(VERS_TIMESTAMP))
{
if (vers_conditions)
{
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index de9806ab289..ce2d41f009b 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -396,12 +396,6 @@ static Sys_var_vers_asof Sys_vers_asof_timestamp(
SESSION_VAR(vers_asof_timestamp.type), NO_CMD_LINE,
Sys_var_vers_asof::asof_keywords, DEFAULT(SYSTEM_TIME_UNSPECIFIED));
-static Sys_var_mybool Sys_vers_innodb_algorithm_simple(
- "system_versioning_innodb_algorithm_simple",
- "Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES",
- SESSION_VAR(vers_innodb_algorithm_simple), CMD_LINE(OPT_ARG),
- DEFAULT(TRUE));
-
static const char *vers_alter_history_keywords[]= {"ERROR", "KEEP",/* "SURVIVE", "DROP",*/ NULL};
static Sys_var_enum Sys_vers_alter_history(
"system_versioning_alter_history", "Versioning ALTER TABLE mode. "
View Lorry Controller Status