bk commit into 5.1 tree (tomas:1.2571)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-07-05 07:29:15+02:00, tomas@stripped +1 -0
  correct merge error

  storage/ndb/include/ndbapi/Ndb.hpp@stripped, 2007-07-05 07:29:13+02:00, tomas@stripped +0 -10
    correct merge error

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.2

--- 1.72/storage/ndb/include/ndbapi/Ndb.hpp	2007-07-04 20:17:27 +02:00
+++ 1.73/storage/ndb/include/ndbapi/Ndb.hpp	2007-07-05 07:29:13 +02:00
@@ -1283,16 +1283,6 @@
    */
 
   /**
-   * Structure for passing in pointers to startTransaction
-   *
-   */
-  struct Key_part_ptr
-  {
-    const void * ptr;
-    unsigned len;
-  };
-
-  /**
    * Start a transaction
    *
    * @note When the transaction is completed it must be closed using