diff options
| author | unknown <mskold@mysql.com> | 2006-03-09 13:42:16 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-03-09 13:42:16 +0100 |
| commit | d56ca9c7e68fc631198b22acbf0c199439f5b85e (patch) | |
| tree | 2b8b28624e27816f2e00f98a06391d3251a81592 /sql/ha_ndbcluster.h | |
| parent | 73238e558cef123bd171d464bb1665b134f09c95 (diff) | |
| parent | a52a59236b2b8b1223f58a8e0b546c62d37b177a (diff) | |
| download | mariadb-git-d56ca9c7e68fc631198b22acbf0c199439f5b85e.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
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 7fa50fef060..6376228d7e6 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -719,7 +719,8 @@ private: void release_metadata(); NDB_INDEX_TYPE get_index_type(uint idx_no) const; NDB_INDEX_TYPE get_index_type_from_table(uint index_no) const; - NDB_INDEX_TYPE get_index_type_from_key(uint index_no, KEY *key_info) const; + NDB_INDEX_TYPE get_index_type_from_key(uint index_no, KEY *key_info, + bool primary) const; int check_index_fields_not_null(uint index_no); uint set_up_partition_info(partition_info *part_info, |