database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2018-03-12 14:48:53 +02:00
parent 88a9d4ab42 3a93ec53c1
commit e0792e7603
48 changed files with 1109 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.cc
View File

@@ -1507,6 +1507,7 @@ void THD::cleanup(void)
close_temporary_tables();
transaction.xid_state.xa_state= XA_NOTR;
transaction.xid_state.rm_error= 0;
trans_rollback(this);
xid_cache_delete(this, &transaction.xid_state);