diff options
| author | unknown <mskold/marty@linux.site> | 2007-10-02 14:23:59 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-10-02 14:23:59 +0200 |
| commit | 1acfc89033164a676eb7c51955844760b29877cc (patch) | |
| tree | 4db71a531808446bf0e9e4c1e095a5926459b26c /sql/ha_ndbcluster.h | |
| parent | 0c468819f4b66a7e88d4d0aa492dcae6a00c26c5 (diff) | |
| parent | c19a8c0631daf263893672c70181cdc246e171c9 (diff) | |
| download | mariadb-git-1acfc89033164a676eb7c51955844760b29877cc.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/suite/ndb/r/ndb_update.result:
Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
Auto merged
sql/ha_ndbcluster.cc:
Merge
sql/ha_ndbcluster.h:
Merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 808ffe20f3e..fd337303853 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -81,6 +81,12 @@ typedef struct ndb_index_data { uint index_stat_query_count; } NDB_INDEX_DATA; +typedef enum ndb_write_op { + NDB_INSERT = 0, + NDB_UPDATE = 1, + NDB_PK_UPDATE = 2 +} NDB_WRITE_OP; + typedef union { const NdbRecAttr *rec; NdbBlob *blob; void *ptr; } NdbValue; int get_ndb_blobs_value(TABLE* table, NdbValue* value_array, @@ -438,7 +444,7 @@ private: const NdbOperation *first, const NdbOperation *last, uint errcode); - int peek_indexed_rows(const uchar *record, bool check_pk); + int peek_indexed_rows(const uchar *record, NDB_WRITE_OP write_op); int fetch_next(NdbScanOperation* op); int next_result(uchar *buf); int define_read_attrs(uchar* buf, NdbOperation* op); @@ -463,6 +469,7 @@ private: friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg); int set_primary_key(NdbOperation *op, const uchar *key); int set_primary_key_from_record(NdbOperation *op, const uchar *record); + bool check_index_fields_in_write_set(uint keyno); int set_index_key_from_record(NdbOperation *op, const uchar *record, uint keyno); int set_bounds(NdbIndexScanOperation*, uint inx, bool rir, |