Merge with 5.3 main

This commit is contained in:
Michael Widenius 2011-05-16 15:07:04 +03:00
commit 8543621fa0
80 changed files with 9889 additions and 1861 deletions

View file

@ -8,6 +8,5 @@ inst_HEADERS = allocator.hpp config.hpp mutex.hpp string_util.hpp \
lib_LTLIBRARIES = libhsclient.la
libhsclient_la_SOURCES = config.cpp escape.cpp fatal.cpp hstcpcli.cpp \
socket.cpp string_util.cpp
#libhsclient_la_LDFLAGS = -static
libhsclient_la_CFLAGS = $(AM_CFLAGS)
libhsclient_la_CXXFLAGS = $(AM_CXXFLAGS)