diff options
| author | unknown <joreland@mysql.com> | 2004-09-25 19:31:36 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-09-25 19:31:36 +0200 |
| commit | 0ef58d54886429896a6146803a7cf21822ad075b (patch) | |
| tree | efa56842d093ae595bd3510848695bf74e58c382 /ndb | |
| parent | efb4d837e703c89a4ccfd87392be764c6cd8d406 (diff) | |
| download | mariadb-git-0ef58d54886429896a6146803a7cf21822ad075b.tar.gz | |
testBackup
ndb/src/mgmsrv/MgmtSrvr.cpp:
Fix so that start backup can be blocking
ndb/test/run-test/daily-devel-tests.txt:
Use atrt-testBackup (which setups env)
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 12 | ||||
| -rw-r--r-- | ndb/test/run-test/daily-devel-tests.txt | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index 4c09805ba12..92a8025295f 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -2420,7 +2420,17 @@ void MgmtSrvr::backupCallback(BackupEvent & event) { m_lastBackupEvent = event; - theWaitState = NO_WAIT; + switch(event.Event){ + case BackupEvent::BackupFailedToStart: + case BackupEvent::BackupAborted: + case BackupEvent::BackupCompleted: + theWaitState = NO_WAIT; + break; + case BackupEvent::BackupStarted: + if(theWaitState == WAIT_BACKUP_STARTED) + theWaitState = NO_WAIT; + } + return; } diff --git a/ndb/test/run-test/daily-devel-tests.txt b/ndb/test/run-test/daily-devel-tests.txt index 2497fa7d038..f2abc961807 100644 --- a/ndb/test/run-test/daily-devel-tests.txt +++ b/ndb/test/run-test/daily-devel-tests.txt @@ -27,7 +27,7 @@ cmd: atrt-testBackup args: -n BackupOne T1 T6 T3 I3 max-time: 1000 -cmd: testBackup +cmd: atrt-testBackup args: -n BackupBank T6 # |