Commit 4891ddc9 authored by unknown's avatar unknown
Browse files

Fixed failed automerge

parent c977e29c

sql/ha_ndbcluster.h

+0 −1
Original line number Diff line number Diff line
@@ -798,7 +798,6 @@ static void set_tabname(const char *pathname, char *tabname); 
  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,