Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build (b976f18c) · Commits · Software / OSDI20 Artifacts / mariadb

client/CMakeLists.txt

+17 −97

Original line number	Diff line number	Diff line
		@@ -14,128 +14,48 @@
		# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")

		# We use the "mysqlclient_notls" library here just as safety, in case
		# any of the clients here would go beond the client API and access the
		# Thread Local Storage directly.

		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		# The old Windows build method used renamed (.cc -> .cpp) source files, fails
		# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define.
		ADD_DEFINITIONS(-DUSING_CMAKE -DYASSL_PREFIX -DUSE_TLS)

		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/zlib
		${CMAKE_SOURCE_DIR}/extra/yassl/include
		${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
		${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL
		${CMAKE_SOURCE_DIR}/libmysql
		${CMAKE_SOURCE_DIR}/regex
		${CMAKE_SOURCE_DIR}/mysys
		${CMAKE_SOURCE_DIR}/sql
		${CMAKE_SOURCE_DIR}/strings)

		SET(YASSL_SOURCES ../extra/yassl/src/buffer.cpp
		../extra/yassl/src/cert_wrapper.cpp
		../extra/yassl/src/crypto_wrapper.cpp
		../extra/yassl/src/handshake.cpp
		../extra/yassl/src/lock.cpp
		../extra/yassl/src/log.cpp
		../extra/yassl/src/socket_wrapper.cpp
		../extra/yassl/src/ssl.cpp
		../extra/yassl/src/timer.cpp
		../extra/yassl/src/yassl_error.cpp
		../extra/yassl/src/yassl_imp.cpp
		../extra/yassl/src/yassl_int.cpp)

		SET(TAOCRYPT_SOURCES ../extra/yassl/taocrypt/src/aes.cpp
		../extra/yassl/taocrypt/src/aestables.cpp
		../extra/yassl/taocrypt/src/algebra.cpp
		../extra/yassl/taocrypt/src/arc4.cpp
		../extra/yassl/taocrypt/src/asn.cpp
		../extra/yassl/taocrypt/src/coding.cpp
		../extra/yassl/taocrypt/src/des.cpp
		../extra/yassl/taocrypt/src/dh.cpp
		../extra/yassl/taocrypt/src/dsa.cpp
		../extra/yassl/taocrypt/src/file.cpp
		../extra/yassl/taocrypt/src/hash.cpp
		../extra/yassl/taocrypt/src/integer.cpp
		../extra/yassl/taocrypt/src/md2.cpp
		../extra/yassl/taocrypt/src/md4.cpp
		../extra/yassl/taocrypt/src/md5.cpp
		../extra/yassl/taocrypt/src/misc.cpp
		../extra/yassl/taocrypt/src/random.cpp
		../extra/yassl/taocrypt/src/ripemd.cpp
		../extra/yassl/taocrypt/src/rsa.cpp
		../extra/yassl/taocrypt/src/sha.cpp)

		ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
		../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
		../sql-common/client.c ../strings/ctype-big5.c ../strings/ctype-bin.c
		../strings/ctype-cp932.c ../strings/ctype-czech.c ../strings/ctype-euc_kr.c
		../strings/ctype-eucjpms.c ../strings/ctype-extra.c ../strings/ctype-gb2312.c
		../strings/ctype-gbk.c ../strings/ctype-latin1.c ../strings/ctype-mb.c
		../strings/ctype-simple.c ../strings/ctype-sjis.c ../strings/ctype-tis620.c
		../strings/ctype-uca.c ../strings/ctype-ucs2.c ../strings/ctype-ujis.c
		../strings/ctype-utf8.c ../strings/ctype-win1250ch.c ../strings/ctype.c
		../mysys/default.c ../libmysql/errmsg.c ../mysys/errors.c
		../libmysql/get_password.c ../strings/int2str.c ../strings/is_prefix.c
		../libmysql/libmysql.c ../mysys/list.c ../strings/llstr.c
		../strings/longlong2str.c ../libmysql/manager.c ../mysys/mf_cache.c
		../mysys/mf_dirname.c ../mysys/mf_fn_ext.c ../mysys/mf_format.c
		../mysys/mf_iocache.c ../mysys/mf_iocache2.c ../mysys/mf_loadpath.c
		../mysys/mf_pack.c ../mysys/mf_path.c ../mysys/mf_tempfile.c ../mysys/mf_unixpath.c
		../mysys/mf_wcomp.c ../mysys/mulalloc.c ../mysys/my_access.c ../mysys/my_alloc.c
		../mysys/my_chsize.c ../mysys/my_compress.c ../mysys/my_create.c
		../mysys/my_delete.c ../mysys/my_div.c ../mysys/my_error.c ../mysys/my_file.c
		../mysys/my_fopen.c ../mysys/my_fstream.c ../mysys/my_gethostbyname.c
		../mysys/my_getopt.c ../mysys/my_getwd.c ../mysys/my_init.c ../mysys/my_lib.c
		../mysys/my_malloc.c ../mysys/my_messnc.c ../mysys/my_net.c ../mysys/my_once.c
		../mysys/my_open.c ../mysys/my_pread.c ../mysys/my_pthread.c ../mysys/my_read.c
		../mysys/my_realloc.c ../mysys/my_rename.c ../mysys/my_seek.c
		../mysys/my_static.c ../strings/my_strtoll10.c ../mysys/my_symlink.c
		../mysys/my_symlink2.c ../mysys/my_thr_init.c ../sql-common/my_time.c
		../strings/my_vsnprintf.c ../mysys/my_wincond.c ../mysys/my_winthread.c
		../mysys/my_write.c ../sql/net_serv.cc ../sql-common/pack.c ../sql/password.c
		../mysys/safemalloc.c ../mysys/sha1.c ../strings/str2int.c
		../strings/str_alloc.c ../strings/strcend.c ../strings/strcont.c ../strings/strend.c
		../strings/strfill.c ../mysys/string.c ../strings/strinstr.c ../strings/strmake.c
		../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c
		../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
		${YASSL_SOURCES} ${TAOCRYPT_SOURCES}
		)


		ADD_DEPENDENCIES(mysqlclient GenError)
		ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
		LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib)
		TARGET_LINK_LIBRARIES(mysql mysqlclient mysys zlib dbug wsock32)
		ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c)
		TARGET_LINK_LIBRARIES(mysql mysqlclient_notls wsock32)

		ADD_EXECUTABLE(mysqltest mysqltest.c)
		TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys zlib dbug regex wsock32)
		ADD_EXECUTABLE(mysqltest mysqltest.c ../mysys/my_getsystime.c ../mysys/my_copy.c)
		TARGET_LINK_LIBRARIES(mysqltest mysqlclient_notls regex wsock32)

		ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
		TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug zlib wsock32)
		TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient_notls wsock32)

		ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
		TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug zlib wsock32)
		ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c ../mysys/mf_getdate.c)
		TARGET_LINK_LIBRARIES(mysqldump mysqlclient_notls wsock32)

		ADD_EXECUTABLE(mysqlimport mysqlimport.c)
		TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug zlib wsock32)
		TARGET_LINK_LIBRARIES(mysqlimport mysqlclient_notls wsock32)

		ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c ../mysys/my_getpagesize.c)
		TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug zlib wsock32)
		TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient_notls wsock32)
		ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)

		ADD_EXECUTABLE(mysqlshow mysqlshow.c)
		TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug zlib wsock32)
		TARGET_LINK_LIBRARIES(mysqlshow mysqlclient_notls wsock32)

		ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc
		../mysys/my_bit.c ../mysys/my_bitmap.c
		../mysys/base64.c)
		TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug zlib wsock32)
		ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc)
		TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient_notls wsock32)

		ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
		TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug zlib wsock32)
		TARGET_LINK_LIBRARIES(mysqladmin mysqlclient_notls wsock32)

		ADD_EXECUTABLE(echo echo.c)

