database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-12-16 13:02:21 +01:00
parent ff485d2dc4 6bf10fac44
commit d28d3ba40d
1367 changed files with 82358 additions and 55472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_handler.cc
View File

@ -791,7 +791,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())