diff options
| author | bell@sanja.is.com.ua <> | 2004-09-25 18:37:28 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-09-25 18:37:28 +0300 |
| commit | 6df58cc97e6aecd341b8dfcb82b696fd5123f90a (patch) | |
| tree | 1328afc6e2b10d48dd499927063824ec875201a9 /sql/ha_ndbcluster.h | |
| parent | cd32040889b9bc9f6437588a3a8bf3878c021b1b (diff) | |
| parent | ef7bdbf4b8efd5d1d293e801939937a26fef6292 (diff) | |
| download | mariadb-git-6df58cc97e6aecd341b8dfcb82b696fd5123f90a.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
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 a25d3e18310..c0ef172413f 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -211,7 +211,7 @@ class ha_ndbcluster: public handler int set_ndb_key(NdbOperation*, Field *field, uint fieldnr, const byte* field_ptr); int set_ndb_value(NdbOperation*, Field *field, uint fieldnr); - int get_ndb_value(NdbOperation*, Field *field, uint fieldnr); + int get_ndb_value(NdbOperation*, Field *field, uint fieldnr, byte*); friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg); int get_ndb_blobs_value(NdbBlob *last_ndb_blob); int set_primary_key(NdbOperation *op, const byte *key); @@ -245,6 +245,7 @@ class ha_ndbcluster: public handler typedef union { NdbRecAttr *rec; NdbBlob *blob; void *ptr; } NdbValue; NdbValue m_value[NDB_MAX_ATTRIBUTES_IN_TABLE]; bool m_use_write; + bool m_ignore_dup_key_not_supported; bool retrieve_all_fields; ha_rows rows_to_insert; ha_rows rows_inserted; |