Commit f84ef209 authored by unknown's avatar unknown
Browse files

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

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
parents 677fa073 2b3a1494

storage/ndb/include/mgmapi/mgmapi.h

+2 −0
Original line number Diff line number Diff line
@@ -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,

storage/ndb/src/mgmsrv/Services.cpp

+2 −1
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ MgmApiSession::startBackup(Parser<MgmApiSession>::Context &, 
  }

  else{

    m_output->println("result: Ok");

    if (completed)

      m_output->println("id: %d", backupId);

  }

  m_output->println("");