Fixed failed automerge

4891ddc9 · unknown · c977e29c · 4891ddc9
Commit 4891ddc9 authored Jun 21, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sql/ha_ndbcluster.h sql/ha_ndbcluster.h +0 -1

No files found.
--- 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,