Automatic merge

This commit is contained in:
Michael Widenius 2014-02-05 19:23:11 +02:00
commit 10001c8e4f
141 changed files with 3019 additions and 814 deletions

View file

@ -352,6 +352,7 @@ MYSQL_CHECK_SSL()
# Add readline or libedit.
MYSQL_CHECK_READLINE()
SET(MALLOC_LIBRARY "system")
CHECK_JEMALLOC()
#