diff options
| author | unknown <mskold/marty@quadfish.(none)> | 2007-11-05 21:11:15 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@quadfish.(none)> | 2007-11-05 21:11:15 +0100 |
| commit | 18b54358f149e13a3d71bbc237479b536345eb2f (patch) | |
| tree | 0f0a793a3bafcce4e9108a92e8787f247508b927 /sql/ha_ndbcluster.h | |
| parent | de0780e00a184620f1831a5035fded5f314312d4 (diff) | |
| parent | f7ee88253a7d4620de3651c3c4d7cb7a3ab3d8ac (diff) | |
| download | mariadb-git-18b54358f149e13a3d71bbc237479b536345eb2f.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
mysql-test/suite/ndb/r/ndb_insert.result:
Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
Auto merged
sql/ha_ndbcluster.cc:
Using local, will merge manually
sql/ha_ndbcluster.h:
Merge
sql/mysqld.cc:
Merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index fd337303853..cc79402fe92 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -31,6 +31,8 @@ #include <ndbapi_limits.h> #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8 +#define NDB_DEFAULT_AUTO_PREFETCH 32 + class Ndb; // Forward declaration class NdbOperation; // Forward declaration @@ -446,6 +448,7 @@ private: uint errcode); int peek_indexed_rows(const uchar *record, NDB_WRITE_OP write_op); int fetch_next(NdbScanOperation* op); + int set_auto_inc(Field *field); int next_result(uchar *buf); int define_read_attrs(uchar* buf, NdbOperation* op); int filtered_scan(const uchar *key, uint key_len, |