bk commit into 5.1 tree (tsmith:1.2617) BUG#34297

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith.  When tsmith 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, 2008-05-09 00:38:17-06:00, tsmith@stripped +1 -0
  Bug #34297: MySQL Server crashes when processing large table
  
  Remove optimizations on innobase/mem/* to avoid apparent compiler bug which
  causes memory overruns.  See also bug 19424, and probably bug 36366.
  
  This is done in 5.1+; 5.0 already has this workaround in place.

  storage/innobase/CMakeLists.txt@stripped, 2008-05-09 00:38:09-06:00,
tsmith@stripped +8 -0
    Remove optimizations on innobase/mem/* to avoid apparent compiler bug which
    causes memory overruns.  See bug 34297, bug 19424, and probably bug 36366.

diff -Nrup a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
--- a/storage/innobase/CMakeLists.txt	2008-01-29 19:58:55 -07:00
+++ b/storage/innobase/CMakeLists.txt	2008-05-09 00:38:09 -06:00
@@ -17,6 +17,14 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_F
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -D_LIB)
 
+# Bug 19424 - InnoDB: Possibly a memory overrun of the buffer being freed (64-bit Visual
C)
+# Removing Win64 compiler optimizations for all innodb/mem/* files.
+IF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+  SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0mem.c
+                              ${CMAKE_SOURCE_DIR}/storage/innobase/mem/mem0pool.c
+                              PROPERTIES COMPILE_FLAGS -Od)
+ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/storage/innobase/include
                     ${CMAKE_SOURCE_DIR}/storage/innobase/handler