Merge lp:~brianaker/libmemcached/1220444 into lp:libmemcached

[Brian Aker]

=== modified file '.bzrignore'
=== modified file 'bootstrap.sh'
--- bootstrap.sh	2013-06-13 22:13:53 +0000
+++ bootstrap.sh	2013-10-11 06:45:05 +0000
@@ -421,7 +421,11 @@
   # If we are executing on OSX use CLANG, otherwise only use it if we find it in the ENV
   case $HOST_OS in
     *-darwin-*)
+<<<<<<< TREE
       run CC=clang CXX=clang++ $top_srcdir/configure "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=clang CXX=clang++ configure $BUILD_CONFIGURE_ARG"
+=======
+      run CC=clang CXX=clang++ $CONFIGURE "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=clang CXX=clang++ configure $BUILD_CONFIGURE_ARG"
+>>>>>>> MERGE-SOURCE
       ret=$?
       ;;
     rhel-5*)
@@ -793,18 +797,14 @@
 
   CC=clang CXX=clang++
   export CC CXX
+  CONFIGURE='scan-build ./configure'
   CONFIGURE_ARGS='--enable-debug'
 
-  make_skeleton
-  ret=$?
-
-  make_target 'clean' 'warn'
+  run_configure
 
   scan-build -o clang-html make -j4 -k
 
   restore_BUILD
-
-  return $ret
 }
 
 # If we are locally testing, we should make sure the environment is setup correctly
