summaryrefslogtreecommitdiff
path: root/ndb/test
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-12-13 00:48:06 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2004-12-13 00:48:06 +0100
commit8f318cf1825176faba9cf8dcae9df78bc54d1e15 (patch)
treedae2601368512fb4e2d10b5107d2d7086a843e61 /ndb/test
parent45ec54e42e63bcb0429d961ee89ff42fbefed6e2 (diff)
downloadmariadb-git-8f318cf1825176faba9cf8dcae9df78bc54d1e15.tar.gz
fix bug#7193
added start backup parameter to enable setting wait state and set different timeouts depending on waitstate moved listen of backup event out of backup and into separete thread thread created at connect() and destroyed at disconnect() added start backup command options "nowait" "wait completed" "wait started" fixed log level settings ndb/include/mgmapi/mgmapi.h: added start backup parameter to enable setting wait state ndb/src/common/debugger/EventLogger.cpp: changed to unsigned printout ndb/src/mgmapi/mgmapi.cpp: added start backup parameter to enable setting wait state, and set different timeouts depending on waitstate ndb/src/mgmclient/CommandInterpreter.cpp: moved listen of backup event out of backup and into separete thread thread created at connect() and destroyed at disconnect() added start backup command options "nowait" "wait completed" "wait started" ndb/src/mgmsrv/MgmtSrvr.cpp: added more options to start backup to set wait state + set timeout depending on wait state + some debug printouts ndb/src/mgmsrv/MgmtSrvr.hpp: added more options to start backup to set wait state ndb/src/mgmsrv/Services.cpp: removed old backup code added use of stard backup otions fixed log level settings ndb/test/src/NdbBackup.cpp: adopted to new wait state option in start backup
Diffstat (limited to 'ndb/test')
-rw-r--r--ndb/test/src/NdbBackup.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/test/src/NdbBackup.cpp b/ndb/test/src/NdbBackup.cpp
index 09f52bf0bed..5e22468692e 100644
--- a/ndb/test/src/NdbBackup.cpp
+++ b/ndb/test/src/NdbBackup.cpp
@@ -46,7 +46,8 @@ NdbBackup::start(unsigned int & _backup_id){
ndb_mgm_reply reply;
reply.return_code = 0;
- if (ndb_mgm_start_backup(handle,
+ if (ndb_mgm_start_backup(handle,
+ 2, // wait until completed
&_backup_id,
&reply) == -1) {
g_err << "Could not start backup " << endl;