diff options
| author | mskold@mysql.com <> | 2006-06-21 09:42:15 +0200 |
|---|---|---|
| committer | mskold@mysql.com <> | 2006-06-21 09:42:15 +0200 |
| commit | bd3f9cc0a5a8be82f88a4d4cbb671694c9a7df44 (patch) | |
| tree | 2baeadc74d55ed4bdf68e1db0b1b85150a37c571 /sql/ha_ndbcluster.h | |
| parent | bb94cb24c51270ab43c63b57bb17eafa94e093eb (diff) | |
| parent | e77850e5737666e02d2e1d45127680f97987a345 (diff) | |
| download | mariadb-git-bd3f9cc0a5a8be82f88a4d4cbb671694c9a7df44.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
into mysql.com:/home/marty/MySQL/mysql-5.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 9bcc549cb60..c5f441f8959 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -798,7 +798,7 @@ private: int get_ndb_value(NdbOperation*, Field *field, uint fieldnr, byte*); int get_ndb_partition_id(NdbOperation *); friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg); - int get_ndb_blobs_value(NdbBlob *last_ndb_blob); + int get_ndb_blobs_value(NdbBlob *last_ndb_blob, my_ptrdiff_t ptrdiff); 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, @@ -883,6 +883,7 @@ private: ha_rows m_ops_pending; bool m_skip_auto_increment; bool m_blobs_pending; + my_ptrdiff_t m_blobs_offset; // memory for blobs in one tuple char *m_blobs_buffer; uint32 m_blobs_buffer_size; |