Merge.

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0234e8337792e43adaab49618be416811ad3b9c2..6eaf8eeb5c97f632de11378435bb304218385c87 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST = libmemcached.pod\
        memcp.pod\\r
        memcached_delete.pod\\r
        memcached_set.pod\\r
+  memcached_version.pod\\r
        memflush.pod\r
 \r
 man_MANS = libmemcached.3\\r
@@ -77,7 +78,9 @@ man_MANS = libmemcached.3\
        memcached_stat_servername.3\\r
        memcached_strerror.3\\r
        memcached_quit.3\\r
-       memcached_verbosity.3\r
+       memcached_verbosity.3\\r
+       memcached_lib_version.3\\r
+       memcached_version.3\r
 \r
 libmemcached.3: libmemcached.pod \r
        pod2man -c "libmemcached" -r "" -s 3 libmemcached.pod > libmemcached.3\r
@@ -253,6 +256,12 @@ memcached_result_flags.3: memcached_result_st.pod
 memcached_result_cas.3: memcached_result_st.pod\r
        pod2man -c "libmemcached" -r "" -s 3 memcached_result_st.pod > memcached_result_cas.3\r
 \r
+memcached_version.3: memcached_version.pod\r
+       pod2man -c "libmemcached" -r "" -s 3 memcached_version.pod > memcached_version.3\r
+\r
+memcached_lib_version.3: memcached_version.pod\r
+       pod2man -c "libmemcached" -r "" -s 3 memcached_version.pod  > memcached_lib_version.3\r
+\r
 memcp.1: memcp.pod\r
        pod2man -c "libmemcached" -r "" -s 1 memcp.pod > memcp.1\r
 \r
@@ -274,6 +283,7 @@ memerror.1: memerror.pod
 memflush.1: memflush.pod\r
        pod2man -c "libmemcached" -r "" -s 1 memflush.pod > memflush.1\r
 \r
+\r
 clean:\r
        rm -f *.1\r
        rm -f *.3\r

diff --git a/docs/libmemcached.pod b/docs/libmemcached.pod
index c40072f67e03753c8e4bc643dabaeb8742d954fa..6c98bc323474d88723514e9ee4466e4b544e6a3f 100755 (executable)
--- a/docs/libmemcached.pod
+++ b/docs/libmemcached.pod
@@ -81,6 +81,23 @@ This is the "stride" used in the consistent hash used between replicas.
 
 Maximum allowed size of the hostname.
 
+=item MEMCACHED_VERSION_STRING
+
+String value of libmemcached version such as "1.23.4"
+
+=item MEMCACHED_MAJOR_VERSION
+
+Major version value. Such as 1.23.4, would be 1 
+
+=item MEMCACHED_MINOR_VERSION
+
+Major version value. Such as 1.23.4, would be 23 
+
+=item MEMCACHED_MICRO_VERSION
+
+Major version value. Such as 1.23.4, would be 4 
+
+
 =back
 
 

diff --git a/include/memcached.h b/include/memcached.h
index bd97303c4c2b198f5b24172f0eef21811be3eb17..eddc5f3cdd0b8f0857226e69a92ca02ab4dbfa5e 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -31,6 +31,9 @@ extern "C" {
 #define MEMCACHED_STRIDE 4
 #define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
 
+/* string value */
+#define LIBMEMCACHED_VERSION_STRING "0.14"
+
 typedef enum {
   MEMCACHED_SUCCESS,
   MEMCACHED_FAILURE,
@@ -228,6 +231,8 @@ struct memcached_st {
 };
 
 /* Public API */
+const char * memcached_lib_version(void);
+
 memcached_st *memcached_create(memcached_st *ptr);
 void memcached_free(memcached_st *ptr);
 memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr);

diff --git a/lib/memcached.c b/lib/memcached.c
index 31c12ab3158bc52af7665376171816157f27e3c5..5d89e721faf27b5d49e2c4c3a82dba9738c32000 100644 (file)
--- a/lib/memcached.c
+++ b/lib/memcached.c
@@ -60,6 +60,7 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   memcached_return rc= MEMCACHED_SUCCESS;
   memcached_st *new_clone;
 
+  WATCHPOINT;
   if (ptr == NULL)
     return memcached_create(clone);
 
@@ -69,6 +70,7 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
     return NULL;
   }
   
+  WATCHPOINT;
   new_clone= memcached_create(clone);
   
   if (new_clone == NULL)

diff --git a/lib/memcached_version.c b/lib/memcached_version.c
index 7cb65e564c4ce8426ef268bad2e20a8bce80859d..e49d76f0b2e87c8e510ed5e74025f6edc0aa98b8 100644 (file)
--- a/lib/memcached_version.c
+++ b/lib/memcached_version.c
@@ -1,5 +1,10 @@
 #include "common.h"
 
+const char * memcached_lib_version(void) 
+{
+  return LIBMEMCACHED_VERSION_STRING;
+}
+
 memcached_return memcached_version(memcached_st *ptr)
 {
   unsigned int x;

diff --git a/tests/function.c b/tests/function.c
index a6781e26031f467ad3f322a27c4214020f12798c..51b4c74afa83f3f4dc7a624a6413933cc1961cb4 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -889,6 +889,14 @@ uint8_t get_stats_keys(memcached_st *memc)
  return 0;
 }
 
+uint8_t version_string_test(void)
+{
+  const char *version_string;
+  version_string= memcached_lib_version();
+  assert(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING));
+  return 0;
+}
+
 uint8_t get_stats(memcached_st *memc)
 {
  unsigned int x;
@@ -2174,6 +2182,7 @@ test_st tests[] ={
   {"get_stats_keys", 0, get_stats_keys },
   {"behavior_test", 0, get_stats_keys },
   {"callback_test", 0, get_stats_keys },
+  {"version_string_test", 0, version_string_test},
   {0, 0, 0}
 };