mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
This commit is contained in:
unknown 2005-06-02 01:18:03 +02:00
commit f84ef209c8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/ndb/include/mgmapi/mgmapi.h
View file

@ -915,6 +915,8 @@ extern "C" {
* @param backup_id Backup ID is returned from function.
* @param reply Reply message.
* @return -1 on error.
* @note backup_id will not be returned if
* wait_completed == 0
*/
int ndb_mgm_start_backup(NdbMgmHandle handle, int wait_completed,
unsigned int* backup_id,

3
storage/ndb/src/mgmsrv/Services.cpp
View file

@ -671,7 +671,8 @@ MgmApiSession::startBackup(Parser<MgmApiSession>::Context &,
}
else{
m_output->println("result: Ok");
m_output->println("id: %d", backupId);
if (completed)
m_output->println("id: %d", backupId);
}
m_output->println("");
DBUG_VOID_RETURN;