From: Date: June 21 2006 9:51am
Subject: bk commit into 5.1 tree (mskold:1.2234)
List-Archive: http://lists.mysql.com/commits/7994
Message-Id: <20060621075135.0C866DE7C8@linux.site>

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2234 06/06/21 09:51:08 mskold@stripped +1 -0
  Fixed failed automerge

  sql/ha_ndbcluster.h
    1.141 06/06/21 09:50:35 mskold@stripped +0 -1
    Fixed failed automerge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.1

--- 1.140/sql/ha_ndbcluster.h	2006-06-21 09:38:33 +02:00
+++ 1.141/sql/ha_ndbcluster.h	2006-06-21 09:50:35 +02:00
@@ -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,