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

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-11-23 00:50:54 +01:00
parent 2c032b990e eea310e498
commit c6d30805db
1275 changed files with 80717 additions and 55003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_handler.cc
View File

@ -789,7 +789,10 @@ retry:
/*
Always close statement transaction explicitly,
so that the engine doesn't have to count locks.
There should be no need to perform transaction
rollback due to deadlock.
*/
DBUG_ASSERT(! thd->transaction_rollback_request);
trans_rollback_stmt(thd);
mysql_ha_close_table(handler);
if (thd->stmt_arena->is_stmt_execute())