@@ -1010,6 +1010,9 @@
 {
   if command_exists 'rpmbuild'; then
     if [ -f 'rpm.am' -o -d 'rpm' ]; then
+      mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+      mkdir -p ~/rpmbuild/RPMS/{i386,i486,i586,i686,noarch,athlon}
+
       run_configure_if_required
       make_target 'rpm'
 
@@ -1507,6 +1510,9 @@
 
 execute_job ()
 {
+  # We should always have a target by this point
+  assert MAKE_TARGET
+
   determine_target_platform
 
   determine_vcs
@@ -1518,11 +1524,15 @@
     return 1
   fi
 
+<<<<<<< TREE
   if [ -z "$MAKE_TARGET" ]; then
     MAKE_TARGET="make_default"
   fi
 
   if $print_setup_opt -o  $debug; then
+=======
+  if $print_setup_opt -o  $debug; then
+>>>>>>> MERGE-SOURCE
     echo 
     print_setup
     echo 
@@ -1541,15 +1551,21 @@
     PREFIX_ARG="--prefix=$PREFIX"
   fi
 
-  # We should always have a target by this point
-  assert MAKE_TARGET
-
-  if $CLEAN_OPTION; then
-    make_maintainer_clean
-  fi
-
-  local MAKE_TARGET_ARRAY
-  MAKE_TARGET_ARRAY=( $MAKE_TARGET )
+  if $CLEAN_OPTION; then
+    make_maintainer_clean
+  fi
+
+<<<<<<< TREE
+  if $CLEAN_OPTION; then
+    make_maintainer_clean
+  fi
+
+  local MAKE_TARGET_ARRAY
+  MAKE_TARGET_ARRAY=( $MAKE_TARGET )
+=======
+  local MAKE_TARGET_ARRAY
+  MAKE_TARGET_ARRAY=( $MAKE_TARGET )
+>>>>>>> MERGE-SOURCE
 
   for target in "${MAKE_TARGET_ARRAY[@]}"
   do
@@ -1762,8 +1778,20 @@
     fi
   fi
 
-  execute_job
-  local ret=$?
+<<<<<<< TREE
+  execute_job
+  local ret=$?
+=======
+  if [ -z "$MAKE_TARGET" ]; then
+    MAKE_TARGET="make_default"
+  fi
+
+  # We should always have a target by this point
+  assert MAKE_TARGET
+
+  execute_job
+  local ret=$?
+>>>>>>> MERGE-SOURCE
 
   jobs -l
   wait
 
=== modified file 'clients/generator.cc'
--- clients/generator.cc	2013-01-08 01:03:28 +0000
+++ clients/generator.cc	2013-10-11 06:45:05 +0000
@@ -22,6 +22,8 @@
 
 #include "clients/generator.h"
 
+#define KEY_BYTES 20
+
 /* Use this for string generation */
 static const char ALPHANUMERICS[]=
   "0123456789ABCDEFGHIJKLMNOPQRSTWXYZabcdefghijklmnopqrstuvwxyz";
@@ -75,13 +77,13 @@
 
   for (uint64_t x= 0; x < number_of; x++)
   {
-    pairs[x].key= (char *)calloc(100, sizeof(char));
+    pairs[x].key= (char *)calloc(KEY_BYTES, sizeof(char));
 
     if (pairs[x].key == NULL)
       goto error;
 
-    get_random_string(pairs[x].key, 100);
-    pairs[x].key_length= 100;
+    get_random_string(pairs[x].key, KEY_BYTES);
+    pairs[x].key_length= KEY_BYTES;
 
     if (value_length)
     {
 
=== modified file 'clients/memcp.cc'
--- clients/memcp.cc	2013-06-11 12:31:47 +0000
+++ clients/memcp.cc	2013-10-11 06:45:05 +0000
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
 
=== modified file 'clients/memslap.cc'
--- clients/memslap.cc	2013-04-03 13:14:23 +0000
+++ clients/memslap.cc	2013-10-11 06:45:05 +0000
@@ -66,6 +66,8 @@
 #define DEFAULT_EXECUTE_NUMBER 10000
 #define DEFAULT_CONCURRENCY 1
 
+#define VALUE_BYTES 4096
+
 #define PROGRAM_NAME "memslap"
 #define PROGRAM_DESCRIPTION "Generates a load against a memcached custer of servers."
 
@@ -336,7 +338,7 @@
 
     if (opt_test == SET_TEST)
     {
-      context->execute_pairs= pairs_generate(opt_execute_number, 400);
+      context->execute_pairs= pairs_generate(opt_execute_number, VALUE_BYTES);
       context->execute_number= opt_execute_number;
     }
 
@@ -432,7 +434,7 @@
       break;
 
     case OPT_DEBUG: /* --debug or -d */
-      opt_verbose = OPT_DEBUG;
+      opt_verbose= OPT_DEBUG;
       break;
 
     case OPT_VERSION: /* --version or -V */
@@ -566,7 +568,7 @@
   /* We always used non-blocking IO for load since it is faster */
   memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
 
-  pairs_st *pairs= pairs_generate(number_of, 400);
+  pairs_st *pairs= pairs_generate(number_of, VALUE_BYTES);
   *actual_loaded= execute_set(memc_clone, pairs, number_of);
 
   memcached_free(memc_clone);
 
=== modified file 'libmemcached/io.cc'
--- libmemcached/io.cc	2013-03-31 23:24:29 +0000
+++ libmemcached/io.cc	2013-10-11 06:45:05 +0000
@@ -99,7 +99,7 @@
           case EWOULDBLOCK:
 #endif
           case EAGAIN:
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
           case ERESTART:
 #endif
             break; // No IO is fine, we can just move on
@@ -265,7 +265,7 @@
     assert_msg(active_fd == -1 , "poll() returned an unexpected value");
     switch (local_errno)
     {
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
     case ERESTART:
 #endif
     case EINTR:
@@ -430,7 +430,7 @@
       case EWOULDBLOCK:
 #endif
       case EAGAIN:
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
       case ERESTART:
 #endif
         {
@@ -568,7 +568,7 @@
       case EWOULDBLOCK:
 #endif
       case EAGAIN:
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
       case ERESTART:
 #endif
         if (memcached_success(io_wait(instance, MEM_READ)))
 
=== modified file 'libmemcached/string.cc'
--- libmemcached/string.cc	2013-01-23 21:28:45 +0000
+++ libmemcached/string.cc	2013-10-11 06:45:05 +0000
@@ -281,18 +281,20 @@
 {
   char* value= NULL;
 
-  if (memcached_string_length(self))
+  assert_msg(self, "Invalid memcached_string_st");
+  if (self)
   {
-    assert_msg(self, "Invalid memcached_string_st");
-    // If we fail at adding the null, we copy and move on
-    if (memcached_success(memcached_string_append_null(self)))
+    if (memcached_string_length(self))
     {
-      return memcached_string_c_copy(self);
+      // If we fail at adding the null, we copy and move on
+      if (memcached_failed(memcached_string_append_null(self)))
+      {
+        return NULL;
+      }
+
+      value= self->string;
+      _init_string(self);
     }
-
-    value= self->string;
-
-    _init_string(self);
   }
 
   return value;
 
=== modified file 'libtest/cmdline.cc'
--- libtest/cmdline.cc	2013-06-12 07:11:22 +0000
+++ libtest/cmdline.cc	2013-10-11 06:45:05 +0000
@@ -359,7 +359,7 @@
     int error;
     switch ((error= errno))
     {
-#ifdef TARGET_OS_LINUX
+#ifdef __linux
     case ERESTART:
 #endif
     case EINTR:
 
=== modified file 'libtest/core.cc'
--- libtest/core.cc	2012-12-09 11:40:11 +0000
+++ libtest/core.cc	2013-10-11 06:45:05 +0000
@@ -42,8 +42,8 @@
 
 void create_core(void)
 {
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
-  if (TARGET_OS_OSX)
+#if defined(__APPLE__) && __APPLE__
+  if (__APPLE__)
   {
     return;
   }
 
=== modified file 'libtest/cpu.cc'
--- libtest/cpu.cc	2013-06-12 07:11:22 +0000
+++ libtest/cpu.cc	2013-10-11 06:45:05 +0000
@@ -52,8 +52,13 @@
 
 uint32_t number_of_cpus()
 {
+<<<<<<< TREE
   uint32_t number_of_cpu= 1;
 #ifdef linux 
+=======
+  size_t number_of_cpu= 1;
+#if defined(__linux) && __linux
+>>>>>>> MERGE-SOURCE
   number_of_cpu= sysconf(_SC_NPROCESSORS_ONLN);
 #elif defined(HAVE_SYS_SYSCTL_H) && defined(CTL_HW) && defined(HW_NCPU) && defined(HW_AVAILCPU) && defined(HW_NCPU)
   int mib[4];
 
=== modified file 'libtest/main.cc'
--- libtest/main.cc	2013-06-12 07:11:22 +0000
+++ libtest/main.cc	2013-10-11 06:45:05 +0000
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -45,6 +45,13 @@
 #include <fnmatch.h>
 #include <fstream>
 #include <iostream>
+<<<<<<< TREE
+=======
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <fstream>
+>>>>>>> MERGE-SOURCE
 #include <memory>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -113,7 +120,7 @@
     Valgrind does not currently work reliably, or sometimes at all, on OSX
     - Fri Jun 15 11:24:07 EDT 2012
   */
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+#if defined(__APPLE__) && __APPLE__
   if (valgrind_is_caller())
   {
     return EXIT_SKIP;
 
=== modified file 'libtest/unittest.cc'
--- libtest/unittest.cc	2013-06-12 07:11:22 +0000
+++ libtest/unittest.cc	2013-10-11 06:45:05 +0000
@@ -657,7 +657,7 @@
   const char *args[]= { "--fubar", 0 };
 #if defined(__APPLE__) && __APPLE__
   ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
-#elif defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
+#elif defined(__FreeBSD__) && __FreeBSD__
   ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
 #else
   ASSERT_EQ(Application::SUCCESS, true_app.run(args));
@@ -855,8 +855,8 @@
 static test_return_t gdb_wait_services_appliction_TEST(void *)
 {
   test_skip(true, false);
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
-  test_skip(0, TARGET_OS_OSX);
+#if defined(__APPLE__) && __APPLE__
+  test_skip(0, __APPLE__);
 #endif
 
   test_skip(0, access("/etc/services", R_OK ));
@@ -879,8 +879,8 @@
   test_skip(0, access("libtest/abort", X_OK ));
   test_skip(true, false);
 
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
-  test_skip(0, TARGET_OS_OSX);
+#if defined(__APPLE__) && __APPLE__
+  test_skip(0, __APPLE__);
 #endif
 
   libtest::Application abort_app("libtest/abort", true);
 
=== modified file 'm4/ax_debug.m4'
--- m4/ax_debug.m4	2013-01-08 01:03:28 +0000
+++ m4/ax_debug.m4	2013-10-11 06:45:05 +0000
@@ -43,7 +43,7 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 5
+#serial 6
 
 AC_DEFUN([AX_DEBUG],
     [AC_PREREQ([2.63])dnl
@@ -52,7 +52,9 @@
         [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
       [ax_enable_debug=yes
       AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
-      AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])],
+      AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
+      AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
+      AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
       [ax_enable_debug=no
       AC_SUBST([MCHECK])
       AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
 
=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2013-10-01 23:52:41 +0000
+++ m4/ax_harden_compiler_flags.m4	2013-10-11 06:45:05 +0000
@@ -53,6 +53,7 @@
 # -Wdeclaration-after-statement is counter to C99
 # _APPEND_COMPILE_FLAGS_ERROR([-pedantic])
 
+<<<<<<< TREE
 #serial 12
 
 AC_DEFUN([_SET_SANITIZE_FLAGS],
@@ -86,6 +87,41 @@
                       ])
                 ])
           ])
+=======
+#serial 13
+
+AC_DEFUN([_SET_SANITIZE_FLAGS],
+         [AS_IF([test "x$MINGW" != xyes],[
+                AS_IF([test "x$enable_shared" = "xyes"],
+                      [AS_CASE([$ax_harden_sanitize],
+                               [thread],[
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])],
+                               [address],[
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])],
+                               [rest],[
+                               _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])])
+                      ])
+                ])
+          ])
+>>>>>>> MERGE-SOURCE
 
 AC_DEFUN([_WARNINGS_AS_ERRORS],
     [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
 
=== modified file 'm4/ax_memcached.m4'
--- m4/ax_memcached.m4	2013-04-29 15:24:05 +0000
+++ m4/ax_memcached.m4	2013-10-11 06:45:05 +0000
@@ -44,26 +44,15 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 4
+#serial 3
 
 AC_DEFUN([AX_PROG_MEMCACHED],
-         [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown])
-         ax_memcached_success=
-         AS_IF([test x"$MEMCACHED_BINARY" != xunknown],
-               [AS_IF([test -x "$MEMCACHED_BINARY"],
-                      [ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'`
-                      AS_IF([test -n "$ax_memcached_version"],
-                            [ax_memcached_success='ok'
-                            AC_MSG_RESULT([memcached version "$ax_memcached_version"])
-                            AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])])
-                      ])
-               ])
-
-         AS_IF([test -n "$ax_memcached_success"], 
-               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
-               AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test])
-               ],
-               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available])
-               MEMCACHED_BINARY=
-               ])
-         ])
+    [AX_WITH_PROG([MEMCACHED_BINARY],[memcached])
+    AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
+      [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
+      AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test])
+      ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'`
+      AC_MSG_RESULT([memcached version "$ax_memcached_version"])
+      AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])
+      ])
+    ])
 
