bk commit into 5.1 tree (knielsen:1.2487)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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-04-25 15:48:12+02:00, knielsen@ymer.(none) +2 -0
  After-merge fixes.

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2007-04-25 15:48:08+02:00,
knielsen@ymer.(none) +1 -1
    After-merge fixes.

  storage/ndb/test/ndbapi/testBasic.cpp@stripped, 2007-04-25 15:48:08+02:00,
knielsen@ymer.(none) +1 -0
    After-merge fixes.

# 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:	knielsen
# Host:	ymer.(none)
# Root:	/usr/local/mysql/mysql-5.1-new-ndb

--- 1.77/storage/ndb/src/ndbapi/NdbTransaction.cpp	2007-04-25 15:48:19 +02:00
+++ 1.78/storage/ndb/src/ndbapi/NdbTransaction.cpp	2007-04-25 15:48:19 +02:00
@@ -680,7 +680,7 @@ void
 NdbTransaction::executeAsynch(ExecType aTypeOfExec,
                               NdbAsynchCallback aCallback,
                               void* anyObject,
-                              AbortOption abortOption,
+                              NdbOperation::AbortOption abortOption,
                               int forceSend)
 {
   executeAsynchPrepare(aTypeOfExec, aCallback, anyObject, abortOption);

--- 1.20/storage/ndb/test/ndbapi/testBasic.cpp	2007-04-25 15:48:19 +02:00
+++ 1.21/storage/ndb/test/ndbapi/testBasic.cpp	2007-04-25 15:48:19 +02:00
@@ -1374,6 +1374,7 @@ runBug27756(NDBT_Context* ctx, NDBT_Step
   return NDBT_OK;
 }
 
+int
 runBug28073(NDBT_Context *ctx, NDBT_Step* step)
 {
   int result = NDBT_OK;