From: John David Duncan
Date: December 19 2011 1:10am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3736 to 3737)
List-Archive: http://lists.mysql.com/commits/142170
Message-Id: <201112190110.pBJ1APIY005118@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3737 John David Duncan	2011-12-18
      Fix compiler warnings about integer types.

    modified:
      storage/ndb/memcache/src/ExternalValue.cc
      storage/ndb/memcache/src/ndb_error_logger.cc
      storage/ndb/memcache/src/ndb_flush.cc
      storage/ndb/memcache/src/ndb_pipeline.cc
 3736 John David Duncan	2011-12-18
      Address some small logging-related issues to make server more ready for production deployments.

    modified:
      storage/ndb/memcache/include/ndb_pipeline.h
      storage/ndb/memcache/src/Config_v1.cc
      storage/ndb/memcache/src/ndb_configuration.cc
      storage/ndb/memcache/src/ndb_pipeline.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/unit/alloc.cc
=== modified file 'storage/ndb/memcache/src/ExternalValue.cc'
--- a/storage/ndb/memcache/src/ExternalValue.cc	2011-12-18 23:21:21 +0000
+++ b/storage/ndb/memcache/src/ExternalValue.cc	2011-12-19 01:09:00 +0000
@@ -92,7 +92,7 @@ int ExternalValue::do_delete(memory_pool
     /* Delete them */
     int key_size = extern_plan->key_record->rec_size;
     
-    for(int i = 0; i < nparts ; i++) {
+    for(Uint32 i = 0; i < nparts ; i++) {
       Operation part_op(extern_plan);
       part_op.key_buffer = (char *) memory_pool_alloc(mpool, key_size);
       

=== modified file 'storage/ndb/memcache/src/ndb_error_logger.cc'
--- a/storage/ndb/memcache/src/ndb_error_logger.cc	2011-12-18 23:21:21 +0000
+++ b/storage/ndb/memcache/src/ndb_error_logger.cc	2011-12-19 01:09:00 +0000
@@ -53,7 +53,7 @@ class ErrorEntry;
 ErrorEntry * error_hash_table[ERROR_HASH_TABLE_SIZE];
 
 /* Prototypes */
-void manage_error(const NdbError &, const char * mesg, int interval);
+void manage_error(const NdbError &, const char * mesg, rel_time_t interval);
 
 
 
@@ -96,7 +96,7 @@ int log_ndb_error(const NdbError &error)
 
 class ErrorEntry {
 public:
-  unsigned int error_code;
+  int error_code;
   rel_time_t first;
   rel_time_t time[2];   /* odd and even timestamps */
   Uint32 count;
@@ -147,7 +147,7 @@ ErrorEntry * error_table_lookup(int code
 
 
 /* Record the error message, and possibly log it. */
-void manage_error(const NdbError & error, const char *type_mesg, int interval) {
+void manage_error(const NdbError & error, const char *type_mesg, rel_time_t interval) {
   char note[256];
   ErrorEntry *entry = 0;
   bool first_ever, interval_passed, flood = false;
@@ -170,7 +170,7 @@ void manage_error(const NdbError & error
     first_ever = (entry->count == 1);
     interval_passed = (entry->time[current] - entry->time[prior] > interval);
     if(! interval_passed) 
-      for(int i = 10 ; i <= entry->count ; i *= 10) 
+      for(Uint32 i = 10 ; i <= entry->count ; i *= 10) 
         if(entry->count < (10 * i) && (entry->count % i == 0))
           { flood = true; break; }
   }

=== modified file 'storage/ndb/memcache/src/ndb_flush.cc'
--- a/storage/ndb/memcache/src/ndb_flush.cc	2011-12-18 23:21:21 +0000
+++ b/storage/ndb/memcache/src/ndb_flush.cc	2011-12-19 01:09:00 +0000
@@ -108,7 +108,7 @@ bool scan_delete(NdbInstance *inst, Quer
   bool rescan, fetch_option;
   int rFetch, rExec, rDel, batch_size, rows_deleted;
   int error_status = 0;
-  const int max_errors = 100000;
+  const unsigned int max_errors = 100000;
   
   struct {
     unsigned int errors;

=== modified file 'storage/ndb/memcache/src/ndb_pipeline.cc'
--- a/storage/ndb/memcache/src/ndb_pipeline.cc	2011-12-18 23:26:44 +0000
+++ b/storage/ndb/memcache/src/ndb_pipeline.cc	2011-12-19 01:09:00 +0000
@@ -73,7 +73,7 @@ void init_pool_header(allocation_referen
 /* initialize a new pipeline for an NDB engine thread */
 ndb_pipeline * ndb_pipeline_initialize(struct ndb_engine *engine) {
   bool did_inc;
-  int id;
+  unsigned int id;
   thread_identifier * tid;
 
   /* Get my pipeline id */

No bundle (reason: useless for push emails).