diff options
| author | unknown <mskold/marty@linux.site> | 2006-09-22 21:14:58 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-09-22 21:14:58 +0200 |
| commit | 56c7e8b3c81334aa725d5987ca211bb7a173219d (patch) | |
| tree | 42f07728ef40c5aafb245f4235f113fe4998ab08 /sql/ha_ndbcluster_binlog.h | |
| parent | a747e0c3b11eeadcd16f9735fb419931c506068b (diff) | |
| parent | 00959e4da4d230e8ab51392a13ad36055f0ad77a (diff) | |
| download | mariadb-git-56c7e8b3c81334aa725d5987ca211bb7a173219d.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster_binlog.h')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h index 774efb5984c..822ebf3e358 100644 --- a/sql/ha_ndbcluster_binlog.h +++ b/sql/ha_ndbcluster_binlog.h @@ -103,7 +103,7 @@ extern pthread_mutex_t injector_mutex; extern pthread_cond_t injector_cond; extern unsigned char g_node_id_map[max_ndb_nodes]; -extern handlerton ndbcluster_hton; +extern handlerton *ndbcluster_hton; extern pthread_t ndb_util_thread; extern pthread_mutex_t LOCK_ndb_util_thread; extern pthread_cond_t COND_ndb_util_thread; @@ -214,10 +214,10 @@ inline void real_free_share(NDB_SHARE **share) inline Thd_ndb * -get_thd_ndb(THD *thd) { return (Thd_ndb *) thd->ha_data[ndbcluster_hton.slot]; } +get_thd_ndb(THD *thd) { return (Thd_ndb *) thd->ha_data[ndbcluster_hton->slot]; } inline void -set_thd_ndb(THD *thd, Thd_ndb *thd_ndb) { thd->ha_data[ndbcluster_hton.slot]= thd_ndb; } +set_thd_ndb(THD *thd, Thd_ndb *thd_ndb) { thd->ha_data[ndbcluster_hton->slot]= thd_ndb; } Ndb* check_ndb_in_thd(THD* thd); |