summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authordf@pippilotta.erinye.com <>2007-06-06 14:20:06 +0200
committerdf@pippilotta.erinye.com <>2007-06-06 14:20:06 +0200
commita52a96f511e5aafd776999d79eca939cb6a55f14 (patch)
treee367a6e84a3de6e59f6dc703812df215dd518109 /client
parent27f907b74b81ddffc7fa43e4f3492e78d36d6af5 (diff)
parent1161d74a3ad69e51211a8d0346fbf717e769311a (diff)
downloadmariadb-git-a52a96f511e5aafd776999d79eca939cb6a55f14.tar.gz
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
Diffstat (limited to 'client')
-rw-r--r--client/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8ec8b0111b0..69d39886e9a 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -20,6 +20,10 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
# The old Windows build method used renamed (.cc -> .cpp) source files, fails
# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define.
ADD_DEFINITIONS(-DUSING_CMAKE)
+
+# USE_TLS needed because of bug#28860
+ADD_DEFINITIONS(-DUSE_TLS)
+
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/extra/yassl/include