From: magnus.blaudd
Date: November 7 2012 8:37pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4651 to 4653)
List-Archive: http://lists.mysql.com/commits/145235
Message-Id: <20121107203727.27794.2124.4653@wholphin>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4653 magnus.blaudd@stripped	2012-11-07 [merge]
      Merge 7.0 -> 7.1

 4652 magnus.blaudd@stripped	2012-11-07 [merge]
      Merge

    modified:
      client/mysqldump.c
      storage/ndb/include/mgmapi/mgmapi.h
 4651 Frazer Clement	2012-11-07 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/include/kernel/signaldata/LCP.hpp
      storage/ndb/src/common/debugger/signaldata/LCP.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2012-10-22 10:48:20 +0000
+++ b/client/mysqldump.c	2012-11-07 11:08:22 +0000
@@ -4147,7 +4147,6 @@ is_ndbinfo(MYSQL* mysql, const char* dbn
 
     if (!(row= mysql_fetch_row(res)))
     {
-      verbose_msg("-- Doesn't have ndbinfo engine\n");
       mysql_free_result(res);
       return 0;
     }

=== modified file 'storage/ndb/include/mgmapi/mgmapi.h'
--- a/storage/ndb/include/mgmapi/mgmapi.h	2011-07-04 16:30:34 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi.h	2012-11-07 13:42:03 +0000
@@ -402,7 +402,11 @@ extern "C" {
   void ndb_mgm_destroy_handle(NdbMgmHandle * handle);
 
   /**
-   * Set a name of the handle.  Name is reported in cluster log.
+   * Set a name of the handle.
+   *
+   * NOTE! Name is reported in cluster log only when the
+   * handle subsequently is used to allocate a nodeid
+   * using ndb_mgm_alloc_nodeid().
    *
    * @param   handle        Management handle
    * @param   name          Name

No bundle (reason: useless for push emails).