4af533cdd3
- Update to 10.0.21 - Updates mariadb100-client as well (slave-port) - Silence portlint - Re-roll patches with makepatch [1] https://mariadb.atlassian.net/browse/MDEV-7398 [2] https://mariadb.atlassian.net/browse/MDEV-8128 Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/ Differential revision: https://reviews.freebsd.org/D2771 Reviewed by: koobs (mentor), vsevolod (mentor) Approved by: vsevolod (mentor) PR: 200097 Security: 36bd352d-299b-11e5-86ff-14dae9d210b8 MFH: 2015Q3
29 lines
836 B
Text
29 lines
836 B
Text
--- sql/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC
|
|
+++ sql/CMakeLists.txt
|
|
@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean
|
|
VERBATIM
|
|
)
|
|
|
|
+IF(FALSE)
|
|
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
|
|
|
|
# Copy db.opt into data/test/
|
|
@@ -355,6 +356,7 @@ ELSE()
|
|
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
|
|
ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
|
|
ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
|
|
+ENDIF()
|
|
|
|
IF(WIN32)
|
|
SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
|
|
@@ -397,8 +399,10 @@ IF(WIN32)
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
|
|
ENDIF(WIN32)
|
|
|
|
+IF(FALSE)
|
|
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
|
|
FILES_MATCHING PATTERN "*.h"
|
|
PATTERN examples EXCLUDE
|
|
PATTERN share EXCLUDE
|
|
PATTERN CMakeFiles EXCLUDE)
|
|
+ENDIF()
|