Merge Monty

[awesomized/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index 8076877e0ef84074d2e551c724a7aef4520b1e93..ec1014a61b1aa85f955305e676dcca3c35acae88 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -29,6 +29,7 @@ struct memcached_server_st {
   uint8_t minor_version;
   memcached_connection type;
   char *read_ptr;
+  char *cached_server_error;
   size_t read_buffer_length;
   size_t read_data_length;
   size_t write_buffer_offset;
@@ -57,6 +58,12 @@ LIBMEMCACHED_API
 memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, 
                                              size_t key_length, memcached_return *error);
 
+LIBMEMCACHED_API
+const char *memcached_server_error(memcached_server_st *ptr);
+
+LIBMEMCACHED_API
+void memcached_server_error_reset(memcached_server_st *ptr);
+
 /* These should not currently be used by end users */
 /* TODO: Is the above comment valid? If so, how can we unit test these if they
  * aren't exported. If not, we should remove the comment */