From e51a884e9c364a1c5276754871cf7267316c392c Mon Sep 17 00:00:00 2001
From: Seppo Jaakola <seppo.jaakola@codership.com>
Date: Tue, 5 Feb 2013 22:48:40 +0200
Subject: References lp:1115708 - merged with wsrep branch, revision 3845 bzr
 merge -r3840..3845 lp:~codership/codership-mysql/5.5-23

---
 sql/wsrep_mysqld.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sql/wsrep_mysqld.h')

diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h
index e9cd227efcf..0709a2c1f34 100644
--- a/sql/wsrep_mysqld.h
+++ b/sql/wsrep_mysqld.h
@@ -114,7 +114,9 @@ extern const char* wsrep_provider_vendor;
 extern int         wsrep_show_status(THD *thd, SHOW_VAR *var, char *buff);
 extern void        wsrep_free_status(THD *thd);
 
-#define WSREP_SST_ADDRESS_AUTO "AUTO"
+#define WSREP_SST_ADDRESS_AUTO   "AUTO"
+#define WSREP_NODE_INCOMING_AUTO "AUTO"
+
 // MySQL variables funcs
 
 #define CHECK_ARGS   (sys_var *self, THD* thd, set_var *var)
-- 
cgit v1.2.1