database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Daemon: TRT check respects --transaction-registry [#302]

Browse Source
This commit is contained in:
Aleksey Midenkov
2017-11-15 18:08:00 +03:00
parent 3fc943cd87
commit f39df037f6
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@@ -1419,7 +1419,7 @@ int ha_commit_trans(THD *thd, bool all)
for (Ha_trx_info *hi= ha_info; hi; hi= hi->next())
{
handlerton *ht= hi->ht();
if (transaction_registry &&
if (opt_transaction_registry &&
(ht->flags & HTON_NATIVE_SYS_VERSIONING) &&
(thd->lex->sql_command == SQLCOM_ALTER_TABLE ?
hi->is_trx_tmp_read_write() :

4
sql/mysqld.cc
View File

@@ -534,7 +534,7 @@ 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 transaction_registry= 1;
my_bool opt_transaction_registry= 1;
/*
Maximum length of parameter value which can be set through
@@ -6027,7 +6027,7 @@ int mysqld_main(int argc, char **argv)
if (Events::init((THD*) 0, opt_noacl || opt_bootstrap))
unireg_abort(1);
if (!opt_bootstrap)
if (!opt_bootstrap && opt_transaction_registry)
{
THD *thd = new THD(0);
thd->thread_stack= (char*) &thd;

2
sql/mysqld.h
View File

@@ -312,7 +312,7 @@ extern my_bool encrypt_tmp_disk_tables, encrypt_tmp_files;
extern ulong encryption_algorithm;
extern const char *encryption_algorithm_names[];
extern const char *quoted_string;
extern my_bool transaction_registry;
extern my_bool opt_transaction_registry;
#ifdef HAVE_PSI_INTERFACE
#ifdef HAVE_MMAP

2
sql/sql_table.cc
View File

@@ -7432,7 +7432,7 @@ static bool mysql_inplace_alter_table(THD *thd,
TR_table trt(thd, true);
if (table->file->native_versioned())
{
if (transaction_registry && trt.update())
if (opt_transaction_registry && trt.update())
return true;
}

2
sql/sys_vars.cc
View File

@@ -425,7 +425,7 @@ static Sys_var_enum Sys_vers_alter_history(
static Sys_var_mybool Sys_transaction_registry(
"transaction_registry",
"Enable or disable update of transaction_registry",
GLOBAL_VAR(transaction_registry), CMD_LINE(OPT_ARG),
GLOBAL_VAR(opt_transaction_registry), CMD_LINE(OPT_ARG),
DEFAULT(TRUE));
static Sys_var_ulonglong Sys_binlog_cache_size(

2
sql/vtmd.cc
View File

@@ -255,7 +255,7 @@ err:
}
quit:
if (!result && transaction_registry)
if (!result && opt_transaction_registry)
{
TR_table trt(thd, true);
result= trt.update();