Updating for 0.30

diff --git a/ChangeLog b/ChangeLog
index a097ebb5b30a43a403595482d1aa808dc0c23e8a..70cddaff32d3d2a5611c2e5df5ff676b12492b87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-0.30
-  * Added memcachd_dump command (and framework for memdump tool)
+0.30 Sun May 31 17:31:52 PDT 2009
+  * Added memcachd_dump command (and framework for memdump tool).
   * Realigned all structures to remove padding (and line up important bits for 64bit caches.
   * Remove some of sprintf() in storage calls().
   * Removed printf() in stat call for unknown stat member.

diff --git a/Makefile.am b/Makefile.am
index 3148c62b504c6200ea6ee5f2529371969c4f6739..2ec3051406c6831c2f6230aa605e45f35f934353 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,16 +18,16 @@ test-no-outputdiff:
        @(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
-       rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-       rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+       rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+       rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
        cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
        cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
 generic:
-       rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-       rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+       rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+       rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
        cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
        cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .

diff --git a/configure.ac b/configure.ac
index 44ffda732dc543f955fdbf2aa460753e5bf93876..af6d399efe0efc0da68dd8797e0ecdc43321ea21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libmemcached],[0.29],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.30],[http://tangent.org/552/libmemcached.html])
 AC_CONFIG_SRCDIR([clients/memcat.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(libmemcached/libmemcached_config.h)

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 8c5060212a5548d63550950a40613f0b98cb2da3..7f2b9a3449ab9f532342d6ca77bdda8d1115b97c 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -42,7 +42,7 @@ struct memcached_continuum_item_st {
   uint32_t value;
 };
 
-#define LIBMEMCACHED_VERSION_STRING "0.29"
+#define LIBMEMCACHED_VERSION_STRING "0.30"
 
 struct memcached_analysis_st {
   uint32_t average_item_size;

diff --git a/tests/function.c b/tests/function.c
index e69335ae348f7b2b40024c0a0f58182c057ba2ee..d15c1a0ce16b5b4155a2d3621cee0d048947a341 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -2672,7 +2672,11 @@ static test_return  generate_data_with_stats(memcached_st *memc)
 
   for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
   {
-      printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes);
+    /* This test was changes so that "make test" would work properlly */
+#ifdef DEBUG
+    printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes);
+#endif
+    assert((unsigned long long)(stat_p + host_index)->bytes);
   }
 
   memcached_stat_free(NULL, stat_p);

diff --git a/tests/output.res b/tests/output.res
index 20bd676ffe193a9f8719b7e8ca50d7aea4ed2255..a4db8a5866e725dab541b940314e004a54532721 100644 (file)
--- a/tests/output.res
+++ b/tests/output.res
@@ -671,87 +671,3 @@ Error 33 -> A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
 Error 34 -> THE HOST TRANSPORT PROTOCOL DOES NOT MATCH THAT OF THE CLIENT
 Error 35 -> SERVER IS MARKED DEAD
 Error 36 -> ENCOUNTERED AN UNKNOWN STAT KEY
-Error 0 -> SUCCESS
-Error 1 -> FAILURE
-Error 2 -> HOSTNAME LOOKUP FAILURE
-Error 3 -> CONNECTION FAILURE
-Error 4 -> CONNECTION BIND FAILURE
-Error 5 -> WRITE FAILURE
-Error 6 -> READ FAILURE
-Error 7 -> UNKNOWN READ FAILURE
-Error 8 -> PROTOCOL ERROR
-Error 9 -> CLIENT ERROR
-Error 10 -> SERVER ERROR
-Error 11 -> CONNECTION SOCKET CREATE FAILURE
-Error 12 -> CONNECTION DATA EXISTS
-Error 13 -> CONNECTION DATA DOES NOT EXIST
-Error 14 -> NOT STORED
-Error 15 -> STORED
-Error 16 -> NOT FOUND
-Error 17 -> MEMORY ALLOCATION FAILURE
-Error 18 -> PARTIAL READ
-Error 19 -> SOME ERRORS WERE REPORTED
-Error 20 -> NO SERVERS DEFINED
-Error 21 -> SERVER END
-Error 22 -> SERVER DELETE
-Error 23 -> SERVER VALUE
-Error 24 -> STAT VALUE
-Error 25 -> Gibberish returned!
-Error 26 -> SYSTEM ERROR
-Error 27 -> COULD NOT OPEN UNIX SOCKET
-Error 28 -> ACTION NOT SUPPORTED
-Error 29 -> A KEY LENGTH OF ZERO WAS PROVIDED
-Error 30 -> FETCH WAS NOT COMPLETED
-Error 31 -> A TIMEOUT OCCURRED
-Error 32 -> ACTION QUEUED
-Error 33 -> A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
-Error 34 -> THE HOST TRANSPORT PROTOCOL DOES NOT MATCH THAT OF THE CLIENT
-Error 35 -> SERVER IS MARKED DEAD
-Error 36 -> ENCOUNTERED AN UNKNOWN STAT KEY
-Error 0 -> SUCCESS
-Error 1 -> FAILURE
-Error 2 -> HOSTNAME LOOKUP FAILURE
-Error 3 -> CONNECTION FAILURE
-Error 4 -> CONNECTION BIND FAILURE
-Error 5 -> WRITE FAILURE
-Error 6 -> READ FAILURE
-Error 7 -> UNKNOWN READ FAILURE
-Error 8 -> PROTOCOL ERROR
-Error 9 -> CLIENT ERROR
-Error 10 -> SERVER ERROR
-Error 11 -> CONNECTION SOCKET CREATE FAILURE
-Error 12 -> CONNECTION DATA EXISTS
-Error 13 -> CONNECTION DATA DOES NOT EXIST
-Error 14 -> NOT STORED
-Error 15 -> STORED
-Error 16 -> NOT FOUND
-Error 17 -> MEMORY ALLOCATION FAILURE
-Error 18 -> PARTIAL READ
-Error 19 -> SOME ERRORS WERE REPORTED
-Error 20 -> NO SERVERS DEFINED
-Error 21 -> SERVER END
-Error 22 -> SERVER DELETE
-Error 23 -> SERVER VALUE
-Error 24 -> STAT VALUE
-Error 25 -> Gibberish returned!
-Error 26 -> SYSTEM ERROR
-Error 27 -> COULD NOT OPEN UNIX SOCKET
-Error 28 -> ACTION NOT SUPPORTED
-Error 29 -> A KEY LENGTH OF ZERO WAS PROVIDED
-Error 30 -> FETCH WAS NOT COMPLETED
-Error 31 -> A TIMEOUT OCCURRED
-Error 32 -> ACTION QUEUED
-Error 33 -> A BAD KEY WAS PROVIDED/CHARACTERS OUT OF RANGE
-Error 34 -> THE HOST TRANSPORT PROTOCOL DOES NOT MATCH THAT OF THE CLIENT
-Error 35 -> SERVER IS MARKED DEAD
-Error 36 -> ENCOUNTERED AN UNKNOWN STAT KEY
-
-server 0|localhost|11221 bytes: 8443754
-
-server 1|localhost|11222 bytes: 10067459
-
-server 2|localhost|11223 bytes: 10454288
-
-server 3|localhost|11224 bytes: 9560669
-
-server 4|localhost|11225 bytes: 7411880