=== modified file 'm4/hiredis.m4'
--- m4/hiredis.m4	2012-09-05 05:20:56 +0000
+++ m4/hiredis.m4	2013-10-11 06:45:05 +0000
@@ -1,34 +1,26 @@
-dnl  Copyright (C) 2011 Brian Aker ([e-mail])
-
-AC_DEFUN([_SEARCH_LIBHIREDIS],[
-  AC_REQUIRE([AX_CHECK_LIBRARY])
-
-  AS_IF([test "x$ac_enable_hires" = "xyes"],[
-        AX_CHECK_LIBRARY([LIBHIREDIS], [hiredis/hiredis.h], [hiredis],
-                         [
-                         LIBHIREDIS_LDFLAGS="-lhiredis"
-                         AC_DEFINE([HAVE_HIREDIS], [1], [If Hiredis available])
-                         ],
-                         [
-                         AC_DEFINE([HAVE_HIREDIS], [0], [If Hiredis is available])
-                         ac_enable_hires="no"
-                         ])
-
-        ],
-        [
-        AC_DEFINE([HAVE_HIREDIS], [0], [If Hiredis is available])
-        ])
-
-  AM_CONDITIONAL(HAVE_HIREDIS, [test "x$ac_cv_lib_hiredis_main" = "xyes"])
-  ])
-
-AC_DEFUN([AX_HAVE_LIBHIREDIS],[
-
-  AC_ARG_ENABLE([hires],
-    [AS_HELP_STRING([--disable-hires],
-      [Build with hires support @<:@default=on@:>@])],
-    [ac_enable_hires="$enableval"],
-    [ac_enable_hires="yes"])
-
-  _SEARCH_LIBHIREDIS
-])
+#  Copyright (C) 2011 Brian Aker ([e-mail])
+#
+# serial 2
+
+AC_DEFUN([_SEARCH_HIREDIS],
+    [AC_REQUIRE([AX_CHECK_LIBRARY])
+
+    AS_IF([test "x$ac_enable_hiredis" = "xyes"],
+      [hiredis_header="hiredis/hiredis.h"],
+      [hiredis_header="does_not_exist"])
+
+    AX_CHECK_LIBRARY([HIREDIS],[$hiredis_header],[hiredis],,
+                     [AC_DEFINE([HAVE_HIREDIS],[0],[Define to 1 if HIREDIS is found])])
+
+    AS_IF([test "x$ax_cv_have_HIREDIS" = xno],[ac_enable_hiredis="no"])
+    ])
+
+  AC_DEFUN([AX_ENABLE_LIBHIREDIS],
+      [AC_ARG_ENABLE([hiredis],
+        [AS_HELP_STRING([--disable-hiredis],
+          [Build with hiredis support @<:@default=on@:>@])],
+        [ac_enable_hiredis="$enableval"],
+        [ac_enable_hiredis="yes"])
+
+      _SEARCH_HIREDIS
+      ])
 
