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/sql_delete.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/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c3e205848de..03be0382150 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1177,7 +1177,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) thd->lex->alter_info.flags & ALTER_ADMIN_PARTITION) goto trunc_by_del; - mdl_request.init(0, table_list->db, table_list->table_name, MDL_EXCLUSIVE); + mdl_request.init(MDL_TABLE, table_list->db, table_list->table_name, MDL_EXCLUSIVE); if (thd->mdl_context.acquire_exclusive_lock(&mdl_request)) DBUG_RETURN(TRUE); |