bzr commit into mysql-5.0-bugteam branch (vvaintroub:2764) Bug#43082

[Vladislav Vaintroub]

#At file:///G:/bzr/mysql-5.0-bugteam/ based on revid:sergey.glukhov@stripped

 2764 Vladislav Vaintroub	2009-02-25
      Bug#43082: mysqld 32 bit cannot use big buffers due to 2GB
      usermode address space limit.
      
      Fix: use /LARGEADDRESSAWARE link option when linking 32 bit
      executables

    modified:
      CMakeLists.txt
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2008-04-07 22:40:37 +0000
+++ b/CMakeLists.txt	2009-02-25 15:57:49 +0000
@@ -114,7 +114,13 @@ IF(MSVC)
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT       ${CMAKE_CXX_FLAGS_INIT})
     STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})
-
+    
+    # Mark 32 bit executables large address aware so they can 
+    # use > 2GB address space
+    IF(CMAKE_SIZEOF_VOID_P MATCHES 4)
+      SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
+    ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 4)
+    
     # Disable automatic manifest generation.
     STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
     	   ${CMAKE_EXE_LINKER_FLAGS})


Attachment: [text/bzr-bundle] bzr/[e-mail]