=== modified file 'tests/libmemcached-1.0/plus.cpp'
--- tests/libmemcached-1.0/plus.cpp	2013-04-03 13:14:23 +0000
+++ tests/libmemcached-1.0/plus.cpp	2013-10-11 06:45:05 +0000
@@ -181,6 +181,13 @@
   vector<char> return_value;
 
   /* We need to empty the server before we continue the test */
+  bool flush_res= memc.flush();
+  if (flush_res == false)
+  {
+    std::string error_string;
+    ASSERT_TRUE(memc.error(error_string));
+    Error << error_string;
+  }
   test_true(memc.flush());
 
   test_true(memc.mget(keys));
 
=== modified file 'tests/memcat.cc'
--- tests/memcat.cc	2013-01-28 22:51:05 +0000
+++ tests/memcat.cc	2013-10-11 06:45:05 +0000
@@ -64,10 +64,10 @@
 static test_return_t cat_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
   const char *args[]= { buffer, "foo", 0 };
 
-  memcached_st *memc= memcached(buffer, strlen(buffer));
+  memcached_st *memc= memcached(buffer, length);
   test_true(memc);
 
   test_compare(MEMCACHED_SUCCESS,
@@ -77,6 +77,7 @@
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
   test_compare(MEMCACHED_SUCCESS, rc);
 
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
@@ -90,11 +91,11 @@
 static test_return_t NOT_FOUND_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
   const char *args[]= { buffer, "foo", 0 };
 
-  memcached_st *memc= memcached(buffer, strlen(buffer));
-  test_true(memc);
+  memcached_st *memc= memcached(buffer, length);
+  ASSERT_TRUE(memc);
 
   test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0));
 
