diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-02 19:31:57 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-02 19:31:57 +0300 |
| commit | 124cda8a0a783180b280935fd4b62a2b7d6dc6c4 (patch) | |
| tree | c7cd519ccaa3357e48161f2c078f2e22c00d2e56 /sql/ha_ndbcluster_binlog.cc | |
| parent | e3b3907c4f6f6dbfd650272e7c65880d04e5789e (diff) | |
| download | mariadb-git-124cda8a0a783180b280935fd4b62a2b7d6dc6c4.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2630.4.33
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w2
timestamp: Fri 2008-06-20 17:11:20 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After-review fixes in progress.
Minimized dependency of mdl.cc on other modules (particularly
made it independant of mysql_priv.h) in order to be able
write unit tests for metadata locking subsystem.
sql/ha_ndbcluster_binlog.cc:
Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
buffer for object key for metadata locking subsystem.
sql/log_event.cc:
Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
buffer for object key for metadata locking subsystem.
sql/mdl.cc:
Removed dependency on THD class (and thus on mysql_priv.h)
by using direct access to members of st_my_thread_var instead
of accessing THD::killed/enter_cond()/exit_cond().
sql/mdl.h:
Added MAX_MDLKEY_LENGTH constant to be used for allocating
buffers for key for metadata locking subsystem.
Added declarations of server kernel functions used by metadata
locking subsystem to mdl.h in order to decrease dependency of
mdl.cc on other files.
sql/mysql_priv.h:
Moved declaration of notify_thread_having_shared_lock() to the
mdl.h (also renamed it to make clear in metadata locking code
that it is a callback to SQL-layer).
sql/sql_base.cc:
Renamed notify_thread_having_shared_lock() to make it clear
in metadata locking subsystem code that it is a callback
to SQL layer.
sql/sql_handler.cc:
Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
buffer for object key for metadata locking subsystem.
sql/sql_show.cc:
Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
buffer for object key for metadata locking subsystem.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 6f0e4498d75..b9ea87aec52 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -141,7 +141,7 @@ static Uint64 *p_latest_trans_gci= 0; static TABLE *ndb_binlog_index= 0; static TABLE_LIST binlog_tables; static MDL_LOCK_DATA binlog_mdl_lock_data; -static char binlog_mdlkey[MAX_DBKEY_LENGTH]; +static char binlog_mdlkey[MAX_MDLKEY_LENGTH]; /* Helper functions |