From 4891ddc977d80aec3ccefae3b89a0999400a173c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Jun 2006 09:51:08 +0200 Subject: [PATCH] Fixed failed automerge --- sql/ha_ndbcluster.h | 1 - 1 file changed, 1 deletion(-) 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,