@@ -102,6 +103,7 @@
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
   test_compare(MEMCACHED_NOTFOUND, rc);
 
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
 
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
 
=== modified file 'tests/memcp.cc'
--- tests/memcp.cc	2013-06-12 07:11:22 +0000
+++ tests/memcp.cc	2013-10-11 06:45:05 +0000
@@ -63,6 +63,7 @@
   return TEST_SUCCESS;
 }
 
+#if 0
 static test_return_t server_test(void *)
 {
   int fd;
@@ -82,10 +83,13 @@
 
   return TEST_SUCCESS;
 }
+#endif
 
 test_st memcp_tests[] ={
   {"--help", true, help_test },
+#if 0
   {"--server_test", true, server_test },
+#endif
   {0, 0, 0}
 };
 
 
=== modified file 'tests/memdump.cc'
--- tests/memdump.cc	2013-01-28 22:51:05 +0000
+++ tests/memdump.cc	2013-10-11 06:45:05 +0000
@@ -75,10 +75,10 @@
 static test_return_t FOUND_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
   const char *args[]= { buffer, 0 };
 
-  memcached_st *memc= memcached(buffer, strlen(buffer));
+  memcached_st *memc= memcached(buffer, length);
   test_true(memc);
 
   test_compare(MEMCACHED_SUCCESS,
@@ -91,6 +91,7 @@
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
   test_compare(MEMCACHED_SUCCESS, rc);
 
+  length= snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
   memcached_free(memc);
 
=== modified file 'tests/memexist.cc'
--- tests/memexist.cc	2013-01-28 22:51:05 +0000
+++ tests/memexist.cc	2013-10-11 06:45:05 +0000
@@ -64,10 +64,10 @@
 static test_return_t exist_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
   const char *args[]= { buffer, "foo", 0 };
 
-  memcached_st *memc= memcached(buffer, strlen(buffer));
+  memcached_st *memc= memcached(buffer, length);
   test_true(memc);
 
   test_compare(MEMCACHED_SUCCESS,
@@ -90,11 +90,11 @@
 static test_return_t NOT_FOUND_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
   const char *args[]= { buffer, "foo", 0 };
 
-  memcached_st *memc= memcached(buffer, strlen(buffer));
-  test_true(memc);
+  memcached_st *memc= memcached(buffer, length);
+  ASSERT_TRUE(memc);
 
   test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0));
 
