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

Merge MariaDB-10.0.7 revision 3961.

Browse Source
This commit is contained in:
Jan Lindström
2014-01-25 11:02:49 +02:00
parent d0f77b8361 02765f4c61
commit d43afb8828
2297 changed files with 266854 additions and 151902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_admin.cc
View File

@ -993,8 +993,20 @@ send_result_message:
}
}
/* Error path, a admin command failed. */
trans_commit_stmt(thd);
trans_commit_implicit(thd);
if (thd->transaction_rollback_request)
{
/*
Unlikely, but transaction rollback was requested by one of storage
engines (e.g. due to deadlock). Perform it.
*/
if (trans_rollback_stmt(thd) || trans_rollback_implicit(thd))
goto err;
}
else
{
if (trans_commit_stmt(thd) || trans_commit_implicit(thd))
goto err;
}
close_thread_tables(thd);
thd->mdl_context.release_transactional_locks();