diff options
| author | Geert Hendrickx <geert@hendrickx.be> | 2020-08-27 17:30:03 +0200 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-08-27 17:48:08 +0200 |
| commit | c21adee882d0069203d0ebf228aed81ef027de77 (patch) | |
| tree | 4f07ba089572c9363e25cb83cbf9fe1b78cbbb9e | |
| parent | fe5dbfe723427a3606c41409626dc853f997e679 (diff) | |
| download | mariadb-git-bb-10.5-anel-PR663-uname.tar.gz | |
MDEV:23589: Portability: use `uname -n` instead of `hostname`bb-10.5-anel-PR663-uname
PR 1663
| -rw-r--r-- | scripts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 1 | ||||
| -rw-r--r-- | support-files/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 9c4fdf6a234..8d6a486a29d 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -173,7 +173,7 @@ ELSE() SET(CHECK_PID "kill -s SIGCONT $PID > /dev/null 2> /dev/null") ENDIF() -SET(HOSTNAME "hostname") +SET(HOSTNAME "uname -n") SET(MYSQLD_USER "mysql") ENDIF(UNIX) diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 4a5e5bc7e52..67d220637f7 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -28,6 +28,7 @@ local_ip() [ "$1" = "127.0.0.2" ] && return 0 [ "$1" = "localhost" ] && return 0 [ "$1" = "[::1]" ] && return 0 + [ "$1" = "$(uname -n)" ] && return 0 [ "$1" = "$(hostname -s)" ] && return 0 [ "$1" = "$(hostname -f)" ] && return 0 [ "$1" = "$(hostname -d)" ] && return 0 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 |