dbug/CMakeLists.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -D__WIN32__")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)

libmysql/CMakeLists.txt

+43 −16

Original line number	Diff line number	Diff line
		@@ -14,14 +14,14 @@
		# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")

		# Need to set USE_TLS, since __declspec(thread) approach to thread local
		# storage does not work properly in DLLs.
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		# Note that we don't link with the libraries "strings" or "mysys"
		# here, instead we recompile the files needed and include them
		# directly. This means we don't have to worry here about if these
		# libraries are compiled defining USE_TLS or not. Not that it should
		# have been a problem anyway, they don't use thread local storage.

		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/zlib
		@@ -31,8 +31,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/sql
		${CMAKE_SOURCE_DIR}/strings)

		ADD_LIBRARY(libmysql SHARED dll.c libmysql.def
		../mysys/array.c ../strings/bchange.c ../strings/bmove.c
		SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
		../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
		../sql-common/client.c ../strings/ctype-big5.c ../strings/ctype-bin.c
		../strings/ctype-cp932.c ../strings/ctype-czech.c ../strings/ctype-euc_kr.c
		@@ -41,10 +40,11 @@ ADD_LIBRARY(libmysql SHARED dll.c libmysql.def
		../strings/ctype-simple.c ../strings/ctype-sjis.c ../strings/ctype-tis620.c
		../strings/ctype-uca.c ../strings/ctype-ucs2.c ../strings/ctype-ujis.c
		../strings/ctype-utf8.c ../strings/ctype-win1250ch.c ../strings/ctype.c
		../mysys/default.c ../libmysql/errmsg.c ../mysys/errors.c
		../libmysql/get_password.c ../strings/int2str.c ../strings/is_prefix.c
		../libmysql/libmysql.c ../mysys/list.c ../strings/llstr.c
		../strings/longlong2str.c ../libmysql/manager.c ../mysys/mf_cache.c
		../mysys/default.c errmsg.c ../mysys/errors.c
		../mysys/hash.c ../mysys/my_sleep.c ../mysys/default_modify.c
		get_password.c ../strings/int2str.c ../strings/is_prefix.c
		libmysql.c ../mysys/list.c ../strings/llstr.c
		../strings/longlong2str.c manager.c ../mysys/mf_cache.c
		../mysys/mf_dirname.c ../mysys/mf_fn_ext.c ../mysys/mf_format.c
		../mysys/mf_iocache.c ../mysys/mf_iocache2.c ../mysys/mf_loadpath.c
		../mysys/mf_pack.c ../mysys/mf_path.c ../mysys/mf_tempfile.c ../mysys/mf_unixpath.c
		@@ -67,8 +67,35 @@ ADD_LIBRARY(libmysql SHARED 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 dbug vio mysys strings GenError zlib yassl taocrypt)
		TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)

		# Need to set USE_TLS for building the DLL, since __declspec(thread)
		# approach to thread local storage does not work properly in DLLs.
		#
		# The static library might be used to form another DLL, as is the case
		# with the ODBC driver, so it has to be compiled with USE_TLS as well.
		#
		# We create a third library without USE_TLS for internal use. We can't
		# be sure that some client application part of this build doesn't go
		# beond the documented API, and try access the Thread Local Storage.
		# The "_notls" means no Tls*() functions used, i.e. "static" TLS.

		ADD_LIBRARY(libmysql SHARED dll.c libmysql.def ${CLIENT_SOURCES})
		ADD_LIBRARY(mysqlclient STATIC ${CLIENT_SOURCES})
		ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES})

		SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")

		SET(CLIENT_LIB_DEPS yassl taocrypt zlib dbug GenError)
		SET(CLIENT_LIBS yassl taocrypt zlib debug dbug)

		ADD_DEPENDENCIES(libmysql ${CLIENT_LIB_DEPS})
		TARGET_LINK_LIBRARIES(libmysql ${CLIENT_LIBS} wsock32)

		ADD_DEPENDENCIES(mysqlclient ${CLIENT_LIB_DEPS})
		TARGET_LINK_LIBRARIES(mysqlclient ${CLIENT_LIBS})

		ADD_DEPENDENCIES(mysqlclient_notls ${CLIENT_LIB_DEPS})
		TARGET_LINK_LIBRARIES(mysqlclient_notls ${CLIENT_LIBS})

		ADD_EXECUTABLE(myTest mytest.c)
		TARGET_LINK_LIBRARIES(myTest libmysql)

