summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2009-12-09 09:51:20 +0100
committerJon Olav Hauglid <jon.hauglid@sun.com>2009-12-09 09:51:20 +0100
commit942e8c7d4108d30a91aceb809e7e725e2f98408f (patch)
tree0bdfaf99f9d17378300b06787012a5278bdab563 /sql/sql_trigger.cc
parent0c265122ba77dbf9a5c31c6c1b569736293550a6 (diff)
downloadmariadb-git-942e8c7d4108d30a91aceb809e7e725e2f98408f.tar.gz
Backport of revno: 2617.69.40
A pre-requisite patch for Bug#30977 "Concurrent statement using stored function and DROP FUNCTION breaks SBR". This patch changes the MDL API by introducing a namespace for lock keys: MDL_TABLE for tables and views and MDL_PROCEDURE for stored procedures and functions. The latter is needed for the fix for Bug#30977.
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r--sql/sql_trigger.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index b8a4edaa963..f9d99b3c119 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -1883,7 +1883,7 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db,
In the future, only an exclusive metadata lock will be enough.
*/
#ifndef DBUG_OFF
- if (thd->mdl_context.is_exclusive_lock_owner(0, db, old_table))
+ if (thd->mdl_context.is_exclusive_lock_owner(MDL_TABLE, db, old_table))
safe_mutex_assert_owner(&LOCK_open);
#endif