diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 11:32:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 11:32:43 +0300 |
| commit | 882ce206dbf06b771ffe4cbce2e3e4214982f302 (patch) | |
| tree | 63b3d1314bf9ab4d8c7fe314818c6349c127f877 /support-files | |
| parent | 6ab6b1510ed0851bda335a8919047c02860fe2e8 (diff) | |
| parent | d7c82610c14f5102258640c73c1d78ea22f942c3 (diff) | |
| download | mariadb-git-882ce206dbf06b771ffe4cbce2e3e4214982f302.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support-files/use_galera_new_cluster.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 001b91a4b0c..0e5a62a9514 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -30,7 +30,7 @@ ELSE() SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) SET(MYSQLD_USER "mysql") SET(ini_file_extension "cnf") - SET(HOSTNAME "hostname") + SET(HOSTNAME "uname -n") ENDIF() # XXX: shouldn't we just have variables for all this stuff and centralise diff --git a/support-files/use_galera_new_cluster.conf b/support-files/use_galera_new_cluster.conf index 4d8ad253ce5..79d191094d4 100644 --- a/support-files/use_galera_new_cluster.conf +++ b/support-files/use_galera_new_cluster.conf @@ -15,6 +15,7 @@ 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 @@ -22,4 +23,5 @@ 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= |