diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 01:09:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-24 00:50:57 +0100 |
| commit | 33366b10981567cb147375a28522f5e29d23aa5d (patch) | |
| tree | cc49bdc83155e31b73f477a4c9c61cde638ae1c2 /sql | |
| parent | b9c70b889cebdad31c283208f2c43efa6b8a8e91 (diff) | |
| download | mariadb-git-33366b10981567cb147375a28522f5e29d23aa5d.tar.gz | |
remove @@system_versioning_innodb_algorithm_simple
and delete few garbage-in-garbage-out tests
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.h | 1 | ||||
| -rw-r--r-- | sql/sql_select.cc | 3 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 6 |
3 files changed, 1 insertions, 9 deletions
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. " |