Committing for 0.17. Cleanups and one bad WATCHPOINT removed.

diff --git a/ChangeLog b/ChangeLog
index f85969829e1ddb6480c54ee9d496ece0be5d709b..199536b56e77d4b6f925aa692602ed50c0739dc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
-0.17
+0.17 Wed Feb 27 03:33:29 PST 2008
   * MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added for connect timeout in
     non-block mode.
   * Incompatible change in memcached_behavior_set() api. We now use a
     uint64_t, instead of a pointer.
+  * Fix for storage of values for zero.
+  * memcached_server_cursor() function added to API for cycling through servers.
 
 0.16 Mon Feb 18 00:30:25 PST 2008
   * Work on the UDP protocol

diff --git a/include/memcached.h b/include/memcached.h
index 2e3632954d5d98ce18f42698e514fa2963336d79..570404e831f1cd1091a4d2803b268934abdb7026 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -262,7 +262,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
 void memcached_quit(memcached_st *ptr);
 char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data);
-unsigned long long memcached_behavior_get(memcached_st *ptr, memcached_behavior flag);
+uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag);
 
 /* All of the functions for adding data to the server */
 memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, 

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index fb3e6b2bc8027a64658c337e50ec807fe7c36af3..0b5a73e10b3d45a0912f13c52ca47babf5cfdae7 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -57,9 +57,6 @@ static inline memcached_return memcached_send(memcached_st *ptr,
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
-  WATCHPOINT_ASSERT(!(value && value_length == 0));
-
   unlikely (key_length == 0)
     return MEMCACHED_NO_KEY_PROVIDED;