From: Date: May 14 2007 1:20pm
Subject: bk commit into 5.0 tree (df:1.2484) BUG#28358
List-Archive: http://lists.mysql.com/commits/26587
X-Bug: 28358
Message-Id: <200705141124.l4EBO7ra021763@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-05-14 13:20:18+02:00, df@stripped +1 -0
  bug#28358 libmysql.dll cannot be dynamically loaded on Windows

  libmysql/CMakeLists.txt@stripped, 2007-05-14 13:20:17+02:00, df@stripped +4 -0
    bug#28358 USE_TLS was not defined during build of libmysql.dll with target other than Debug. Defining it for RelWithDebInfo appears to fix the bug for win32 and win64 cmake builds.

# 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-28358

--- 1.3/libmysql/CMakeLists.txt	2007-04-23 21:41:22 +02:00
+++ 1.4/libmysql/CMakeLists.txt	2007-05-14 13:20:17 +02:00
@@ -18,6 +18,10 @@
 # storage does not work properly in DLLs.
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
+SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/zlib