SQL: open TRT only after versioned write [#305][fixes #321]

MariaDB · Nov 20, 2017 · 72574f7 · 72574f7
1 parent 655360b
commit 72574f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result
@@ -418,7 +418,7 @@ max_count_reset, min_count_reset, count_reset, status
 from information_schema.innodb_metrics
 where name like "metadata%";
 name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	3	NULL	3	3	NULL	3	enabled
+metadata_table_handles_opened	2	NULL	2	2	NULL	2	enabled
 metadata_table_handles_closed	1	NULL	1	1	NULL	1	enabled
 metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
 set global innodb_monitor_disable = module_metadata;
@@ -428,7 +428,7 @@ max_count_reset, min_count_reset, count_reset, status
 from information_schema.innodb_metrics
 where name like "metadata%";
 name	max_count	min_count	count	max_count_reset	min_count_reset	count_reset	status
-metadata_table_handles_opened	3	NULL	3	NULL	NULL	0	disabled
+metadata_table_handles_opened	2	NULL	2	NULL	NULL	0	disabled
 metadata_table_handles_closed	1	NULL	1	NULL	NULL	0	disabled
 metadata_table_reference_count	NULL	NULL	0	NULL	NULL	0	disabled
 set global innodb_monitor_reset_all = module_metadata;

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -7430,7 +7430,7 @@ static bool mysql_inplace_alter_table(THD *thd,
 
   {
     TR_table trt(thd, true);
-    if (table->file->native_versioned() && trt != *table_list)
+    if (thd->vers_update_trt && trt != *table_list)
     {
       if (opt_transaction_registry && trt.update())
         return true;