Added behavior method around testing of keys.

[m6w6/libmemcached] / lib / memcached_get.c

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 62f142e1815235b84320693064b194ba24186f00..8cc7ce30b04adee6eb7d62555ed9fd90b0c8ecd4 100644 (file)
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -43,6 +43,7 @@ char *memcached_get_by_key(memcached_st *ptr,
   (void)memcached_fetch(ptr, NULL, NULL, 
                         &dummy_length, &dummy_flags, 
                         &dummy_error);
+  WATCHPOINT_ASSERT(dummy_length == 0);
 
   return value;
 }
@@ -74,6 +75,9 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   if (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
+    return MEMCACHED_BAD_KEY_PROVIDED;
+
   if (ptr->flags & MEM_SUPPORT_CAS)
   {
     get_command= "gets ";