diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 14:10:37 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 14:10:37 +0300 |
| commit | dfc15e2acc9312c3357b6149feb771c724ba8252 (patch) | |
| tree | 8b1515766ccff351169800dc979e023a2705d774 /sql | |
| parent | b7a80c679c491ddc12993c3036a811939792661c (diff) | |
| parent | 0ede71256f58f0298f473277e9f03d62fc81a85a (diff) | |
| download | mariadb-git-dfc15e2acc9312c3357b6149feb771c724ba8252.tar.gz | |
Merge next-4284 -> next-4284-merge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 29596ceab92..56a659173f3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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); |