HugoTransactions.cpp

    changed to do execute(commit);restart() transaction instead of closeTransaction();start new
select_all.cpp
    moved my_init outside DBUG_OFF


ndb/test/src/HugoTransactions.cpp:
  changed to do execute(commit);restart() transaction instead of closeTransaction();start new
ndb/tools/select_all.cpp:
  moved my_init outside DBUG_OFF

1 files changed, 5 insertions, 2 deletions

diff --git a/ndb/test/src/HugoTransactions.cpp b/ndb/test/src/HugoTransactions.cpp
index 05039562c76..53809ecc851 100644
--- a/ndb/test/src/HugoTransactions.cpp
+++ b/ndb/test/src/HugoTransactions.cpp
@@ -728,7 +728,8 @@ HugoTransactions::loadTable(Ndb* pNdb,
     if (doSleep > 0)
       NdbSleep_MilliSleep(doSleep);
 
-    if (first_batch || !oneTrans) {
+    //    if (first_batch || !oneTrans) {
+    if (first_batch) {
       first_batch = false;
       pTrans = pNdb->startTransaction();
     
@@ -774,8 +775,10 @@ HugoTransactions::loadTable(Ndb* pNdb,
     
     // Execute the transaction and insert the record
     if (!oneTrans || (c + batch) >= records) {
-      closeTrans = true;
+      //      closeTrans = true;
+      closeTrans = false;
       check = pTrans->execute( Commit );
+      pTrans->restart();
     } else {
       closeTrans = false;
       check = pTrans->execute( NoCommit );