Merge Trond

diff --git a/ChangeLog b/ChangeLog
index 0da08589c1b17937324c56b87e37f177efe5ca33..6adbc886708540a2ad6f829bb83f4d06db6b99fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+  * Update C++ interface.
+  * Fix for memcp
+
 0.34 Tue Oct 13 08:39:51 PDT 2009
   * Added support for setting behavior flags on a connection pool.
   * Don't increment server_failure_counter on normal disconnects.

diff --git a/clients/memcp.c b/clients/memcp.c
index 716bfefd03482e94c40d8b881260e598c2d55206..dcc142da8456d99a14a4a78f3002296a1c673bae 100644 (file)
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -222,6 +222,7 @@ void options_parse(int argc, char *argv[])
       break;
     case OPT_ADD:
       opt_method= OPT_ADD;
+      break;
     case OPT_HASH:
       opt_hash= strdup(optarg);
       break;