diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-01 01:33:22 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-01 01:33:22 +0300 |
| commit | e23046d1bcaf54838167dd6bd3d8c6900e24b2ef (patch) | |
| tree | ba3438eef550d9cf10d121bad3981f18566659d4 /sql/ha_ndbcluster_binlog.cc | |
| parent | cf45b61a6a611415161e6176b8c8ae85a51e9349 (diff) | |
| download | mariadb-git-e23046d1bcaf54838167dd6bd3d8c6900e24b2ef.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2630.4.17
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w2
timestamp: Thu 2008-05-29 16:52:56 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
"The great correction of names".
Renamed MDL_LOCK and MDL_LOCK_DATA classes to make usage of
these names in metadata locking subsystem consistent with
other parts of server (i.e. thr_lock.cc). Now we MDL_LOCK_DATA
corresponds to request for a lock and MDL_LOCK to the lock
itself. Adjusted code in MDL subsystem and other places
using these classes accordingly.
Did similar thing for GLOBAL_MDL_LOCK_DATA class and also
changed name of its members to correspond to names of
MDL_LOCK_DATA members.
Finally got rid of usage of one letter variables in MDL
code since it makes code harder to search in (according
to reviewer).
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index f272526edb8..14d14db6b7d 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -140,8 +140,8 @@ static Uint64 *p_latest_trans_gci= 0; */ static TABLE *ndb_binlog_index= 0; static TABLE_LIST binlog_tables; -static MDL_LOCK binlog_mdl_lock; -static char binlog_mdlkey[MAX_DBKEY_LENGTH]; +static MDL_LOCK_DATA binlog_mdl_lock_data; +static char binlog_mdlkey[MAX_DBKEY_LENGTH]; /* Helper functions @@ -2343,9 +2343,9 @@ static int open_ndb_binlog_index(THD *thd, TABLE **ndb_binlog_index) tables->alias= tables->table_name= reptable; tables->lock_type= TL_WRITE; thd->proc_info= "Opening " NDB_REP_DB "." NDB_REP_TABLE; - mdl_init_lock(&binlog_mdl_lock, binlog_mdlkey, 0, tables->db, + mdl_init_lock(&binlog_mdl_lock_data, binlog_mdlkey, 0, tables->db, tables->table_name); - tables->mdl_lock= &binlog_mdl_lock; + tables->mdl_lock_data= &binlog_mdl_lock_data; tables->required_type= FRMTYPE_TABLE; uint counter; thd->clear_error(); |