Commit a51493a4 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents f2dee68c 9217908d

CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
	# generate map files

	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")



  # set stack size (see bug#20815)

  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")



	# remove support for Exception handling

	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

scripts/make_binary_distribution.sh

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/t 
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \

    mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \

    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \

    mysql-test/std_data/Index.xml \

    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \

    mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \

    $BASE/mysql-test/std_data