mysys/CMakeLists.txt

+5 −9

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		# Need to set USE_TLS, since mysys is linked into libmysql.dll and
		# libmysqld.dll, and __declspec(thread) approach to thread local storage does
		# not work properly in DLLs.
		# Currently, USE_TLS crashes in Debug builds, so until that is fixed Debug
		# .dlls cannot be loaded at runtime.
		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DUSE_TLS")
		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DUSE_TLS")
		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DUSE_TLS")
		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DUSE_TLS")
		# Only the server link with this library, the client libraries and the client
		# executables all link with recompiles of source found in the "mysys" directory.
		# So we only need to create one version of this library, with the "static"
		# Thread Local Storage model.

		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys )

		ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_modify.c
		errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c
		mf_format.c mf_getdate.c mf_iocache.c mf_iocache2.c mf_keycache.c

scripts/make_win_bin_dist

+2 −2

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ cp include/mysql.h \
		mkdir -p $DESTDIR/lib/opt
		cp libmysql/$TARGET/libmysql.dll \
		libmysql/$TARGET/libmysql.lib \
		client/$TARGET/mysqlclient.lib \
		libmysql/$TARGET/mysqlclient.lib \
		regex/$TARGET/regex.lib \
		strings/$TARGET/strings.lib \
		zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
		@@ -297,7 +297,7 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
		mkdir -p $DESTDIR/lib/debug
		cp libmysql/debug/libmysql.dll \
		libmysql/debug/libmysql.lib \
		client/debug/mysqlclient.lib \
		libmysql/debug/mysqlclient.lib \
		regex/debug/regex.lib \
		strings/debug/strings.lib \
		zlib/debug/zlib.lib $DESTDIR/lib/debug/