summaryrefslogtreecommitdiff
path: root/sql/lock.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/lock.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/lock.cc')
-rw-r--r--sql/lock.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index 814eebde337..199ab354c22 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -965,7 +965,7 @@ bool lock_table_names(THD *thd, TABLE_LIST *table_list)
lock_table->mdl_lock_data= mdl_lock_data;
}
if (mdl_acquire_exclusive_locks(&thd->mdl_context))
- return 1;
+ goto end;
return 0;
end: