Commit 0b83acb8 authored by tomas@poseidon.(none)'s avatar tomas@poseidon.(none)

HugoTransactions.cpp

    changed to do execute(commit);restart() transaction instead of closeTransaction();start new
select_all.cpp
    moved my_init outside DBUG_OFF
parent 0ecfc4ce
...@@ -728,7 +728,8 @@ HugoTransactions::loadTable(Ndb* pNdb, ...@@ -728,7 +728,8 @@ HugoTransactions::loadTable(Ndb* pNdb,
if (doSleep > 0) if (doSleep > 0)
NdbSleep_MilliSleep(doSleep); NdbSleep_MilliSleep(doSleep);
if (first_batch || !oneTrans) { // if (first_batch || !oneTrans) {
if (first_batch) {
first_batch = false; first_batch = false;
pTrans = pNdb->startTransaction(); pTrans = pNdb->startTransaction();
...@@ -774,8 +775,10 @@ HugoTransactions::loadTable(Ndb* pNdb, ...@@ -774,8 +775,10 @@ HugoTransactions::loadTable(Ndb* pNdb,
// Execute the transaction and insert the record // Execute the transaction and insert the record
if (!oneTrans || (c + batch) >= records) { if (!oneTrans || (c + batch) >= records) {
closeTrans = true; // closeTrans = true;
closeTrans = false;
check = pTrans->execute( Commit ); check = pTrans->execute( Commit );
pTrans->restart();
} else { } else {
closeTrans = false; closeTrans = false;
check = pTrans->execute( NoCommit ); check = pTrans->execute( NoCommit );
......
...@@ -88,8 +88,8 @@ int main(int argc, const char** argv){ ...@@ -88,8 +88,8 @@ int main(int argc, const char** argv){
} }
_tabname = argv[optind]; _tabname = argv[optind];
#ifndef DBUG_OFF
my_init(); my_init();
#ifndef DBUG_OFF
if (debug_option) if (debug_option)
DBUG_PUSH(debug_option); DBUG_PUSH(debug_option);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment