Commit bbcc4bb0 authored by unknown's avatar unknown
Browse files

Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build 

into  linux.site:/home/omer/source/bld50_0321
parents fb616ccc 716d23a7

CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -86,13 +86,17 @@ ENDIF(CYBOZU) 


# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
@@ -104,10 +108,14 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
	       ${CMAKE_C_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 

	       ${CMAKE_C_FLAGS_RELEASE})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_C_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 

	       ${CMAKE_C_FLAGS_DEBUG})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 

	       ${CMAKE_CXX_FLAGS_RELEASE})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})

Docs/.cvsignore

+1 −36
Original line number Diff line number Diff line 
COPYING

COPYING.LIB

INSTALL-SOURCE

INSTALL-BINARY

Makefile

Makefile.in

Manual-updates

before-gpl-changes-manual.texi

include.texi

manual-before-gpl.texi

manual-tmp.aux

manual-tmp.cp

manual-tmp.fn

manual-tmp.ky

manual-tmp.log

manual-tmp.pdf

manual-tmp.pg

manual-tmp.texi

manual-tmp.toc

manual-tmp.tp

manual-tmp.vr

manual.aux

manual.cp

manual.cps

manual.fn

manual.fns

manual.html

manual.ky

manual.log

manual.pdf

manual.pg

manual.toc

manual.tp

manual.txt

manual.vr

manual_a4.ps

manual_a4.ps.gz

manual_letter.ps

manual_letter.ps.gz

manual_toc.html

mysql.info

Docs/Books/algor.eps

deleted100644 → 0
+0 −1419

File deleted.

Preview size limit exceeded, changes collapsed.

Docs/Books/algor.gif

deleted100644 → 0
−14.6 KiB
Loading image diff...

Docs/Books/algor.txt

deleted100644 → 0
+0 −0

Empty file deleted.