diff options
author | unknown <tulin@build.mysql.com> | 2005-01-05 15:55:26 +0100 |
---|---|---|
committer | unknown <tulin@build.mysql.com> | 2005-01-05 15:55:26 +0100 |
commit | 1aa55857f045409524190067c17a56fa98807994 (patch) | |
tree | 1a44dde4c5e228a4c8fcd76553ce019ef9166df6 /sql/ha_ndbcluster.h | |
parent | 7f7cdd0b7e9d9efb3039eb5aeb20cac4973ecb35 (diff) | |
parent | c99b4964ca7da035bf2895812ef02bcfbdefa67a (diff) | |
download | mariadb-git-1aa55857f045409524190067c17a56fa98807994.tar.gz |
Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
BitKeeper/etc/logging_ok:
auto-union
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
-rw-r--r-- | sql/ha_ndbcluster.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 93c060d2107..b5cf727ead7 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -213,7 +213,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]; @@ -248,6 +247,7 @@ class ha_ndbcluster: public handler ha_rows m_autoincrement_prefetch; bool m_transaction_on; + Ndb *get_ndb(); void set_rec_per_key(); void records_update(); void no_uncommitted_rows_execute_failure(); |