-diff -urN --exclude *.m4 memcached-1.4.4/Makefile.am repcached-2.2-1.4.4/Makefile.am
--- memcached-1.4.4/Makefile.am Fri Oct 30 04:24:52 2009
+++ repcached-2.2-1.4.4/Makefile.am Tue Feb 9 23:02:45 2010
@@ -31,6 +31,10 @@
memcached_debug_SOURCES = $(memcached_SOURCES)
memcached_CPPFLAGS = -DNDEBUG
memcached_debug_LDADD = @PROFILER_LDFLAGS@
-diff -urN --exclude *.m4 memcached-1.4.4/Makefile.in repcached-2.2-1.4.4/Makefile.in
-diff -urN --exclude *.m4 memcached-1.4.4/assoc.c repcached-2.2-1.4.4/assoc.c
--- memcached-1.4.4/assoc.c Sat Oct 24 00:38:01 2009
+++ repcached-2.2-1.4.4/assoc.c Tue Feb 9 23:02:45 2010
@@ -258,3 +258,51 @@
+ return(b);
+}
+#endif /* USE_REPLICATION */
-diff -urN --exclude *.m4 memcached-1.4.4/assoc.h repcached-2.2-1.4.4/assoc.h
--- memcached-1.4.4/assoc.h Sun Aug 30 03:00:58 2009
+++ repcached-2.2-1.4.4/assoc.h Tue Feb 9 23:02:45 2010
@@ -7,3 +7,6 @@
+#ifdef USE_REPLICATION
+char *assoc_key_snap(int *n);
+#endif /*USE_REPLICATION*/
-diff -urN --exclude *.m4 memcached-1.4.4/config.guess repcached-2.2-1.4.4/config.guess
-diff -urN --exclude *.m4 memcached-1.4.4/config.h.in repcached-2.2-1.4.4/config.h.in
--- memcached-1.4.4/config.h.in Fri Nov 27 09:34:56 2009
+++ repcached-2.2-1.4.4/config.h.in Wed Feb 10 19:12:46 2010
@@ -99,6 +99,9 @@
/* Version number of package */
#undef VERSION
-diff -urN --exclude *.m4 memcached-1.4.4/config.sub repcached-2.2-1.4.4/config.sub
-diff -urN --exclude *.m4 memcached-1.4.4/configure repcached-2.2-1.4.4/configure
-diff -urN --exclude *.m4 memcached-1.4.4/configure.ac repcached-2.2-1.4.4/configure.ac
--- memcached-1.4.4/configure.ac Wed Nov 25 03:40:29 2009
+++ repcached-2.2-1.4.4/configure.ac Tue Feb 9 23:02:45 2010
@@ -382,6 +382,18 @@
AC_CHECK_FUNCS(mlockall)
AC_CHECK_FUNCS(getpagesizes)
AC_CHECK_FUNCS(memcntl)
-diff -urN --exclude *.m4 memcached-1.4.4/doc/Makefile repcached-2.2-1.4.4/doc/Makefile
-diff -urN --exclude *.m4 memcached-1.4.4/items.c repcached-2.2-1.4.4/items.c
--- memcached-1.4.4/items.c Sat Oct 24 00:38:01 2009
+++ repcached-2.2-1.4.4/items.c Tue Feb 9 23:02:45 2010
@@ -155,6 +155,9 @@
item_link_q(it);
-diff -urN --exclude *.m4 memcached-1.4.4/memcached.c repcached-2.2-1.4.4/memcached.c
--- memcached-1.4.4/memcached.c Fri Nov 27 08:45:13 2009
+++ repcached-2.2-1.4.4/memcached.c Wed Feb 10 16:08:37 2010
@@ -102,6 +102,30 @@
+ return(0);
+}
+#endif /* USE_REPLICATION */
-diff -urN --exclude *.m4 memcached-1.4.4/memcached.h repcached-2.2-1.4.4/memcached.h
---- memcached-1.4.4/memcached.h Thu Nov 26 03:37:49 2009
-+++ repcached-2.2-1.4.4/memcached.h Tue Feb 9 23:02:45 2010
+--- memcached-1.4.5/memcached.h~ 2010-05-06 14:09:51.000000000 +0300
++++ memcached-1.4.5/memcached.h 2010-05-06 14:10:13.518051741 +0300
@@ -144,7 +144,13 @@
conn_swallow, /**< swallowing unnecessary bytes w/o storing */
conn_closing, /**< closing this connection */
};
enum bin_substates {
-@@ -240,7 +246,9 @@
- uint64_t get_hits;
+@@ -247,7 +247,9 @@
uint64_t get_misses;
uint64_t evictions;
+ uint64_t reclaimed;
+#if 0
time_t started; /* when the process was started */
+#endif
/*
* Functions such as the libevent-related calls that need to do cross-thread
-diff -urN --exclude *.m4 memcached-1.4.4/memcached.spec repcached-2.2-1.4.4/memcached.spec
-diff -urN --exclude *.m4 memcached-1.4.4/replication.c repcached-2.2-1.4.4/replication.c
--- memcached-1.4.4/replication.c Thu Jan 1 03:00:00 1970
+++ repcached-2.2-1.4.4/replication.c Wed Feb 10 18:40:48 2010
@@ -0,0 +1,355 @@
+ return(0);
+ }
+}
-diff -urN --exclude *.m4 memcached-1.4.4/replication.h repcached-2.2-1.4.4/replication.h
--- memcached-1.4.4/replication.h Thu Jan 1 03:00:00 1970
+++ repcached-2.2-1.4.4/replication.h Wed Feb 10 18:40:31 2010
@@ -0,0 +1,42 @@
+int replication(enum CMD_TYPE type, R_CMD *cmd);
+
+#endif
-diff -urN --exclude *.m4 memcached-1.4.4/t/binary.t repcached-2.2-1.4.4/t/binary.t
---- memcached-1.4.4/t/binary.t Fri Nov 27 08:05:16 2009
-+++ repcached-2.2-1.4.4/t/binary.t Wed Feb 10 17:04:01 2010
-@@ -2,10 +2,12 @@
+--- memcached-1.4.5/t/binary.t~ 2010-04-03 10:07:16.000000000 +0300
++++ memcached-1.4.5/t/binary.t 2010-05-06 14:13:25.718440750 +0300
+@@ -2,11 +2,13 @@
use strict;
use warnings;
--use Test::More tests => 3349;
+-use Test::More tests => 3361;
+use Test::More;
use FindBin qw($Bin);
use lib "$Bin/lib";
use MemcachedTest;
-+
-+Test::More::plan(tests => support_replication() ? 3385 : 3349);
++Test::More::plan(tests => 3361 + (support_replication() ? 36 : 0));
++
my $server = new_memcached();
ok($server, "started the server");
-diff -urN --exclude *.m4 memcached-1.4.4/t/issue_67.t repcached-2.2-1.4.4/t/issue_67.t
+
--- memcached-1.4.4/t/issue_67.t Sun Nov 1 01:44:09 2009
+++ repcached-2.2-1.4.4/t/issue_67.t Wed Feb 10 17:50:12 2010
@@ -41,6 +41,10 @@
my $childpid = fork();
my $cmd = "$builddir/timedrun 10 $exe $args";
-diff -urN --exclude *.m4 memcached-1.4.4/t/lib/MemcachedTest.pm repcached-2.2-1.4.4/t/lib/MemcachedTest.pm
--- memcached-1.4.4/t/lib/MemcachedTest.pm Fri Oct 30 04:24:52 2009
+++ repcached-2.2-1.4.4/t/lib/MemcachedTest.pm Wed Feb 10 17:53:34 2010
@@ -13,7 +13,8 @@
}
my $childpid = fork();
-diff -urN --exclude *.m4 memcached-1.4.4/t/stats.t repcached-2.2-1.4.4/t/stats.t
---- memcached-1.4.4/t/stats.t Thu Nov 26 03:37:49 2009
-+++ repcached-2.2-1.4.4/t/stats.t Tue Feb 9 23:13:26 2010
-@@ -56,7 +56,11 @@
+--- memcached-1.4.5/t/stats.t~ 2010-04-03 10:07:16.000000000 +0300
++++ memcached-1.4.5/t/stats.t 2010-05-06 14:15:28.521352735 +0300
+@@ -57,7 +57,8 @@
my $stats = mem_stats($sock);
# Test number of keys
--is(scalar(keys(%$stats)), 37, "37 stats values");
-+if (! support_replication()) {
-+ is(scalar(keys(%$stats)), 37, "37 stats values");
-+} else {
-+ is(scalar(keys(%$stats)), 40, "40 stats values");
-+}
+-is(scalar(keys(%$stats)), 38, "38 stats values");
++my $keys = 38 + (support_replication() ? 3 : 0);
++is(scalar(keys(%$stats)), $keys, "$keys stats values");
# Test initial state
foreach my $key (qw(curr_items total_items bytes cmd_get cmd_set get_hits evictions get_misses
-diff -urN --exclude *.m4 memcached-1.4.4/testapp.c repcached-2.2-1.4.4/testapp.c
--- memcached-1.4.4/testapp.c Wed Nov 25 03:40:29 2009
+++ repcached-2.2-1.4.4/testapp.c Wed Feb 10 17:52:05 2010
@@ -300,6 +300,10 @@