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

Bug#45548: XA transaction without access to InnoDB tables crashes the server

Browse Source 
The problem is that the one phase commit function failed to
properly end a empty transaction. The solution is to ensure
that the transaction cleanup procedure is invoked even for
empty transactions.
This commit is contained in:
Davi Arnaut
2009-06-25 12:25:23 -03:00
parent cbfcafd484
commit 4c1333e6ed
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/xa.result
View File

@ -81,3 +81,11 @@ xa rollback 'a';
xa start 'a'; xa start 'a';
xa end 'a'; xa end 'a';
xa rollback 'a'; xa rollback 'a';
xa start 'a';
xa end 'a';
xa prepare 'a';
xa commit 'a';
xa start 'a';
xa end 'a';
xa prepare 'a';
xa commit 'a';

14
mysql-test/t/xa.test
View File

@ -135,6 +135,20 @@ xa start 'a';
xa end 'a'; xa end 'a';
xa rollback 'a'; xa rollback 'a';
#
# Bug#45548: XA transaction without access to InnoDB tables crashes the server
#
xa start 'a';
xa end 'a';
xa prepare 'a';
xa commit 'a';
xa start 'a';
xa end 'a';
xa prepare 'a';
xa commit 'a';
# Wait till all disconnects are completed # Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc

5
sql/handler.cc
View File

@ -1242,9 +1242,10 @@ int ha_commit_one_phase(THD *thd, bool all)
#endif #endif
thd->variables.tx_isolation=thd->session_tx_isolation; thd->variables.tx_isolation=thd->session_tx_isolation;
} }
if (is_real_trans)
thd->transaction.cleanup();
} }
/* Free resources and perform other cleanup even for 'empty' transactions. */
if (is_real_trans)
thd->transaction.cleanup();
#endif /* USING_TRANSACTIONS */ #endif /* USING_TRANSACTIONS */
DBUG_RETURN(error); DBUG_RETURN(error);
} }