diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2015-10-25 11:22:12 +1100 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-02 23:37:03 -0500 |
| commit | d8ecc2a0115f7179a30d772f104bd4cb5b15be20 (patch) | |
| tree | 7ce87267657d1c66817c11b81c3b1f96ef0724c9 | |
| parent | a2c3549404cbdc55aaaa8537739853d7369aa79a (diff) | |
| download | mariadb-git-d8ecc2a0115f7179a30d772f104bd4cb5b15be20.tar.gz | |
MDEV-9007: systemd - service mariadb bootstrap
Now this error out and refers to galera_new_cluster.
| -rw-r--r-- | support-files/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support-files/mariadb@.service.in | 1 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index eff2be375b4..2ab43503010 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -79,7 +79,7 @@ IF(UNIX) IF(HAVE_SYSTEMD) CONFIGURE_FILE(mariadb.service.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service @ONLY) - IF(CMAKE_VERSION VERSION_LESS 3.3.0) + IF(NOT RPM) CONFIGURE_FILE(mariadb@.service.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) INSTALL(FILES use_galera_new_cluster.conf diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 4555df81e39..d4a05b76ae4 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -61,7 +61,6 @@ PermissionsStartOnly=true # This isn't a replacement for my.cnf. # _WSREP_NEW_CLUSTER is for the exclusive use of the script galera_new_cluster -ExecStart= ExecStart=/usr/sbin/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER --defaults-file=@INSTALL_SYSCONF2DIR@/my%I.cnf # Alternate: (remove ConditionPathExists above) # use [mysqld.INSTANCENAME] as sections in my.cnf diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 385feaf75a5..6e1784fe530 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -443,6 +443,10 @@ case "$mode" in exit $r ;; 'bootstrap') + if test "$_use_systemctl" == 1 ; then + log_failure_msg "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster" + exit 1 + fi # Bootstrap the cluster, start the first node # that initiate the cluster echo $echo_n "Bootstrapping the cluster.. " |