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 | 2e73ea7ea8a56765982ba5c8642ed5b14ef39fde (patch) | |
| tree | 63d802f5d2e953b669797edffdff4c6952dd7b65 /sql/mdl.cc | |
| parent | 4f85df4b95df010fe2fa486002597b40c5e30a6b (diff) | |
| download | mariadb-git-2e73ea7ea8a56765982ba5c8642ed5b14ef39fde.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/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 5bda56193f5..b624b0658ed 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -307,7 +307,7 @@ void MDL_context::merge(MDL_context *src) @param mdl_type The MDL lock type for the request. */ -void MDL_request::init(enum_mdl_namespace mdl_namespace, +void MDL_request::init(MDL_key::enum_mdl_namespace mdl_namespace, const char *db_arg, const char *name_arg, enum enum_mdl_type mdl_type_arg) @@ -355,7 +355,7 @@ void MDL_request::init(const MDL_key *key_arg, */ MDL_request * -MDL_request::create(enum_mdl_namespace mdl_namespace, const char *db, +MDL_request::create(MDL_key::enum_mdl_namespace mdl_namespace, const char *db, const char *name, enum_mdl_type mdl_type, MEM_ROOT *root) { @@ -1444,7 +1444,7 @@ void MDL_context::release_global_shared_lock() */ bool -MDL_context::is_exclusive_lock_owner(enum_mdl_namespace mdl_namespace, +MDL_context::is_exclusive_lock_owner(MDL_key::enum_mdl_namespace mdl_namespace, const char *db, const char *name) { MDL_request mdl_request; @@ -1470,7 +1470,7 @@ MDL_context::is_exclusive_lock_owner(enum_mdl_namespace mdl_namespace, */ bool -MDL_context::is_lock_owner(enum_mdl_namespace mdl_namespace, +MDL_context::is_lock_owner(MDL_key::enum_mdl_namespace mdl_namespace, const char *db, const char *name) { MDL_key key(mdl_namespace, db, name); |