Bug#16062056 REMOVE THE "DUMMY.BAK" FILE FROM THE TEST DATABASE, AND ADD DB.OPT
1. remove dummy.bak 2. create a db.opt file containing two lines: --- default-character-set=latin1 default-collation=latin1_swedish_ci
This commit is contained in:
parent
0d71d913d3
commit
73d330b87d
@ -261,15 +261,9 @@ ADD_CUSTOM_TARGET(distclean
|
||||
|
||||
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
|
||||
|
||||
# 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
|
||||
# Avoid completely empty directories and install dummy file instead.
|
||||
# Use a file extension so that it will be deleted in case someone does
|
||||
# 'drop database test'
|
||||
# See deletable_extentions.
|
||||
SET(DUMMY_FILE ${CMAKE_CURRENT_BINARY_DIR}/dummy.bak )
|
||||
FILE(WRITE ${DUMMY_FILE} "")
|
||||
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/test COMPONENT DataFiles)
|
||||
# Copy db.opt into data/test/
|
||||
SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
|
||||
INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
|
||||
|
||||
# Install initial database on windows
|
||||
IF(NOT CMAKE_CROSSCOMPILING)
|
||||
|
2
sql/db.opt
Normal file
2
sql/db.opt
Normal file
@ -0,0 +1,2 @@
|
||||
default-character-set=latin1
|
||||
default-collation=latin1_swedish_ci
|
Loading…
x
Reference in New Issue
Block a user