1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#16062056 REMOVE THE "DUMMY.BAK" FILE FROM THE TEST DATABASE, AND ADD DB.OPT

Browse Source 
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:
Tor Didriksen 2013-02-25 10:42:40 +01:00
parent 0d71d913d3
commit 73d330b87d
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/CMakeLists.txt
View File

@ -261,15 +261,9 @@ ADD_CUSTOM_TARGET(distclean
IF(INSTALL_LAYOUT STREQUAL "STANDALONE") IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
# We need to create empty directories (data/test) the installation. # Copy db.opt into data/test/
# This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
# Avoid completely empty directories and install dummy file instead. INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
# 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)
# Install initial database on windows # Install initial database on windows
IF(NOT CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING)

2
sql/db.opt Normal file
View File

@ -0,0 +1,2 @@
default-character-set=latin1
default-collation=latin1_swedish_ci