merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6

and a number of fixes to make this buildable. 
Run also few short multi-master high conflict rate tests, with no issues

1 files changed, 6 insertions, 4 deletions

diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc
index 90af2fb8156..fae9d97eedd 100644
--- a/sql/wsrep_utils.cc
+++ b/sql/wsrep_utils.cc
@@ -361,7 +361,7 @@ unsigned int wsrep_check_ip (const char* const addr)
   return ret;
 }
 
-extern const char* my_bind_addr_str;
+extern char* my_bind_addr_str;
 extern uint        mysqld_port;
 
 size_t wsrep_guess_ip (char* buf, size_t buf_len)
@@ -404,8 +404,10 @@ 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[] = "ip addr show | grep -E '^\\s*inet' | grep -m1 global |"
-                     " awk '{ print $2 }' | sed 's/\\/.*//'";
+  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 }'";
 #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 }'";
@@ -508,7 +510,7 @@ wsrep_seqno_t wsrep_xid_seqno(const XID* xid)
   }
 }
 
-extern "C"
+extern
 int wsrep_is_wsrep_xid(const void* xid_ptr)
 {
   const XID* xid= reinterpret_cast<const XID*>(xid_ptr);