Commit f2de9e82 authored Mar 03, 2006 by unknown

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  big_geek.:C:/Work/mysql/mysql-5.1

parents 40b55ac6 8f84c9f9

win/cmakefiles/client

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,4 +77,4 @@ ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
		TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32)

		ADD_EXECUTABLE(mysqlslap mysqlslap.c)
		TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32)
		TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32 dbug)

win/cmakefiles/libmysql

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def
		../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c
		../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c
		../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c)
		ADD_DEPENDENCIES(libmysql GenError zlib)
		ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib)
		TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)

		# ToDo: We should move the mytest.c program out in libmysql/

win/cmakefiles/regex

+1 −2

Original line number	Diff line number	Diff line
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")

		ADD_DEFINITIONS(-D_WINDOWS -D__WIN__)
		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
		ADD_LIBRARY(regex debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c)

win/cmakefiles/strings

+2 −3

Original line number	Diff line number	Diff line
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")

		ADD_DEFINITIONS(-D_WINDOWS -D__WIN__)
		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
		ADD_LIBRARY(strings bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c
		ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c ctype-gb2312.c ctype-gbk.c

win/cmakefiles/tests

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,4 +6,4 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)

		ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
		TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient zlib wsock32)
		TARGET_LINK_LIBRARIES(mysql_client_test dbug mysqlclient zlib wsock32)