diff options
| author | unknown <joreland@mysql.com> | 2005-03-23 08:12:52 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-03-23 08:12:52 +0100 |
| commit | 221471617615cc5176b75313e7e46f3cb9d7e650 (patch) | |
| tree | b98f0350a1a1dae1366f1a129c08e1015ec9a959 /sql/ha_ndbcluster.h | |
| parent | 28ea63a6a3405fa76695a9b5d8366fc57795b7d3 (diff) | |
| parent | e49474330b9b981a01ac39c43277ad31eddd74b7 (diff) | |
| download | mariadb-git-221471617615cc5176b75313e7e46f3cb9d7e650.tar.gz | |
merge
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 82925ad5d69..4574ddc3562 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -509,7 +509,7 @@ private: int create_unique_index(const char *name, KEY *key_info); int initialize_autoincrement(const void *table); enum ILBP {ILBP_CREATE = 0, ILBP_OPEN = 1}; // Index List Build Phase - int build_index_list(TABLE *tab, enum ILBP phase); + int build_index_list(Ndb *ndb, TABLE *tab, enum ILBP phase); int get_metadata(const char* path); void release_metadata(); NDB_INDEX_TYPE get_index_type(uint idx_no) const; @@ -594,6 +594,7 @@ private: NdbTransaction *m_active_trans; NdbScanOperation *m_active_cursor; void *m_table; + int m_tableVersion; void *m_table_info; char m_dbname[FN_HEADLEN]; //char m_schemaname[FN_HEADLEN]; |