merge

ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

1 files changed, 1 insertions, 1 deletions

diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp
index a36cdc2b475..15023cb0e3f 100644
--- a/ndb/include/ndbapi/Ndb.hpp
+++ b/ndb/include/ndbapi/Ndb.hpp
@@ -1614,7 +1614,7 @@ private:
   Uint32                theNoOfPreparedTransactions;
   Uint32                theNoOfSentTransactions;
   Uint32                theNoOfCompletedTransactions;
-  Uint32                theNoOfAllocatedTransactions;
+  Uint32                theRemainingStartTransactions;
   Uint32                theMaxNoOfTransactions;
   Uint32                theMinNoOfEventsToWakeUp;