[Commits] d8ecc2a: MDEV-9007: systemd - service mariadb bootstrap

Nirbhay Choubey nirbhay at mariadb.com
Tue Nov 3 06:37:04 EET 2015


revision-id: d8ecc2a0115f7179a30d772f104bd4cb5b15be20
parent(s): a2c3549404cbdc55aaaa8537739853d7369aa79a
committer: Nirbhay Choubey
branch nick: 10.1
timestamp: 2015-11-02 23:37:03 -0500
message:

MDEV-9007: systemd - service mariadb bootstrap

Now this error out and refers to galera_new_cluster.

---
 support-files/CMakeLists.txt      | 2 +-
 support-files/mariadb at .service.in | 1 -
 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 eff2be3..2ab4350 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 at .service.in
                      ${CMAKE_CURRENT_BINARY_DIR}/mariadb at .service @ONLY)
       INSTALL(FILES use_galera_new_cluster.conf
diff --git a/support-files/mariadb at .service.in b/support-files/mariadb at .service.in
index 4555df8..d4a05b7 100644
--- a/support-files/mariadb at .service.in
+++ b/support-files/mariadb at .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 385feaf..6e1784f 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.. "


More information about the commits mailing list