summaryrefslogtreecommitdiff
path: root/sql/lock.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
commit4592dd2d8147d54422432afcf0e87530df9a3d59 (patch)
tree0bdfaf99f9d17378300b06787012a5278bdab563 /sql/lock.cc
parent8817b0d3af8333afc834ab0f44a1f713241e244b (diff)
downloadmariadb-git-4592dd2d8147d54422432afcf0e87530df9a3d59.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/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 aea1bfbd0e6..8d314c4ad19 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -957,7 +957,7 @@ bool lock_table_names(THD *thd, TABLE_LIST *table_list)
for (lock_table= table_list; lock_table; lock_table= lock_table->next_local)
{
- lock_table->mdl_request.init(0, lock_table->db, lock_table->table_name,
+ lock_table->mdl_request.init(MDL_TABLE, lock_table->db, lock_table->table_name,
MDL_EXCLUSIVE);
mdl_requests.push_front(&lock_table->mdl_request);
}