Merge branch '10.1' of https://github.com/MariaDB/server into 10.1

MariaDB · Sep 23, 2020 · 88c5c31 · 88c5c31
2 parents 053653a + 4c19227
commit 88c5c31
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/support-files/use_galera_new_cluster.conf b/support-files/use_galera_new_cluster.conf
@@ -15,8 +15,13 @@ ConditionPathExists=
 Type=oneshot
 Restart=no
 
+# Don't install or try to prepare for galera SST.
+ExecStartPre=
+
 # Override the multi instance service for a bootstrap start instance
 ExecStart=
 ExecStart=/usr/bin/echo "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster"
 ExecStart=/usr/bin/false
 
+# This isn't a service meant to execute anything but a message
+ExecStartPost=