Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[awesomized/libmemcached] / libmemcached / namespace.cc

diff --git a/libmemcached/namespace.cc b/libmemcached/namespace.cc
index 372af2a927b88f55f1aec9da6681d8703551e270..8278dd56337606cfa8dad3d4a803bd62ecf626ca 100644 (file)
--- a/libmemcached/namespace.cc
+++ b/libmemcached/namespace.cc
@@ -58,7 +58,7 @@ memcached_return_t memcached_set_namespace(memcached_st *self, const char *key,
     if (memcached_failed(memcached_key_test(*self, (const char **)&key, &key_length, 1)))
     {
       self->flags.verify_key= orig;
-      return memcached_set_error(*self, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT);
+      return memcached_last_error(self);
     }
     self->flags.verify_key= orig;
 
@@ -83,3 +83,11 @@ memcached_return_t memcached_set_namespace(memcached_st *self, const char *key,
 
   return MEMCACHED_SUCCESS;
 }
+
+const char * memcached_get_namespace(memcached_st *self)
+{
+  if (not self->_namespace)
+    return NULL;
+
+  return memcached_array_string(self->_namespace);
+}