# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20131113173054-ws4pvoietqhxbjg2
# target_branch: file:///home/kinkie/squid/workspace/trunk/
# testament_sha1: 0288d6f6daa4de69d14741f22029e51d9c48f163
# timestamp: 2013-11-13 18:31:48 +0100
# base_revision_id: kinkie@squid-cache.org-20131113095816-\
#   23nbw7dhlub18a1p
# 
# Begin patch
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-11-13 09:58:16 +0000
+++ src/Makefile.am	2013-11-13 17:30:54 +0000
@@ -1141,7 +1141,7 @@
 	HttpReply.cc \
 	HttpReply.h \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	RegexList.h \
 	RegexList.cc \
 	MemBuf.cc \
@@ -1314,7 +1314,7 @@
 	URLScheme.cc \
 	URLScheme.h \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	MemBuf.cc \
 	wordlist.h \
 	wordlist.cc
@@ -1376,7 +1376,7 @@
 	HttpRequest.cc \
 	HttpRequestMethod.cc \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	String.cc \
 	tests/testCacheManager.cc \
 	tests/testCacheManager.h \
@@ -1659,7 +1659,7 @@
 	MemObject.cc \
 	mem_node.cc \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	Notes.h \
 	Notes.cc \
 	Packer.cc \
@@ -1890,7 +1890,7 @@
 	MasterXaction.cc \
 	MasterXaction.h \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	mem_node.cc \
 	MemBuf.cc \
 	MemObject.cc \
@@ -2136,7 +2136,7 @@
 	MemBuf.cc \
 	MemObject.cc \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	mem_node.cc \
 	mime.h \
 	mime.cc \
@@ -2376,7 +2376,7 @@
 	MemBuf.cc \
 	MemObject.cc \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	mem_node.cc \
 	mime.h \
 	mime.cc \
@@ -2514,7 +2514,7 @@
 	MemBuf.cc \
 	MemBuf.h \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	String.cc \
 	cache_cf.h \
 	YesNoNone.h \
@@ -2556,7 +2556,7 @@
 	HttpRequest.cc \
 	HttpRequestMethod.cc \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	String.cc \
 	tests/testHttpRequest.h \
 	tests/testHttpRequest.cc \
@@ -2829,7 +2829,7 @@
 	MasterXaction.cc \
 	MasterXaction.h \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	mem_node.cc \
 	MemBuf.cc \
 	MemObject.cc \
@@ -2958,7 +2958,7 @@
 tests_testString_SOURCES = \
 	ClientInfo.h \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	MemBuf.cc \
 	String.cc \
 	tests/testMain.cc \
@@ -3454,7 +3454,7 @@
 	multicast.h \
 	multicast.cc \
 	Mem.h \
-	mem.cc \
+	tests/stub_mem.cc \
 	mem_node.cc \
 	MemBuf.cc \
 	MemObject.cc \
@@ -3601,7 +3601,7 @@
 	$(SBUF_SOURCE) \
 	SBufStream.h \
 	tests/stub_time.cc \
-	mem.cc \
+	tests/stub_mem.cc \
 	tests/stub_debug.cc \
 	tests/stub_fatal.cc \
 	tests/stub_HelperChildConfig.cc \

=== modified file 'src/tests/stub_mem.cc'
--- src/tests/stub_mem.cc	2013-11-05 10:03:27 +0000
+++ src/tests/stub_mem.cc	2013-11-13 17:30:54 +0000
@@ -59,7 +59,14 @@
     return cxx_xfree;
 }
 
-void * memAllocate(mem_type type) STUB_RETVAL(NULL)
-void memFree(void *p, int type) STUB
+void * memAllocate(mem_type type) {
+    // let's waste plenty of memory. This should cover any possible need
+    return xmalloc(64*1024);
+}
+void memFree(void *p, int type) {
+    xfree(p);
+}
 void Mem::Init(void) STUB_NOP
