diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 20:18:30 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 20:18:30 +0300 |
commit | 609388fcfd912c9c2cb03a92251469a25a781893 (patch) | |
tree | 9135fdc6e31e1e784fbdbcc35ae63003d0600824 /sql/wsrep_utils.cc | |
parent | e0015163515d1fe5d3747c6f859461a30c2ecfd6 (diff) | |
download | mariadb-git-609388fcfd912c9c2cb03a92251469a25a781893.tar.gz |
Merged changes from lp:codership-mysql up to rev 3743
-r3725..3737
-r3738..3740
-r3741..3743
Diffstat (limited to 'sql/wsrep_utils.cc')
-rw-r--r-- | sql/wsrep_utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index f39353eda44..a6d7dcdbfc8 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -332,7 +332,7 @@ size_t default_ip (char* buf, size_t buf_len) "awk '{ print $2 }' | awk -F : '{ print $2 }'"; #elif defined(__sun__) const char cmd[] = "/sbin/ifconfig -a | " - "grep -m1 -1 -E 'net[0-9]:' | tail -n 1 | awk '{ print $2 }'"; + "/usr/gnu/bin/grep -m1 -1 -E 'net[0-9]:' | tail -n 1 | awk '{ print $2 }'"; #else char *cmd; #error "OS not supported" |