database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merged revisions 3418..3424 from mariadb-galera-5.5

Browse Source
This commit is contained in:
Seppo Jaakola
2013-10-07 08:57:23 +03:00
parent 06a7eeb992
commit 255e20a175
18 changed files with 185 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/wsrep_utils.cc
View File

@ -359,7 +359,7 @@ size_t guess_ip (char* buf, size_t buf_len)
const char cmd[] = "/sbin/ifconfig -a | "
"/usr/gnu/bin/grep -m1 -1 -E 'net[0-9]:' | tail -n 1 | awk '{ print $2 }'";
#elif defined(__APPLE__) || defined(__FreeBSD__)
const char cmd[] = "route -nv get 8.8.8.8 | tail -n1 | awk '{print $5}'";
const char cmd[] = "/sbin/route -nv get 8.8.8.8 | tail -n1 | awk '{print $(NF)}'";
#else
char *cmd;
#error "OS not supported"