From: John David Duncan
Date: March 7 2012 4:00am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3831 to 3832)
List-Archive: http://lists.mysql.com/commits/143115
Message-Id: <201203070400.q2740ZGv016714@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3832 John David Duncan	2012-03-06 [merge]
      Merge

    modified:
      storage/ndb/memcache/src/ndb_engine_errors.cc
      storage/ndb/memcache/src/ndb_error_logger.cc
 3831 John David Duncan	2012-03-06 [merge]
      Merge local 7.2.4-bugs tree into local master

    added:
      storage/ndb/memcache/include/ndb_engine_errors.h
      storage/ndb/memcache/src/ndb_engine_errors.cc
    modified:
      storage/ndb/memcache/CMakeLists.txt
      storage/ndb/memcache/include/LookupTable.h
      storage/ndb/memcache/include/NdbInstance.h
      storage/ndb/memcache/include/Scheduler.h
      storage/ndb/memcache/include/ndb_engine.h
      storage/ndb/memcache/include/ndb_error_logger.h
      storage/ndb/memcache/include/ndb_pipeline.h
      storage/ndb/memcache/include/workitem.h
      storage/ndb/memcache/src/Config_v1.cc
      storage/ndb/memcache/src/ndb_engine.c
      storage/ndb/memcache/src/ndb_engine_private.h
      storage/ndb/memcache/src/ndb_error_logger.cc
      storage/ndb/memcache/src/ndb_pipeline.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/src/schedulers/S_sched.h
      storage/ndb/memcache/src/schedulers/Stockholm.cc
      storage/ndb/memcache/src/schedulers/Stockholm.h
      storage/ndb/memcache/src/workitem.c
=== modified file 'storage/ndb/memcache/src/ndb_engine_errors.cc'
--- a/storage/ndb/memcache/src/ndb_engine_errors.cc	2012-03-03 04:28:09 +0000
+++ b/storage/ndb/memcache/src/ndb_engine_errors.cc	2012-03-07 03:57:36 +0000
@@ -22,11 +22,11 @@
 
 ndberror_struct AppError9001_ReconfLock = 
   { ndberror_st_temporary , ndberror_cl_application , 9001, -1,
-    "Could not obtain configuration read lock" 
+    "Could not obtain configuration read lock", 0
   };
 
 ndberror_struct AppError9002_NoNDBs =
   { ndberror_st_temporary , ndberror_cl_application , 9002, -1,
-    "No Ndb Instances in freelist" 
+    "No Ndb Instances in freelist", 0
   };
 

=== modified file 'storage/ndb/memcache/src/ndb_error_logger.cc'
--- a/storage/ndb/memcache/src/ndb_error_logger.cc	2012-03-03 04:28:09 +0000
+++ b/storage/ndb/memcache/src/ndb_error_logger.cc	2012-03-07 03:57:36 +0000
@@ -209,7 +209,7 @@ void ndb_error_logger_stats(ADD_STAT add
   for(i = 0 ; i < ERROR_HASH_TABLE_SIZE; i++) {
     for(sym = error_hash_table[i] ; sym != 0 ; sym = sym->next) { 
       klen = sprintf(key, "NDB_Error_%d", sym->error_code);
-      vlen = sprintf(val, "%lu", sym->count);
+      vlen = sprintf(val, "%du", sym->count);
       add_stat(key, klen, val, vlen, cookie);
     }
   }

No bundle (reason: useless for push emails).