diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-10 11:21:38 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-10 11:21:38 +0300 |
| commit | f26f632b44dfe9a6cc239a10f8697ba0ba50675d (patch) | |
| tree | 63d802f5d2e953b669797edffdff4c6952dd7b65 /sql/sql_show.cc | |
| parent | 634a81094288b9e47649ceed749d59af18a97e26 (diff) | |
| download | mariadb-git-f26f632b44dfe9a6cc239a10f8697ba0ba50675d.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2617.68.25
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-next-bg-pre2-2
timestamp: Wed 2009-09-16 18:26:50 +0400
message:
Follow-up for one of pre-requisite patches for fixing bug #30977
"Concurrent statement using stored function and DROP FUNCTION
breaks SBR".
Made enum_mdl_namespace enum part of MDL_key class and removed MDL_
prefix from the names of enum members. In order to do the latter
changed name of PROCEDURE symbol to PROCEDURE_SYM (otherwise macro
which was automatically generated for this symbol conflicted with
MDL_key::PROCEDURE enum member).
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index fe941321dcd..ccb5875dee5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3081,7 +3081,7 @@ try_acquire_high_prio_shared_mdl_lock(THD *thd, TABLE_LIST *table, bool can_deadlock) { bool error; - table->mdl_request.init(MDL_TABLE, table->db, table->table_name, + table->mdl_request.init(MDL_key::TABLE, table->db, table->table_name, MDL_SHARED_HIGH_PRIO); while (!(error= thd->mdl_context.try_acquire_shared_lock(&table->mdl_request)) && |