bk commit into 5.1 tree (iggy:1.2476) BUG#25765

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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-03-09 20:02:06-05:00, iggy@alf. +1 -0
  Bug#25765 too many dbg heap assertions on windows
  - Debug asserts caused due to mixed SAFEMALLOC defines.

  storage/innobase/CMakeLists.txt@stripped, 2007-03-09 20:00:21-05:00, iggy@alf. +2 -2
    Bug#25765 too many dbg heap assertions on windows
    - Make sure that defaults are not overwritten and define SAFEMALLOC and SAFE_MUTEX 
    for debug innodb 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:	iggy
# Host:	alf.
# Root:	D:/src/mysql-5.1-maint_25765

--- 1.10/storage/innobase/CMakeLists.txt	2007-03-09 20:02:18 -05:00
+++ 1.11/storage/innobase/CMakeLists.txt	2007-03-09 20:02:18 -05:00
@@ -13,8 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#SET(CMAKE_CXX_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
-#SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib