After-merge fixes.

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);

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;