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

WSREP_TO_ISOLATION_BEGIN should be called with the table list.

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-10-14 05:14:06 -04:00
parent 950e6f5b43
commit ddb93b427e
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_base.cc
View File

@ -4706,17 +4706,6 @@ restart:
if (!tbl)
continue;
if (WSREP_ON &&
wsrep_replicate_myisam &&
tables &&
tbl->file->ht == myisam_hton &&
sqlcom_can_generate_row_events(thd) &&
thd->get_command() != COM_STMT_PREPARE &&
tables->lock_type >= TL_WRITE_ALLOW_WRITE)
{
WSREP_TO_ISOLATION_BEGIN(NULL, NULL, tables);
}
/* Schema tables may not have a TABLE object here. */
if (tbl->file->ht->db_type == DB_TYPE_MRG_MYISAM)
{
@ -4743,6 +4732,17 @@ restart:
}
}
if (WSREP_ON &&
wsrep_replicate_myisam &&
(*start) &&
(*start)->table &&
(*start)->table->file->ht == myisam_hton &&
sqlcom_can_generate_row_events(thd) &&
thd->get_command() != COM_STMT_PREPARE)
{
WSREP_TO_ISOLATION_BEGIN(NULL, NULL, (*start));
}
error:
THD_STAGE_INFO(thd, stage_after_opening_tables);
thd_proc_info(thd, 0);