diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 16:15:17 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 16:15:17 +0100 |
commit | c877610e16ef8f922bc5c2e0aef31e968a66d4ab (patch) | |
tree | fa3d8bc3db02689e922686d1236bfe8731ac145b /sql/handler.cc | |
parent | 8e7649867f23ef4fca5ddb6678a66e414026ef7b (diff) | |
download | mariadb-git-c877610e16ef8f922bc5c2e0aef31e968a66d4ab.tar.gz |
wsrep: ha_abort_transaction() does NOT end the transaction
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index a46174009fa..41e686003c5 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6034,6 +6034,9 @@ void handler::set_lock_type(enum thr_lock_type lock) implementing the wsrep API should provide this service to support multi-master operation. + @note Aborting the transaction does NOT end it, it still has to + be rolled back with hton->rollback(). + @param bf_thd brute force THD asking for the abort @param victim_thd victim THD to be aborted @@ -6061,7 +6064,6 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal) else hton->abort_transaction(hton, bf_thd, victim_thd, signal); ha_info_next= ha_info->next(); - ha_info->reset(); /* keep it conveniently zero-filled */ } DBUG_RETURN(0); } |