summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.h
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2004-12-30 21:36:16 +0100
committerunknown <mskold@mysql.com>2004-12-30 21:36:16 +0100
commitade13078d13932f55c7c49acd36c95e5af2d9543 (patch)
tree746329a45317e19c2594cae58dd104e9500f554e /sql/ha_ndbcluster.h
parent12b08e569431a9d98baf0e2f03d1c024259b3d07 (diff)
parent523882ab71ee8b1d9e4c0f682b96069d5f8d83c9 (diff)
downloadmariadb-git-ade13078d13932f55c7c49acd36c95e5af2d9543.tar.gz
Merged bugfix
BitKeeper/etc/logging_ok: auto-union sql/ha_ndbcluster.h: Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
-rw-r--r--sql/ha_ndbcluster.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 2d7b14b2311..15e61a93574 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -210,7 +210,6 @@ class ha_ndbcluster: public handler
NdbConnection *m_active_trans;
NdbResultSet *m_active_cursor;
- Ndb *m_ndb;
void *m_table;
void *m_table_info;
char m_dbname[FN_HEADLEN];
@@ -246,6 +245,7 @@ class ha_ndbcluster: public handler
bool m_transaction_on;
bool m_use_local_query_cache;
+ Ndb *get_ndb();
void set_rec_per_key();
void records_update();
void no_uncommitted_rows_execute_failure();