database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-10478: Trx abort does not work in autocommit mode

Browse Source 
THD's statement transaction handle (st_transactions::stmt)
should also be looked for registered htons while serving a
request to abort a transaction.
This commit is contained in:
Nirbhay Choubey
2016-08-01 17:02:28 -04:00
parent 84a9e05003
commit ed48fcf177
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/handler.cc
View File

@ -6078,7 +6078,10 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
THD_TRANS *trans= &victim_thd->transaction.all; /* Try statement transaction if standard one is not set. */
THD_TRANS *trans= (victim_thd->transaction.all.ha_list) ?
&victim_thd->transaction.all : &victim_thd->transaction.stmt;
Ha_trx_info *ha_info= trans->ha_list, *ha_info_next; Ha_trx_info *ha_info= trans->ha_list, *ha_info_next;
for (; ha_info; ha_info= ha_info_next) for (; ha_info; ha_info= ha_info_next)
@ -6086,8 +6089,8 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal)
handlerton *hton= ha_info->ht(); handlerton *hton= ha_info->ht();
if (!hton->abort_transaction) if (!hton->abort_transaction)
{ {
/* Skip warning for binlog SE */ /* Skip warning for binlog & wsrep. */
if (hton->db_type != DB_TYPE_BINLOG) if (hton->db_type != DB_TYPE_BINLOG && hton != wsrep_hton)
{ {
WSREP_WARN("Cannot abort transaction."); WSREP_WARN("Cannot abort transaction.");
} }