diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 22:48:40 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 22:48:40 +0200 |
| commit | e51a884e9c364a1c5276754871cf7267316c392c (patch) | |
| tree | 7fb6870f28e4b00564effeb28548f7a607d63cc0 /sql/wsrep_mysqld.h | |
| parent | 18c97eea5cc53962c5148eb9f42d6764c8629949 (diff) | |
| download | mariadb-git-e51a884e9c364a1c5276754871cf7267316c392c.tar.gz | |
References lp:1115708 - merged with wsrep branch, revision 3845
bzr merge -r3840..3845 lp:~codership/codership-mysql/5.5-23
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 4 |
1 files changed, 3 insertions, 1 deletions
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) |