Commit 87b6f241 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Use test/db.opt as dummy file in the package, instead of test/.empty

Also, do not package aria log files in the zip package- not required for the database to function, 
also will avoid trouble with recovery, if someone  accidentially (or on purpose) upgrades by unpacking the zip in the existing install directory.
parent f18514df
...@@ -271,7 +271,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") ...@@ -271,7 +271,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
# We need to create empty directories (data/test) the installation. # We need to create empty directories (data/test) the installation.
# This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
# Avoid completely empty directories and install dummy file instead. # Avoid completely empty directories and install dummy file instead.
SET(DUMMY_FILE ${CMAKE_CURRENT_BINARY_DIR}/.empty ) SET(DUMMY_FILE ${CMAKE_CURRENT_BINARY_DIR}/db.opt )
FILE(WRITE ${DUMMY_FILE} "") FILE(WRITE ${DUMMY_FILE} "")
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/test COMPONENT DataFiles) INSTALL(FILES ${DUMMY_FILE} DESTINATION data/test COMPONENT DataFiles)
...@@ -303,7 +303,11 @@ IF(WIN32 AND MYSQLD_EXECUTABLE) ...@@ -303,7 +303,11 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
DEPENDS initdb.dep DEPENDS initdb.dep
) )
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data DESTINATION . INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data DESTINATION .
COMPONENT DataFiles PATTERN "initdb.dep" EXCLUDE PATTERN "bootstrap.sql" EXCLUDE) COMPONENT DataFiles
PATTERN "initdb.dep" EXCLUDE
PATTERN "bootstrap.sql" EXCLUDE
PATTERN "aria*" EXCLUDE
)
ELSE() ELSE()
# Not windows or cross compiling, just install an empty directory # Not windows or cross compiling, just install an empty directory
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment