diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-30 19:44:46 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-30 19:44:46 +0300 |
| commit | de1979d3d69e55e40037b62d3ce502a4ddd05910 (patch) | |
| tree | 05b8ead0704a6e2b621db9a8c0675280bd1ec75a /sql/mdl.h | |
| parent | 8a54198cba96297de6528bed99f3e90e8e046739 (diff) | |
| download | mariadb-git-de1979d3d69e55e40037b62d3ce502a4ddd05910.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2630.4.10
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Mon 2008-05-26 15:11:26 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review changes in progress.
Implemented some renames suggested by reviewer.
sql/mdl.cc:
Renamed:
MDL_LOCK_DATA::users -> lock_count
MDL_LOCK_DATA::has_no_other_users() -> has_one_lock()
MDL_LOCK::upgradable -> is_upgradable
Moved variables used in global metadata lock implementation
to separate strucuture.
sql/mdl.h:
Renamed MDL_LOCK::upgradable to is_upgradable.
Diffstat (limited to 'sql/mdl.h')
| -rw-r--r-- | sql/mdl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index ca3d8d0a784..2b144e250b1 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -66,7 +66,7 @@ struct MDL_LOCK point might be upgraded to an exclusive lock and therefore conflicts with global shared lock, FALSE -- otherwise. */ - bool upgradable; + bool is_upgradable; private: /** @@ -189,7 +189,7 @@ inline void mdl_set_lock_priority(MDL_LOCK *lock, enum_mdl_prio prio) inline void mdl_set_upgradable(MDL_LOCK *lock) { DBUG_ASSERT(lock->type == MDL_SHARED && lock->state == MDL_PENDING); - lock->upgradable= TRUE; + lock->is_upgradable= TRUE; } bool mdl_acquire_shared_lock(MDL_LOCK *l, bool *retry); |