bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:5027 to 5028)

[magnus.blaudd]

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

    modified:
      client/mysqldump.c
      storage/ndb/include/mgmapi/mgmapi.h
 5027 Frazer Clement	2012-11-07
      Bug #14680057 	NDB : LCP FRAG WATCHDOG GIVES ERROR WITH V HIGH TABLE, FRAGMENT AND ROW COUNTS
      
      The recently added LCP fragment scan watchdog occasionally reported
      problems with LCP fragment scans with very high table id, fragment id,
      and row count values.
      
      This was due to the watchdog not accounting for the time spent draining
      the 'Backup' buffer used to buffer rows before writing to the fragment
      checkpoint file.
      
      This is fixed so that in the final stage of an LCP fragment scan, the 
      watchdog switches from monitoring rows scanned, to monitoring the 
      buffer size in bytes.  The buffer size should decrease as data is 
      written to the file, after which the file should be promptly closed.

    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 13:37:56 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi.h	2012-11-07 13:41:10 +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).