diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:04:26 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:04:26 -0400 |
| commit | b441c510a7ea731e2da0fa9b4cf3e7f1275f841b (patch) | |
| tree | 7147fc480bff17dc310cb3c03494777ad1878071 /support-files | |
| parent | d3b2e780d6ddee9a4f434ba9928f77127bbbeeb1 (diff) | |
| parent | 6d75570e99fbf070cdbeefdfbcfc94d1c7b3ad1f (diff) | |
| download | mariadb-git-b441c510a7ea731e2da0fa9b4cf3e7f1275f841b.tar.gz | |
bzr merge -rtag:mariadb-5.5.38 maria/5.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | support-files/db.opt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 5d1c6c150e1..6734f3c78fb 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -50,8 +50,7 @@ ENDFOREACH() IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure - config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) + FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) diff --git a/support-files/db.opt b/support-files/db.opt new file mode 100644 index 00000000000..d8429c4e0de --- /dev/null +++ b/support-files/db.opt @@ -0,0 +1,2 @@ +default-character-set=latin1 +default-collation=latin1_swedish_ci |