pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases mysql57: updated to 5.7.21
details: https://anonhg.NetBSD.org/pkgsrc/rev/6c2c92d0bca9
branches: trunk
changeset: 374139:6c2c92d0bca9
user: adam <adam%pkgsrc.org@localhost>
date: Tue Jan 16 16:29:41 2018 +0000
description:
mysql57: updated to 5.7.21
MySQL 5.7.21
Audit Log Notes
* MySQL Enterprise Audit now supports compression and encryption of audit log files. Encryption is based on a user-defined password. To use this feature, the MySQL keyring must be enabled because
audit logging uses it for password storage. MySQL Enterprise Audit also now supports logging in JSON format, in addition to the existing XML formats. For JSON format, functions are available that
provide runtime log reading capabilities. For additional information, see MySQL Enterprise Audit.
Configuration Notes
* For RHEL, SLES, and Fedora RPMs, the default plugin directory for debug builds has been changed from /usr/lib64/mysql/plugin to /usr/lib64/mysql/plugin/debug.
* The installation scripts for MySQL Enterprise Audit and MySQL Enterprise Firewall now create their associated tables in the mysql system database as InnoDB rather than MyISAM tables.
* The hardcoded memory page size of 8KB for the memory-mapped transaction coordinator was too small for platforms such as ARM64 and PowerPC where the page size is much larger. The server now invokes
a system call to get the page size of the current platform rather than using a hardcoded value. A consequence for the --log-tc-size option is that the minimum and default values are now 6 times the
page size. Also, the value must be a multiple of the page size. Thanks to Alexey Kopytov for the patch.
Performance Schema Notes
* The Performance Schema setup_timers table is now deprecated, to be removed in MySQL 8.0, as is the TICK row in the performance_timers table.
Pluggable Authentication
* For the LDAP authentication plugins, handling of the group search attribute indicated by the authentication_ldap_sasl_group_search_attr and authentication_ldap_simple_group_search_attr system
variables is more flexible. If the group search attribute is isMemberOf, LDAP authentication directly retrieves the user attribute isMemberOf value and assign it as group information. If the group
search attribute is not isMemberOf, LDAP authentication searches for all groups where the user is a member. (The latter is the default behavior.) This behavior is based on how LDAP group information
can be stored two ways: 1) A group entry can have an attribute named memberUid or member with a value that is a user name; 2) A user entry can have an attribute named isMemberOf with values that are
group names.
* The LDAP authentication plugins now permit the authentication string that provides user DN information to begin with a + character. In the absence of this character, the authentication string value
is treated as is without modification, as it has been previously. If the authentication string begins with +, the plugin constructs the full user DN value from the account user name as the cn
attribute value, together with the authentication string (with the + removed). The authentication string is stored as given in the mysql.user system table, with the full user DN constructed on the
fly before authentication.
* For the LDAP authentication plugins, the group search attribute was fixed and not configurable. Two new system variables now enable using custom group filters:
authentication_ldap_sasl_group_search_filter and authentication_ldap_simple_group_search_filter.
Security Notes
* Incompatible Change: Passwords are now restricted to a maximum of 256 characters for the sha256_password authentication plugin, and for the PASSWORD() function when old_passwords=2. Also, the
number of password hashing rounds is capped to limit CPU time used.
* The linked OpenSSL library for the MySQL Commercial Server has been updated to version 1.0.2n. Issues fixed in the new OpenSSL version are described at
http://www.openssl.org/news/vulnerabilities.html.
* This change does not affect the Oracle-produced MySQL Community build of MySQL Server, which uses the yaSSL library instead.
* MySQL now supports key migration between underlying keyring keystores. This enables DBAs to switch a MySQL installation from one keyring plugin to another. See Migrating Keys Between Keyring
Keystores.
* MySQL Enterprise Edition now includes a keyring plugin, keyring_encrypted_file, that is similar to the keyring_file plugin in its use of a local data file for key storage, but that also encrypts
the file based on a user-defined password. See Using the keyring_encrypted_file Keyring Plugin.
diffstat:
databases/mysql57-client/Makefile | 3 +-
databases/mysql57-client/Makefile.common | 8 +-
databases/mysql57-client/PLIST | 4 +-
databases/mysql57-client/distinfo | 17 +-
databases/mysql57-client/patches/patch-client_CMakeLists.txt | 16 +-
databases/mysql57-client/patches/patch-cmake_libutils.cmake | 15 --
databases/mysql57-client/patches/patch-cmake_plugin.cmake | 20 +-
databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt | 29 ++--
databases/mysql57-server/Makefile | 3 +-
databases/mysql57-server/PLIST | 60 +++++++++-
10 files changed, 106 insertions(+), 69 deletions(-)
diffs (truncated from 702 to 300 lines):
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/Makefile
--- a/databases/mysql57-client/Makefile Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/Makefile Tue Jan 16 16:29:41 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2018/01/01 21:18:18 adam Exp $
+# $NetBSD: Makefile,v 1.12 2018/01/16 16:29:41 adam Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 1
COMMENT= MySQL 5, a free SQL database (client)
CONFLICTS= mysql3-client-[0-9]*
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/Makefile.common
--- a/databases/mysql57-client/Makefile.common Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/Makefile.common Tue Jan 16 16:29:41 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2017/10/22 20:20:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2018/01/16 16:29:41 adam Exp $
#
# used by databases/mysql57-client/Makefile
# used by databases/mysql57-server/Makefile
-DISTNAME= mysql-5.7.20
+DISTNAME= mysql-5.7.21
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
@@ -11,8 +11,8 @@
HOMEPAGE= https://www.mysql.com/
LICENSE= gnu-gpl-v2
-DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo
-PATCHDIR?= ${.CURDIR}/../../databases/mysql57-client/patches
+DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo
+PATCHDIR?= ${.CURDIR}/../../databases/mysql57-client/patches
USE_CMAKE= yes
USE_LANGUAGES= c c++
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/PLIST
--- a/databases/mysql57-client/PLIST Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/PLIST Tue Jan 16 16:29:41 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/10/22 20:20:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/16 16:29:41 adam Exp $
bin/mysql
bin/mysql_client_test
bin/mysql_config
@@ -122,7 +122,7 @@
lib/libmysqlclient.a
lib/libmysqlclient.so
lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.7
+lib/libmysqlclient.so.20.3.8
lib/pkgconfig/mysqlclient.pc
man/man1/comp_err.1
man/man1/innochecksum.1
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/distinfo
--- a/databases/mysql57-client/distinfo Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/distinfo Tue Jan 16 16:29:41 2018 +0000
@@ -1,24 +1,23 @@
-$NetBSD: distinfo,v 1.16 2018/01/01 21:18:18 adam Exp $
+$NetBSD: distinfo,v 1.17 2018/01/16 16:29:41 adam Exp $
-SHA1 (mysql-5.7.20.tar.gz) = 567061d786d89fe65cb6fb70d0e70e36278e9ef2
-RMD160 (mysql-5.7.20.tar.gz) = ac32cc6809c378ce795f8bc89422868a4702b290
-SHA512 (mysql-5.7.20.tar.gz) = 130f8fd7afffd807e52fae47765c6bcdcae7f81448dfd2f7f6ce7108b4c8ddb1d190d17d72eb2c3a774cbc74db93a50942fc7ca079211437b17ab58000ccf11f
-Size (mysql-5.7.20.tar.gz) = 51725558 bytes
+SHA1 (mysql-5.7.21.tar.gz) = 4ba0af75db7d5b33c30f20bdda2d059abc355a47
+RMD160 (mysql-5.7.21.tar.gz) = 7a70e573e4d9075bc62768f65509fe1c0e024a60
+SHA512 (mysql-5.7.21.tar.gz) = f10a5e3f5910dd9974ace0b87b10c1cbf4e8d47ba22f5382355f0bcfaa14cedb59b50a66ab0f6656842699690cb730bca0b1e11e61191546d5957b73fe8346c3
+Size (mysql-5.7.21.tar.gz) = 51822632 bytes
SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
-SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
+SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
SHA1 (patch-cmake_boost.cmake) = dc37e2cb58f5ae91c61f2e08825530649d32be6b
-SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
-SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
+SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
-SHA1 (patch-libmysql_CMakeLists.txt) = 00ce9c7f0e2c4132b872ffde05ee74e81c280f68
+SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe
SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c
SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/patches/patch-client_CMakeLists.txt
--- a/databases/mysql57-client/patches/patch-client_CMakeLists.txt Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/patches/patch-client_CMakeLists.txt Tue Jan 16 16:29:41 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-client_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-client_CMakeLists.txt,v 1.2 2018/01/16 16:29:42 adam Exp $
Split configuration between mysql-client and mysql-server.
---- client/CMakeLists.txt.orig 2016-03-28 18:06:12.000000000 +0000
+--- client/CMakeLists.txt.orig 2017-12-28 03:46:26.000000000 +0000
+++ client/CMakeLists.txt
@@ -32,8 +32,10 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
@@ -29,7 +29,7 @@
IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -58,16 +62,18 @@ TARGET_LINK_LIBRARIES(mysql_upgrade mysq
+@@ -58,14 +62,17 @@ TARGET_LINK_LIBRARIES(mysql_upgrade mysq
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
ENDIF()
@@ -37,6 +37,7 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
+ENDIF()
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
@@ -45,11 +46,8 @@
+IF(WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
--
- MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
- TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
-@@ -77,10 +83,14 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -78,10 +85,14 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -64,7 +62,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
ADD_COMPILE_FLAGS(
mysqlbinlog.cc
-@@ -97,9 +107,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -98,9 +109,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -77,7 +75,7 @@
IF(UNIX AND NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -112,23 +125,30 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -113,23 +127,30 @@ IF(UNIX AND NOT WITHOUT_SERVER)
ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
ENDIF()
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/patches/patch-cmake_libutils.cmake
--- a/databases/mysql57-client/patches/patch-cmake_libutils.cmake Tue Jan 16 16:27:12 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-cmake_libutils.cmake,v 1.1 2016/09/16 06:49:11 adam Exp $
-
-On Mac OS X, use PkgSrc libtool.
-
---- cmake/libutils.cmake.orig 2011-04-05 12:38:41.000000000 +0000
-+++ cmake/libutils.cmake
-@@ -179,7 +179,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NA
- "${LINKER_EXTRA_FLAGS}")
- ELSE()
- GET_TARGET_PROPERTY(TARGET_LOCATION ${TARGET} LOCATION)
-- IF(APPLE)
-+ IF(0)
- # Use OSX's libtool to merge archives (ihandles universal
- # binaries properly)
- ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/patches/patch-cmake_plugin.cmake
--- a/databases/mysql57-client/patches/patch-cmake_plugin.cmake Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/patches/patch-cmake_plugin.cmake Tue Jan 16 16:29:41 2018 +0000
@@ -1,21 +1,21 @@
-$NetBSD: patch-cmake_plugin.cmake,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-cmake_plugin.cmake,v 1.2 2018/01/16 16:29:42 adam Exp $
Build with newer DTrace.
---- cmake/plugin.cmake.orig 2016-08-25 11:52:06.000000000 +0000
+--- cmake/plugin.cmake.orig 2017-12-28 03:46:26.000000000 +0000
+++ cmake/plugin.cmake
@@ -52,7 +52,7 @@ ENDMACRO()
MACRO(MYSQL_ADD_PLUGIN)
MYSQL_PARSE_ARGUMENTS(ARG
"LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
-- "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY"
-+ "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED;TEST_ONLY"
+- "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY"
++ "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED;TEST_ONLY"
${ARGN}
)
-@@ -125,7 +125,9 @@ MACRO(MYSQL_ADD_PLUGIN)
- SET_TARGET_PROPERTIES(${target}
- PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER")
+@@ -146,7 +146,9 @@ MACRO(MYSQL_ADD_PLUGIN)
+ -P ${CMAKE_BINARY_DIR}/archive_output_directory/lib_location_${target}.cmake
+ )
- DTRACE_INSTRUMENT(${target})
+ IF(ARG_DTRACE_INSTRUMENTED)
@@ -24,7 +24,7 @@
ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
IF(WITH_EMBEDDED_SERVER AND NOT ARG_NOT_FOR_EMBEDDED)
# Embedded library should contain PIC code and be linkable
-@@ -133,7 +135,9 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -154,7 +156,9 @@ MACRO(MYSQL_ADD_PLUGIN)
IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
# Recompile some plugins for embedded
ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES})
@@ -35,7 +35,7 @@
IF(ARG_RECOMPILE_FOR_EMBEDDED)
SET_TARGET_PROPERTIES(${target}_embedded
PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER;EMBEDDED_LIBRARY")
-@@ -197,7 +201,9 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -218,7 +222,9 @@ MACRO(MYSQL_ADD_PLUGIN)
ADD_VERSION_INFO(${target} MODULE SOURCES)
ADD_LIBRARY(${target} MODULE ${SOURCES})
@@ -45,4 +45,4 @@
+ ENDIF()
SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
- TARGET_LINK_LIBRARIES (${target} mysqlservices)
+ IF(NOT ARG_CLIENT_ONLY)
diff -r 1273c2937180 -r 6c2c92d0bca9 databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt
--- a/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt Tue Jan 16 16:27:12 2018 +0000
+++ b/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt Tue Jan 16 16:29:41 2018 +0000
@@ -1,41 +1,38 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.2 2017/07/20 16:41:10 adam Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.3 2018/01/16 16:29:42 adam Exp $
Do not install libmysqlclient with the server.
Generate versioned lib symlinks on FreeBSD to supress PLIST divergence.
authentication_ldap and libmysql_api_test require libmysqld.
---- libmysql/CMakeLists.txt.orig 2017-06-22 14:13:19.000000000 +0000
+--- libmysql/CMakeLists.txt.orig 2017-12-28 03:46:26.000000000 +0000
+++ libmysql/CMakeLists.txt
-@@ -230,12 +230,18 @@ IF(WIN32)
+@@ -230,12 +230,13 @@ IF(WIN32)
LIST(APPEND LIBS auth_win_client)
ENDIF()
-+IF(NOT WITHOUT_SERVER)
- # LDAP authentication SASL client plugin
- MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
+-# LDAP authentication SASL client plugin
+-MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
-ADD_SUBDIRECTORY(authentication_ldap)
-+#ADD_SUBDIRECTORY(authentication_ldap)
-+ENDIF()
# Merge several convenience libraries into one big mysqlclient
+IF(WITHOUT_SERVER)
- MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)
+ELSE()
-+MERGE_LIBRARIES(mysqlclient STATIC NOINSTALL ${LIBS} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(mysqlclient SKIP_INSTALL ${LIBS} COMPONENT Development)
+ENDIF()
# Visual Studio users need debug static library for debug projects
IF(MSVC)
-@@ -275,12 +281,18 @@ ENDIF()
+@@ -269,12 +270,18 @@ ENDIF()
IF(NOT DISABLE_SHARED)
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
+ IF(WITHOUT_SERVER)
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+ MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
COMPONENT SharedLibraries)
+ ELSE()
-+ MERGE_LIBRARIES(libmysql SHARED NOINSTALL ${LIBS}
++ MERGE_LIBRARIES_SHARED(libmysql SKIP_INSTALL ${LIBS}
+ EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+ COMPONENT SharedLibraries)
+ ENDIF()
@@ -46,7 +43,7 @@
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
ELSE()
SET(OS_SHARED_LIB_VERSION
-@@ -348,6 +360,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
+@@ -342,6 +349,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
# from @CLIENT_API_FUNCTIONS@ are declared by <mysql.h>. It will fail
# to run if not all of these symbols are exported by the library.
#
@@ -54,9 +51,11 @@
ADD_EXECUTABLE(libmysql_api_test ${CMAKE_CURRENT_BINARY_DIR}/api_test.c)
SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX)
IF(LIBRT)
-@@ -359,4 +372,5 @@ IF(DISABLE_SHARED)
+@@ -353,6 +361,7 @@ IF(DISABLE_SHARED)
ELSE()
Home |
Main Index |
Thread Index |
Old Index