database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Eugene Kosov
2017-11-17 19:59:31 +03:00
committed by Aleksey Midenkov
parent 9ee3ca8d84
commit c31aa75dee
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/innodb/r/monitor.result
View File

@ -418,7 +418,7 @@ max_count_reset, min_count_reset, count_reset, status
from information_schema.innodb_metrics from information_schema.innodb_metrics
where name like "metadata%"; where name like "metadata%";
name max_count min_count count max_count_reset min_count_reset count_reset status 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_handles_closed 1 NULL 1 1 NULL 1 enabled
metadata_table_reference_count NULL NULL 0 NULL NULL 0 disabled metadata_table_reference_count NULL NULL 0 NULL NULL 0 disabled
set global innodb_monitor_disable = module_metadata; 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 from information_schema.innodb_metrics
where name like "metadata%"; where name like "metadata%";
name max_count min_count count max_count_reset min_count_reset count_reset status 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_handles_closed 1 NULL 1 NULL NULL 0 disabled
metadata_table_reference_count NULL NULL 0 NULL NULL 0 disabled metadata_table_reference_count NULL NULL 0 NULL NULL 0 disabled
set global innodb_monitor_reset_all = module_metadata; set global innodb_monitor_reset_all = module_metadata;

2
sql/sql_table.cc
View File

@ -7430,7 +7430,7 @@ static bool mysql_inplace_alter_table(THD *thd,
{ {
TR_table trt(thd, true); 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()) if (opt_transaction_registry && trt.update())
return true; return true;