mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

Browse source 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
This commit is contained in:
joreland@mysql.com 2004-09-22 17:29:50 +02:00
commit 2f612c5ada
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ndb/test/ndbapi/testBackup.cpp
View file

@ -149,6 +149,9 @@ int runRestartInitial(NDBT_Context* ctx, NDBT_Step* step){
if (restarter.restartAll(true) != 0)
return NDBT_FAILED;
if (restarter.waitClusterStarted() != 0)
return NDBT_FAILED;
return NDBT_OK;
}
@ -413,7 +416,6 @@ TESTCASE("BackupOne",
INITIALIZER(runRestoreOne);
VERIFIER(runVerifyOne);
FINALIZER(runClearTable);
FINALIZER(runDropTable);
}
TESTCASE("BackupBank",
"Test that backup and restore works during transaction load\n"

8
ndb/test/run-test/daily-devel-tests.txt
View file

@ -193,16 +193,16 @@ args: -n BasicEventOperation T1 T6
#
max-time: 1500
cmd: testSystemRestart
args: -n SR6 -l 1 T1
args: -l 1 -n SR6 T1
max-time: 1500
cmd: testSystemRestart
args: -n SR7 -l 1 T1
args: -l 1 -n SR7 T1
max-time: 1500
cmd: testSystemRestart
args: -n S8 -l 1 T1
args: -l 1 -n SR8 T1
max-time: 1500
cmd: testSystemRestart
args: -n S9 -l 1 T1
args: -l 1 -n SR9 T1

6
ndb/test/src/HugoTransactions.cpp
View file

@ -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;
}
}