From: Date: March 20 2007 3:07pm
Subject: bk commit into 5.0 tree (iggy:1.2402) BUG#25765
List-Archive: http://lists.mysql.com/commits/22349
X-Bug: 25765
Message-Id: <20070320140731.B1D5BA90100@recycle>

Below is the list of changes that have just been committed into a local
5.0 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-20 10:07:23-04:00, iggy@recycle.(none) +1 -0
  Bug#25765 too many dbg heap assertions on windows
  - SAFEMALLOC should be defined for each project in debug Windows builds.
  SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
  due to mixed SAFEMALLOC defines.

  innobase/CMakeLists.txt@stripped, 2007-03-20 10:07:21-04:00, iggy@recycle.(none) +2 -2
    Bug#25765 too many dbg heap assertions on windows
    - Make sure that *_DEBUG defaults are not overwritten.
    - 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:	recycle.(none)
# Root:	/src/bug25765/my50-bug25765

--- 1.4/innobase/CMakeLists.txt	2007-01-15 10:15:39 -05:00
+++ 1.5/innobase/CMakeLists.txt	2007-03-20 10:07:21 -04: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)
 
 # Bug#19424 - InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual C)