MDEV-9007: systemd - service mariadb bootstrap

Now this error out and refers to galera_new_cluster.
This commit is contained in:
Daniel Black 2015-10-25 11:22:12 +11:00 committed by Nirbhay Choubey
parent a2c3549404
commit d8ecc2a011
3 changed files with 5 additions and 2 deletions

View file

@ -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

View file

@ -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

View file

@ -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.. "