summaryrefslogtreecommitdiff
path: root/ndb/test
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-09-22 09:13:13 +0200
committerunknown <joreland@mysql.com>2004-09-22 09:13:13 +0200
commit71ead013168a1bf15af84037a7cd3da723323be7 (patch)
tree175769a6c7e439dc335b422a93d71d3e3776559a /ndb/test
parentaa55c00558880bbccd5fae54a1a41da81d4e0281 (diff)
downloadmariadb-git-71ead013168a1bf15af84037a7cd3da723323be7.tar.gz
testScan - ReadWithLocksAndInserts
testBasic LocksAndInserts ndb/test/src/HugoTransactions.cpp: Fix HugoTransaction::load so that transaction is closed and started if error is found
Diffstat (limited to 'ndb/test')
-rw-r--r--ndb/test/src/HugoTransactions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ndb/test/src/HugoTransactions.cpp b/ndb/test/src/HugoTransactions.cpp
index 53809ecc851..994a45de3dc 100644
--- a/ndb/test/src/HugoTransactions.cpp
+++ b/ndb/test/src/HugoTransactions.cpp
@@ -729,10 +729,9 @@ HugoTransactions::loadTable(Ndb* pNdb,
NdbSleep_MilliSleep(doSleep);
// if (first_batch || !oneTrans) {
- if (first_batch) {
+ if (first_batch || !pTrans) {
first_batch = false;
pTrans = pNdb->startTransaction();
-
if (pTrans == NULL) {
const NdbError err = pNdb->getNdbError();
@@ -786,7 +785,7 @@ HugoTransactions::loadTable(Ndb* pNdb,
if(check == -1 ) {
const NdbError err = pTrans->getNdbError();
pNdb->closeTransaction(pTrans);
-
+ pTrans= 0;
switch(err.status){
case NdbError::Success:
ERR(err);
@@ -828,6 +827,7 @@ HugoTransactions::loadTable(Ndb* pNdb,
else{
if (closeTrans) {
pNdb->closeTransaction(pTrans);
+ pTrans= 0;
}
}