summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-01-10 16:12:24 +0100
committerSergei Golubchik <serg@mariadb.org>2018-01-13 02:01:34 +0100
commita544f920e3fe9e24b20db434ca15bb9ebfe0137e (patch)
tree02af7a53008d5cb8bff421e8ca901ea9003debb1 /sql/mysqld.cc
parent7e1738c3c4d11829b00092fbf9daa8840c1aa83c (diff)
downloadmariadb-git-a544f920e3fe9e24b20db434ca15bb9ebfe0137e.tar.gz
remove "Transaction-based system versioning is EXPERIMENTAL" warning
and the system_versioning_transaction_registry variable. The user enables transaction registry by specifying BIGINT for row_start/row_end columns. check mysql.transaction_registry structure on the first open, not on startup. Avoid warnings unless transaction_registry is actually used.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc32
1 files changed, 0 insertions, 32 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c0d55306871..321264e8d7b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -536,8 +536,6 @@ ulonglong slave_skipped_errors;
ulong feature_files_opened_with_delayed_keys= 0, feature_check_constraint= 0;
ulonglong denied_connections;
my_decimal decimal_zero;
-my_bool opt_transaction_registry= 1;
-my_bool use_transaction_registry= 1;
/*
Maximum length of parameter value which can be set through
@@ -6023,36 +6021,6 @@ int mysqld_main(int argc, char **argv)
if (Events::init((THD*) 0, opt_noacl || opt_bootstrap))
unireg_abort(1);
- if (opt_transaction_registry)
- {
- use_transaction_registry= true;
- if (opt_bootstrap)
- {
- use_transaction_registry= false;
- }
- else
- {
- THD *thd = new THD(0);
- thd->thread_stack= (char*) &thd;
- thd->store_globals();
- {
- TR_table trt(thd);
- if (trt.check())
- {
- use_transaction_registry= false;
- }
- }
-
- trans_commit_stmt(thd);
- delete thd;
- }
- }
- else
- use_transaction_registry= false;
-
- if (opt_transaction_registry && !use_transaction_registry)
- sql_print_information("Disabled transaction registry.");
-
if (WSREP_ON)
{
if (opt_bootstrap)