mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client/CMakeLists.txt

87 lines
3 KiB
Text
Raw Normal View History

Bug #20772273 : MYSQLIMPORT --USE-THREADS DOESN'T USE MULTIPLE THREADS Description:- The utility "mysqlimport" does not use multiple threads for the execution with option "--use-threads". "mysqlimport" while importing multiple files and multiple tables, uses a single thread even if the number of threads are specified with "--use-threads" option. Analysis:- This utility uses ifdef HAVE_LIBPTHREAD to check for libpthread library and if defined uses libpthread library for mutlithreaing. Since HAVE_LIBPTHREAD is not defined anywhere in the source, "--use-threads" option is silently ignored. Fix:- "-DTHREADS" is set to the COMPILE_FLAGS which will enable pthreads. HAVE_LIBPTHREAD macro is removed.
2015-06-30 06:57:12 +02:00
# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Added GPL copyright text my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc: Changed copyright header formatting some plugin_example.c, daemon_example.c: Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). Fixing copyright text.
2010-08-12 17:19:57 +02:00
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Added GPL copyright text my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc: Changed copyright header formatting some plugin_example.c, daemon_example.c: Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include
${ZLIB_INCLUDE_DIR}
${SSL_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/libmysql
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/strings
${READLINE_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
cmake corrections to fix compiling on visual 7.1
2006-02-07 16:43:42 +01:00
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
ADD_DEFINITIONS(${READLINE_DEFINES})
ADD_DEFINITIONS(${SSL_DEFINES})
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysql mysqlclient)
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
IF(UNIX)
TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
ENDIF(UNIX)
initial cmake fileset. It is not production ready but stable enough to start working with
2006-01-31 14:52:16 +01:00
Add components to INSTALL, some eraly Wix support
2010-02-10 20:23:24 +01:00
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
Bug #38181 Please print more debug info when tests fail
2008-08-04 21:54:44 +02:00
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
2014-10-13 09:52:28 +02:00
# mysqltest has unused result errors, so we skip Werror
CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
IF(HAVE_WERROR_FLAG)
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
ENDIF()
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
Changes to make testsuite run in CMake build tree.
2006-02-10 13:29:01 +01:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
Changes to make testsuite run in CMake build tree.
2006-02-10 13:29:01 +01:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
Changes to make testsuite run in CMake build tree.
2006-02-10 13:29:01 +01:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
Bug #20772273 : MYSQLIMPORT --USE-THREADS DOESN'T USE MULTIPLE THREADS Description:- The utility "mysqlimport" does not use multiple threads for the execution with option "--use-threads". "mysqlimport" while importing multiple files and multiple tables, uses a single thread even if the number of threads are specified with "--use-threads" option. Analysis:- This utility uses ifdef HAVE_LIBPTHREAD to check for libpthread library and if defined uses libpthread library for mutlithreaing. Since HAVE_LIBPTHREAD is not defined anywhere in the source, "--use-threads" option is silently ignored. Fix:- "-DTHREADS" is set to the COMPILE_FLAGS which will enable pthreads. HAVE_LIBPTHREAD macro is removed.
2015-06-30 06:57:12 +02:00
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
Changes to make testsuite run in CMake build tree.
2006-02-10 13:29:01 +01:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
mysql_upgrade must depend on GenFixPrivs
2007-04-19 18:34:00 +02:00
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
CMakeLists.txt: Added mysql_upgrade target to Windows CMake build
2006-10-13 21:48:27 +02:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Changes to make testsuite run in CMake build tree.
2006-02-10 13:29:01 +01:00
WL#5710 : mysql_plugin - enable or disable plugins This patch adds a new client utility that enables or disables plugin features. The utility disables or enables a plugin using values (name, soname, and symbols) provided via a configuration file by the same name. For example, to ENABLE the daemon_example plugin, the utility will read the daemon_example.ini configuration file and use the values contained to enable or disable the plugin.
2011-07-19 16:17:58 +02:00
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
Changes to make testsuite run in CMake build tree.
2006-02-10 13:29:01 +01:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
Backport of the patch http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
2009-09-30 03:39:37 +02:00
TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
Add echo to be compiled
2007-02-16 15:33:54 +01:00
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
add mysqlslap back to windows builds for 5.1
2007-08-03 14:43:11 +02:00
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
add mysqlslap back to windows builds for 5.1
2007-08-03 14:43:11 +02:00
Fix bug#56547 mysql client interprets commands in comments The problem was not caused by a change in the client, rather by the tests using the Windows built-in "echo" and not the one built by MySQL. This again happened because the binary was missing in the package, caused by the wrong macro being used to build it in "cmake".
2010-09-06 13:26:23 +02:00
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
IF(WIN32)
MYSQL_ADD_EXECUTABLE(echo echo.c)
ENDIF(WIN32)
Add echo to be compiled
2007-02-16 15:33:54 +01:00
WL#5710 : mysql_plugin - enable or disable plugins This patch adds a new client utility that enables or disables plugin features. The utility disables or enables a plugin using values (name, soname, and symbols) provided via a configuration file by the same name. For example, to ENABLE the daemon_example plugin, the utility will read the daemon_example.ini configuration file and use the values contained to enable or disable the plugin.
2011-07-19 16:17:58 +02:00
SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
PROPERTIES HAS_CXX TRUE)
WL#1054: Pluggable authentication support Merged the implementation to a new base tree.
2010-08-09 10:32:50 +02:00
ADD_DEFINITIONS(-DHAVE_DLOPEN)
Reference in a new issue Copy permalink