bk commit into 5.1 tree (tomas:1.1918) BUG#11019

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1918 05/06/02 01:11:08 tomas@stripped +2 -0
  Services.cpp, mgmapi.h:
    Bug #11019  	mgmapi start backup in some cases returns wrong backupid

  storage/ndb/src/mgmsrv/Services.cpp
    1.47 05/06/02 01:10:21 tomas@stripped +2 -1
    Bug #11019  	mgmapi start backup in some cases returns wrong backupid

  storage/ndb/include/mgmapi/mgmapi.h
    1.45 05/06/02 01:10:21 tomas@stripped +2 -0
    Bug #11019  	mgmapi start backup in some cases returns wrong backupid

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325

--- 1.44/storage/ndb/include/mgmapi/mgmapi.h	2005-05-24 15:44:26 +02:00
+++ 1.45/storage/ndb/include/mgmapi/mgmapi.h	2005-06-02 01:10:21 +02:00
@@ -914,6 +914,8 @@
    * @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,

--- 1.46/storage/ndb/src/mgmsrv/Services.cpp	2005-04-08 02:44:09 +02:00
+++ 1.47/storage/ndb/src/mgmsrv/Services.cpp	2005-06-02 01:10:21 +02:00
@@ -671,7 +671,8 @@
   }
   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;