From: Date: June 4 2007 2:12pm Subject: bk commit into 5.0 tree (df:1.2509) BUG#28860 List-Archive: http://lists.mysql.com/commits/28053 X-Bug: 28860 Message-Id: <200706041217.l54CHhgm017984@mail.mysql.com> Below is the list of changes that have just been committed into a local 5.0 repository of df. When df does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-06-04 14:12:31+02:00, df@stripped +1 -0 BUG#28860 USE_TLS not defined for mysqlclient.lib client/CMakeLists.txt@stripped, 2007-06-04 14:12:30+02:00, df@stripped +4 -0 Bug#28860 Define USE_TLS for mysqlclient.lib # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: df # Host: pippilotta.erinye.com # Root: /shared/home/df/mysql/build/mysql-5.0-build-work-28860 --- 1.7/client/CMakeLists.txt 2007-04-23 21:41:22 +02:00 +++ 1.8/client/CMakeLists.txt 2007-06-04 14:12:30 +02:00 @@ -20,6 +20,10 @@ # 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