@@ -115,9 +115,9 @@
 static test_return_t check_version(void*)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  memcached_st *memc= memcached(buffer, strlen(buffer));
-  test_true(memc);
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  memcached_st *memc= memcached(buffer, length);
+  ASSERT_TRUE(memc);
   
   test_return_t result= TEST_SUCCESS;
   if (libmemcached_util_version_check(memc, 1, 4, 8) == false)
 
=== modified file 'tests/memping.cc'
--- tests/memping.cc	2013-04-03 13:14:23 +0000
+++ tests/memping.cc	2013-10-11 06:45:05 +0000
@@ -64,7 +64,7 @@
 static test_return_t ping_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   const char *args[]= { buffer, 0 };
 
   test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
@@ -75,7 +75,7 @@
 static test_return_t NOT_FOUND_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=nonexist.libmemcached.org:%d", int(default_port()));
+  snprintf(buffer, sizeof(buffer), "--servers=nonexist.libmemcached.org:%d", int(default_port()));
   const char *args[]= { buffer, 0 };
 
   test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
 
=== modified file 'tests/memrm.cc'
--- tests/memrm.cc	2013-01-28 22:51:05 +0000
+++ tests/memrm.cc	2013-10-11 06:45:05 +0000
@@ -84,6 +84,8 @@
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
   test_compare(MEMCACHED_SUCCESS, rc);
 
+  char memrm_buffer[1024];
+  snprintf(memrm_buffer, sizeof(memrm_buffer), "--servers=localhost:%d", int(default_port()));
   const char *args[]= { buffer, "foo", 0 };
   test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
@@ -121,7 +123,7 @@
 static test_return_t multiple_NOT_FOUND_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   const char *args[]= { buffer, "protocols", "foo", "mine", "bar", "dog", "cat", "foo", "mine",
     "eye", "for", "the", "to", "not", "know", "what", "I", "should", "be", "doing", 0 };
 
 
=== modified file 'tests/memtouch.cc'
--- tests/memtouch.cc	2013-01-28 22:51:05 +0000
+++ tests/memtouch.cc	2013-10-11 06:45:05 +0000
@@ -65,9 +65,9 @@
 static test_return_t touch_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
 
-  memcached_st *memc= memcached(buffer, strlen(buffer));
+  memcached_st *memc= memcached(buffer, length);
   test_true(memc);
 
   test_compare(MEMCACHED_SUCCESS,
@@ -89,15 +89,15 @@
 static test_return_t NOT_FOUND_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  memcached_st *memc= memcached(buffer, strlen(buffer));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  memcached_st *memc= memcached(buffer, length);
   test_true(memc);
 
   test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0));
 
   test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
 
-  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+  length= snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   const char *args[]= { "--expire=30", buffer, "foo", 0 };
   test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
 
@@ -111,8 +111,8 @@
 static test_return_t check_version(void*)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  memcached_st *memc= memcached(buffer, strlen(buffer));
+  int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
+  memcached_st *memc= memcached(buffer, length);
   test_true(memc);
   
   test_return_t result= TEST_SUCCESS;