Store .40 release information.

diff --git a/ChangeLog b/ChangeLog
index f1d345a0b680e89753e33b84b015af07bb25e557..d61f59978b6847f525f996fc52e1b2a41f148f8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
+0.40 Thu Apr 22 19:01:25 PDT 2010
   * Placed retry logic in for busted resolvers
   * Add an ignore for SIGPIPE to solve OSX issues.
+  * A couple of fixed for memcached_light server.
+  * Updated to debug mode to track io_wait
 
 0.39 Tue Apr  6 12:35:13 PDT 2010
   * Add support for prefix keys to binary protocol.

diff --git a/configure.ac b/configure.ac
index b6d8b2f380d9b02383eb8ed906c5b9c81c62f4cf..19bc4bb53f8a1096feab19bda5c0344362e3ee0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.39],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.40],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
@@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=4:0:0
+MEMCACHED_LIBRARY_VERSION=5:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |

diff --git a/libmemcached/protocol/ascii_handler.c b/libmemcached/protocol/ascii_handler.c
index c2fd6870d6929a2cc7b1b7c9fa25fcf7b3ceb771..6f5102b00badaf36c87a6b60c7ffe4b76163b49e 100644 (file)
--- a/libmemcached/protocol/ascii_handler.c
+++ b/libmemcached/protocol/ascii_handler.c
@@ -386,7 +386,7 @@ static void process_delete(memcached_protocol_client_st *client,
   else
   {
     char msg[80];
-    snprintf(msg, sizeof(msg), "SERVER_ERROR: delete failed %u\r\n",(int)rval);
+    snprintf(msg, sizeof(msg), "SERVER_ERROR: delete failed %u\r\n",(uint32_t)rval);
     spool_string(client, msg);
   }
 }