diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-12-09 09:51:20 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-12-09 09:51:20 +0100 |
| commit | 546e16ebd8685f490d90e376df6116175b62fcba (patch) | |
| tree | 0bdfaf99f9d17378300b06787012a5278bdab563 /sql/sp_head.cc | |
| parent | 4235167fcf9de9b8398336c46c1e6f63a764907a (diff) | |
| download | mariadb-git-546e16ebd8685f490d90e376df6116175b62fcba.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/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index ae798d063ea..0744e5be930 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3981,7 +3981,7 @@ sp_head::add_used_tables_to_table_list(THD *thd, table->prelocking_placeholder= 1; table->belong_to_view= belong_to_view; table->trg_event_map= stab->trg_event_map; - table->mdl_request.init(0, table->db, table->table_name, MDL_SHARED); + table->mdl_request.init(MDL_TABLE, table->db, table->table_name, MDL_SHARED); /* Everyting else should be zeroed */ @@ -4023,7 +4023,7 @@ sp_add_to_query_tables(THD *thd, LEX *lex, table->lock_type= locktype; table->select_lex= lex->current_select; table->cacheable_table= 1; - table->mdl_request.init(0, table->db, table->table_name, MDL_SHARED); + table->mdl_request.init(MDL_TABLE, table->db, table->table_name, MDL_SHARED); lex->add_to_query_tables(table); return table; |