From: John David Duncan
Date: October 12 2011 3:12am
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3595 to 3596)
List-Archive: http://lists.mysql.com/commits/141390
Message-Id: <201110120312.p9C3CeBL008020@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3596 John David Duncan	2011-10-11
      Use %llu to print a Uint64 (it's correct on both gcc and Sun)

    modified:
      storage/ndb/memcache/src/ClusterConnectionPool.cc
      storage/ndb/memcache/src/DataTypeHandler.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
 3595 John David Duncan	2011-10-11
      clean up closing braces

    modified:
      storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c
=== modified file 'storage/ndb/memcache/src/ClusterConnectionPool.cc'
--- a/storage/ndb/memcache/src/ClusterConnectionPool.cc	2011-09-28 04:55:30 +0000
+++ b/storage/ndb/memcache/src/ClusterConnectionPool.cc	2011-10-12 02:44:38 +0000
@@ -193,7 +193,7 @@ void ClusterConnectionPool::add_stats(co
   
     for(int s = 0 ; s < Ndb::NumClientStatistics ; s++) {
       klen = sprintf(key, "%s_conn%d_%s", prefix, i, db.getClientStatName(s));
-      vlen = sprintf(val, "%"PRIu64, ndb_stats[s]);
+      vlen = sprintf(val, "%llu", ndb_stats[s]);
       add_stat(key, klen, val, vlen, cookie);
     }
   }

=== modified file 'storage/ndb/memcache/src/DataTypeHandler.cc'
--- a/storage/ndb/memcache/src/DataTypeHandler.cc	2011-10-02 02:58:36 +0000
+++ b/storage/ndb/memcache/src/DataTypeHandler.cc	2011-10-12 02:44:38 +0000
@@ -785,7 +785,7 @@ int dth_encode_unsigned(const NdbDiction
 int dth_decode_bigint(const NdbDictionary::Column *col,  
                       char * &str, const void *buf) {
   LOAD_ALIGNED_DATA(Int64, int64val, buf);
-  return sprintf(str, "%"PRId64, int64val);
+  return sprintf(str, "%lld", int64val);
 }
 
 int dth_encode_bigint(const NdbDictionary::Column *col, size_t len,
@@ -805,7 +805,7 @@ int dth_encode_bigint(const NdbDictionar
 int dth_decode_ubigint(const NdbDictionary::Column *col,  
                        char * &str, const void *buf) {
   LOAD_ALIGNED_DATA(Uint64, uint64val, buf);
-  return sprintf(str, "%"PRIu64, uint64val);
+  return sprintf(str, "%llu", uint64val);
 }
 
 int dth_encode_ubigint(const NdbDictionary::Column *col, size_t len,

=== modified file 'storage/ndb/memcache/src/schedulers/S_sched.cc'
--- a/storage/ndb/memcache/src/schedulers/S_sched.cc	2011-10-03 04:22:18 +0000
+++ b/storage/ndb/memcache/src/schedulers/S_sched.cc	2011-10-12 02:44:38 +0000
@@ -708,15 +708,15 @@ void S::Connection::add_stats(const char
   int klen, vlen;
 
   klen = sprintf(key, "cl%d.conn%d.sent_operations", cluster.cluster_id, id);
-  vlen = sprintf(val, "%"PRIu64, stats.sent_operations);
+  vlen = sprintf(val, "%llu", stats.sent_operations);
   add_stat(key, klen, val, vlen, cookie);
   
   klen = sprintf(key, "cl%d.conn%d.batches", cluster.cluster_id, id);
-  vlen = sprintf(val, "%"PRIu64, stats.batches);
+  vlen = sprintf(val, "%llu", stats.batches);
   add_stat(key, klen, val, vlen, cookie);
 
   klen = sprintf(key, "cl%d.conn%d.timeout_races", cluster.cluster_id, id);
-  vlen = sprintf(val, "%"PRIu64, stats.timeout_races);
+  vlen = sprintf(val, "%llu", stats.timeout_races);
   add_stat(key, klen, val, vlen, cookie);
 }                              
   

No bundle (reason: useless for push emails).