1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge next-4284 -> next-4284-merge.

This commit is contained in:
Konstantin Osipov
2010-02-03 14:10:37 +03:00
3 changed files with 31 additions and 0 deletions

View File

@ -5031,6 +5031,7 @@ send_result_message:
trans_commit_stmt(thd);
trans_commit_implicit(thd);
close_thread_tables(thd);
thd->mdl_context.release_transactional_locks();
table->table=0; // For query cache
/*
@ -5060,6 +5061,7 @@ err:
trans_rollback_stmt(thd);
trans_rollback(thd);
close_thread_tables(thd); // Shouldn't be needed
thd->mdl_context.release_transactional_locks();
if (table)
table->table=0;
DBUG_RETURN(TRUE);