database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merged patch for lp:1167368 from maria-5.5-galera.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-12-08 23:44:53 -05:00
parent 3bb02f3e6d
commit e51e5e940c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/wsrep_utils.cc
View File

@ -407,10 +407,8 @@ size_t wsrep_guess_ip (char* buf, size_t buf_len)
// try to find the address of the first one
#if (TARGET_OS_LINUX == 1)
const char cmd[] = "/sbin/ifconfig | "
// "grep -m1 -1 -E '^[a-z]?eth[0-9]' | tail -n 1 | "
"grep -E '^[[:space:]]+inet addr:' | grep -m1 -v 'inet addr:127' | "
"sed 's/:/ /' | awk '{ print $3 }'";
const char cmd[] = "ip addr show | grep -E '^[[:space:]]*inet' | grep -m1 global |"
" awk '{ print $2 }' | sed -e 's/\\/.*//'";
#elif defined(__sun__)
const char cmd[] = "/sbin/ifconfig -a | "
"/usr/gnu/bin/grep -m1 -1 -E 'net[0-9]:' | tail -n 1 | awk '{ print $2 }'";