diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-09-11 16:17:28 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-09-11 16:17:28 +0200 |
| commit | 4c888fcb67c152f87aec84bd40acd5769bb98d38 (patch) | |
| tree | c444252f1e9c221c68760ad20e079f1b6186808e /sql/ha_ndbcluster.cc | |
| parent | 821abeee47be68790857abe5e0d6ee67a34a326c (diff) | |
| parent | 0e1cdf8d94a35c339c935ed00b2b63597bd27d47 (diff) | |
| download | mariadb-git-4c888fcb67c152f87aec84bd40acd5769bb98d38.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
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 992581b65c3..be1b431a20d 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4322,7 +4322,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); |