diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
| commit | e61568ee9305c6c93c1a9f298a7fe04532881f24 (patch) | |
| tree | c80b0967460f7c4f8743831690f7369e11c73722 /support-files | |
| parent | 4b0cedf82d8d8ba582648dcb4a2620c146862a43 (diff) | |
| parent | c3289d27eef39a47fed2ce1ff239013ed6870f39 (diff) | |
| download | mariadb-git-e61568ee9305c6c93c1a9f298a7fe04532881f24.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 1 | ||||
| -rw-r--r-- | support-files/policy/selinux/mariadb-server.fc | 2 | ||||
| -rw-r--r-- | support-files/policy/selinux/mariadb-server.te | 2 | ||||
| -rw-r--r-- | support-files/wsrep.cnf.sh | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 52184baef7e..b5767432fc2 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -41,10 +41,12 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} +IF(WITH_WSREP) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh + ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} DESTINATION ${inst_location} COMPONENT IniFiles) +ENDIF() IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 342929d2ecd..0a81b71171a 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -25,7 +25,6 @@ # Description: MariaDB is a very fast and reliable SQL database engine. ### END INIT INFO -# If you install MariaDB on some other places than @prefix@, then you # have to do one of the following things for this script to work: # # - Run this script from within the MariaDB installation directory diff --git a/support-files/policy/selinux/mariadb-server.fc b/support-files/policy/selinux/mariadb-server.fc index 1a69ecc2c40..409f72923aa 100644 --- a/support-files/policy/selinux/mariadb-server.fc +++ b/support-files/policy/selinux/mariadb-server.fc @@ -1,4 +1,4 @@ -# This SELinux file contexts (.fc) file has been copied under BSD License from +# This SELinux file contexts (.fc) file has been copied under New BSD License from # Percona XtraDB Cluster. /etc/init\.d/rc\.d/mysql -- gen_context(system_u:object_r:mysqld_initrc_exec_t,s0) diff --git a/support-files/policy/selinux/mariadb-server.te b/support-files/policy/selinux/mariadb-server.te index 34d79326b10..45ef40f4153 100644 --- a/support-files/policy/selinux/mariadb-server.te +++ b/support-files/policy/selinux/mariadb-server.te @@ -1,4 +1,4 @@ -# This SELinux type enforcement (.te) file has been copied under BSD License +# This SELinux type enforcement (.te) file has been copied under New BSD License # from Percona XtraDB Cluster, along with some additions. module mariadb-server 1.0; diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh index a5390855ca1..51ce3dca2dd 100644 --- a/support-files/wsrep.cnf.sh +++ b/support-files/wsrep.cnf.sh @@ -30,6 +30,9 @@ bind-address=0.0.0.0 ## WSREP options ## +# Enable wsrep +wsrep_on=1 + # Full path to wsrep provider library or 'none' wsrep_provider=none |