summaryrefslogtreecommitdiff
path: root/sql/sql_handler.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-02 19:15:40 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-02 19:15:40 +0300
commit0a49fd92d90843f9cd49f98bb23a513b3f82b1b9 (patch)
treeff15b5d631f62066821c5a9b8436ecbc46bf7dec /sql/sql_handler.cc
parentbf2aae0487919118e370ab83602a72436f21cc34 (diff)
downloadmariadb-git-0a49fd92d90843f9cd49f98bb23a513b3f82b1b9.tar.gz
Backport of:
------------------------------------------------------------ revno: 2630.4.32 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w2 timestamp: Thu 2008-06-19 16:39:58 +0400 message: WL#3726 "DDL locking for all metadata objects". After-review fixes in progress. Ensure that metadata locking subsystem properly handles out-of-memory conditions. Clarified MDL interface by separating release of locks and removal of lock requests from the context.
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r--sql/sql_handler.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index a2c1f0e3782..9b30d8cec12 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -150,6 +150,7 @@ static void mysql_ha_close_table(THD *thd, TABLE_LIST *tables)
}
pthread_mutex_unlock(&LOCK_open);
mdl_release_lock(&thd->handler_mdl_context, mdl_lock_data);
+ mdl_remove_lock(&thd->handler_mdl_context, mdl_lock_data);
}
else if (tables->table)
{