From 73d330b87d9d1dc9249ccdfe9562e799940b2f8c Mon Sep 17 00:00:00 2001 From: Tor Didriksen Date: Mon, 25 Feb 2013 10:42:40 +0100 Subject: 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 --- sql/CMakeLists.txt | 12 +++--------- sql/db.opt | 2 ++ 2 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 sql/db.opt (limited to 'sql') diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index d79b732005b..d4db337d765 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -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) diff --git a/sql/db.opt b/sql/db.opt new file mode 100644 index 00000000000..d8429c4e0de --- /dev/null +++ b/sql/db.opt @@ -0,0 +1,2 @@ +default-character-set=latin1 +default-collation=latin1_swedish_ci -- cgit v1.2.1