diff options
| author | mskold@mysql.com <> | 2006-03-23 09:48:46 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2006-03-23 09:48:46 +0100 |
| commit | 25c149da0429f013f97f21381b4ee31322cf7fbe (patch) | |
| tree | dca1456f3cd8d3c7428cfaa532b7f1bba26c53ef /sql/ha_ndbcluster.h | |
| parent | c5337540af078722ca006287fb9e0d55e70dd845 (diff) | |
| download | mariadb-git-25c149da0429f013f97f21381b4ee31322cf7fbe.tar.gz | |
Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'
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 a44604b05b0..d75d7acefd9 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -597,7 +597,11 @@ private: int pk_read(const byte *key, uint key_len, byte *buf); int complemented_pk_read(const byte *old_data, byte *new_data); - int peek_row(const byte *record); + bool check_all_operations_for_error(NdbTransaction *trans, + const NdbOperation *first, + const NdbOperation *last, + uint errcode); + int peek_indexed_rows(const byte *record); int unique_index_read(const byte *key, uint key_len, byte *buf); int ordered_index_scan(const key_range *start_key, @@ -627,6 +631,8 @@ private: int get_ndb_blobs_value(NdbBlob *last_ndb_blob); int set_primary_key(NdbOperation *op, const byte *key); int set_primary_key_from_record(NdbOperation *op, const byte *record); + int set_index_key_from_record(NdbOperation *op, const byte *record, + uint keyno); int set_bounds(NdbIndexScanOperation*, const key_range *keys[2], uint= 0); int key_cmp(uint keynr, const byte * old_row, const byte * new_row); int set_index_key(NdbOperation *, const KEY *key_info, const byte *key_ptr); @@ -686,6 +692,7 @@ private: byte m_ref[NDB_HIDDEN_PRIMARY_KEY_LENGTH]; bool m_use_write; bool m_ignore_dup_key; + bool m_has_unique_index; bool m_primary_key_update; bool m_retrieve_all_fields; bool m_retrieve_primary_key; |