diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-04 02:52:05 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-04 02:52:05 +0300 |
| commit | a9013f8fbae943dc4d2b5bbd0f8005f0edb3cace (patch) | |
| tree | 6865c45e4fd723b4972eb4705acf049a4d4f9fff /sql/ha_ndbcluster_binlog.cc | |
| parent | 97abce0e7c3c7948b5b83d661638a20b175ec8bd (diff) | |
| download | mariadb-git-a9013f8fbae943dc4d2b5bbd0f8005f0edb3cace.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2617.23.20
committer: Konstantin Osipov <kostja@sun.com>
branch nick: mysql-6.0-runtime
timestamp: Wed 2009-03-04 16:31:31 +0300
message:
WL#4284 "Transactional DDL locking"
Review comments: "Objectify" the MDL API.
MDL_request and MDL_context still need manual construction and
destruction, since they are used in environment that is averse
to constructors/destructors.
sql/mdl.cc:
Improve comments.
Add asserts to backup()/restore_from_backup()/merge() methods.
Fix an order bug in the error path of mdl_acquire_exclusive_locks():
we used to first free a ticket object, and only then exclude
it from the list of tickets.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index aa1c50eaf5b..08abb88e768 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -140,7 +140,7 @@ static Uint64 *p_latest_trans_gci= 0; */ static TABLE *ndb_binlog_index= 0; static TABLE_LIST binlog_tables; -static MDL_LOCK_REQUEST binlog_mdl_lock_request; +static MDL_request binlog_mdl_request; /* Helper functions @@ -2342,8 +2342,8 @@ 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_request_init(&binlog_mdl_lock_request, 0, tables->db, tables->table_name); - tables->mdl_lock_request= &binlog_mdl_lock_request; + binlog_mdl_request.init(0, tables->db, tables->table_name); + tables->mdl_request= &binlog_mdl_request; tables->required_type= FRMTYPE_TABLE; uint counter; thd->clear_error(); |