diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-17 11:00:03 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-17 11:00:03 +0200 |
| commit | dc4f7044785178a56ddc03a7832af1566fbb9e25 (patch) | |
| tree | e0fe962a0f8ed8d699d8be6d17dd26f854ede129 /sql/ha_ndbcluster.cc | |
| parent | 8f8eab9c028d18da22af0ac330d022959a2f1c1b (diff) | |
| parent | 29393eafdbe87f14d9885ef875b81d7529025c86 (diff) | |
| download | mariadb-git-dc4f7044785178a56ddc03a7832af1566fbb9e25.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/log_event.cc:
Manual merge.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 3b68b3828d2..68295509e78 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4287,7 +4287,7 @@ THR_LOCK_DATA **ha_ndbcluster::store_lock(THD *thd, */ #ifdef HAVE_NDB_BINLOG -extern MASTER_INFO *active_mi; +extern Master_info *active_mi; static int ndbcluster_update_apply_status(THD *thd, int do_update) { Thd_ndb *thd_ndb= get_thd_ndb(thd); |