From 4592dd2d8147d54422432afcf0e87530df9a3d59 Mon Sep 17 00:00:00 2001 From: Jon Olav Hauglid Date: Wed, 9 Dec 2009 09:51:20 +0100 Subject: 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. --- sql/lock.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/lock.cc') 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); } -- cgit v1.2.1