-
+void memDataInit(mem_type, const char *, size_t, int, bool) STUB_NOP
+int memInUse(mem_type) STUB_RETVAL(0)
+void memConfigure(void) STUB_NOP

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb6MueIAAtvfgEAwUPf//38n
3wS////6UAV97zm0dLYHSlXWYhwkkJGpk9T2owmhqmm0xBD1HqG0jBGR6am1MOMmTJiMTACZMEyA
GjCMAQwCUCVPNKabUPU/VANA0AAAAAAASKJlTbU0ynqnqemTTUyDaj9SBmoAZAwTTaCSQEAaJo0p
sU9JlG9U/VMmJiekGgAyPUiooVqFheaj3obA2/ueYzw3tv0cVY8u5EBMsdTTq5cYx5R5VPrkQynC
dVtePM2IJq2n8tqfAzGGYSZfTwALviUxchTDcrXZbKzvDNczEoVlhpK6QxVZJ6laFYqlWubRNa1B
MnVtW7uPP9eDZ2HSrxzida2OM7LdeuPCS60mScx0GLbhxZWymZ3yQ9kHFsu8kSDLglr2wXnmlGaW
EHZN5fvxK3m1CwhVnIiU5ZNUZ/PHLxygNq7askAwl2+neYVRL9EJuOM0kPff64QIMo/1toQCVbIJ
DlJOorDUISNdWSYHLfKUkk8QMMBCMQu7MHxrNMkL25OV2Nz3MmIv+jGmznUsTDEt8xt64oUgVScT
IyePINNqZ1BGCEw4DSmBBYwHh4KSj339wPWGwaQ/V4HWhI3Ejr/Yalh5GKG1ON8Q1mjGYr3DdqHJ
RGUWQdBpK/NUPRDEmoWzCD0Pg62qT1ntwcPM5IfZxK8BqqULKh+lJTAtEDjEcIcNmX6D4FplNq6i
RpI1xhdNOZrBsHuGi5DCGQbISgWoHMMxSlRUsQ4UyxLi8smTqJPUKTcxRKJfkZ5FDDqAfI169aKM
LVO0tJOA7gi7jrQqLSwtHvRpZEuIeczed5Xvq2hGphuGo4rlKZOTd98SzgSwI6aB27YnHcYczQpd
jUzMSN1CSgn73SYB99+/c+oMsgsXQIHI+Ww5lMKZOy+cAf/rr08iFzpjsryeswZ9OkM+Lgt2W8hm
a0dhHKZjW4i4xYqJcKjyTROcD6aV2YmE4HksrvcpFVuFbSSxcpuBoSdFVIhNvsPYqd19gx1Mk5jl
6DrAS+fS17MmZvReM0hJu0vNH7fNvNx/h15ei4Xb1SzkLOnz4mZka0B7fCAQzXHy9pITw6khu89J
W88fSJfa/gf9X57CnsRHI9zepbTGRrsvxS9dZ88/Af2bg0N7kB4gZ4d+YdEg4RL9UOL1mrWP97dg
lLkQFeC9MRjYknW4YEKZD3ucIGNJ+whWEAbN6KjMaQ0A4K+WVyt5Src+81iElyEmNTcQwsPXSDNI
7Xdx5TISw7smHYFqJ0kbhcpiYSd9VsWkNihRwbGdtcUoFxNKvwmCh2KirHTLWwiJVvAsE9EOw8NS
A5HcthlFfA7C1bvkSXM5CDGbS2BC50tLOzCv1lgmSV3fqtCTB2gREGXfMuguxPx6RYCWGxD1iVJA
XLUIiaZIuYk4HfbXCdGjQiPLBVcpgNYFr241KJVImR2nWmHR1FnEMUYuDs8xRkum+VNbHfCuK3h8
SKuQGtrgM9nTtUzcgKI4ptdhw2XFUVGuJ0Y8WrOoVE0PgOyk4Si1QTaGp+fh3iyh5RKu6daPZyR8
lZxi2CWRaYlHDHqrz/rc4fWeLSxhUuJGxcjsnwWwpXgBLdA1iXBqbWwxo2788eeqVlaX8hhcpCVn
HBUtjfKSOLvmJawGpIr/W80YuL52oePrDXxEut2Pqdpchwl6EKTNZCN8yd7r27CTj0A6YzsbfFCu
D65LHpiWI+m5UAZ4lFwUegIPoWjc+8vCiA2+0Sx7el/3zu8MFVijzdWTdwHvPOHKz4+67uAyA6Sv
Rwyyct9u8+4kjnyCdhQ/xdyRThQkL6MueIA=