diff --git a/sql/handler.cc b/sql/handler.cc
index 4b5539a0364..a345fc09e16 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -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() :
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index cb13275df84..7451fd035b5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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;
diff --git a/sql/mysqld.h b/sql/mysqld.h
index dafcb9aa87e..9bd1dae2d36 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -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
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index e0e4894578c..30071743371 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -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;
     }
 
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 1e4562f41b3..feabd738224 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -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(
diff --git a/sql/vtmd.cc b/sql/vtmd.cc
index c4b7e4f1e80..d5de15afbab 100644
--- a/sql/vtmd.cc
+++ b/sql/vtmd.cc
@@ -255,7 +255,7 @@ err:
   }
 
 quit:
-  if (!result && transaction_registry)
+  if (!result && opt_transaction_registry)
   {
     TR_table trt(thd, true);
     result= trt.update();