diff options
| author | unknown <mskold@mysql.com> | 2006-06-21 09:51:08 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-21 09:51:08 +0200 |
| commit | 4891ddc977d80aec3ccefae3b89a0999400a173c (patch) | |
| tree | 102babe7746ac5a0c2bb3f4b76134f2d16384324 /sql/ha_ndbcluster.h | |
| parent | c977e29c4e04b6b85eaeacb281c86be089572469 (diff) | |
| download | mariadb-git-4891ddc977d80aec3ccefae3b89a0999400a173c.tar.gz | |
Fixed failed automerge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index c5f441f8959..df3c5791713 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -798,7 +798,6 @@ 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, 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, |