summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-11 14:56:19 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-11 14:56:19 +0100
commit6404fcbf9e5924b54a01a033e2852939a2491240 (patch)
tree994d9d2fa2ecb2b1103bec807b1aba0b36dc3803 /mysys
parent67cfb8a5c564b2f1fb54e799bf331907f106ea4d (diff)
parent44c8745ff51506e7554a3a4263d90d32cb4dee6e (diff)
downloadmariadb-git-6404fcbf9e5924b54a01a033e2852939a2491240.tar.gz
merge 5.5
Diffstat (limited to 'mysys')
-rw-r--r--mysys/CMakeLists.txt2
-rw-r--r--mysys/safemalloc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 3b42e20c78c..9e47c7c5f19 100644
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -66,7 +66,7 @@ ENDIF()
ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
- ${LIBNSL} ${LIBM} ${LIBRT})
+ ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET})
DTRACE_INSTRUMENT(mysys)
IF(HAVE_BFD_H)
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 5206a759740..cfcfd51dac7 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -280,8 +280,8 @@ static int bad_ptr(const char *where, void *ptr)
magicend[2] != MAGICEND2 ||
magicend[3] != MAGICEND3)
{
- warn("Error: %s overrun buffer", where);
- fprintf(stderr, ", allocated at ");
+ warn("Error: %s overrun buffer ", where);
+ fprintf(stderr, "Allocated at ");
print_stack(irem->frame);
return 1;
}