After-merge fixes.

0faa86bb · knielsen@ymer.(none) · 39914c9b · 0faa86bb · 0faa86bb
Commit 0faa86bb authored Apr 25, 2007 by knielsen@ymer.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/ndb/src/ndbapi/NdbTransaction.cpp storage/ndb/src/ndbapi/NdbTransaction.cpp +1 -1

storage/ndb/test/ndbapi/testBasic.cpp storage/ndb/test/ndbapi/testBasic.cpp +1 -0

No files found.
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp
@@ -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);

--- a/storage/ndb/test/ndbapi/testBasic.cpp
+++ b/storage/ndb/test/ndbapi/testBasic.cpp
@@ -1374,6 +1374,7 @@ runBug27756(NDBT_Context* ctx, NDBT_Step* step)
  return NDBT_OK;
 }
+int
 runBug28073(NDBT_Context *ctx, NDBT_Step* step)
 {
  int result = NDBT_OK;