diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-07-22 09:27:35 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-07-22 09:27:35 -0400 |
| commit | 7b69cab89163a8d6e1a7a5cdcb66a66366136d7c (patch) | |
| tree | 697bb6bb4e7651fed33826ca71c0c51ec0e908f6 /sql/wsrep_var.h | |
| parent | 0dadd017501e379546ffe3edae7728b931007be0 (diff) | |
| download | mariadb-git-7b69cab89163a8d6e1a7a5cdcb66a66366136d7c.tar.gz | |
MDEV-4647: Crash on setting wsep system variables to default
The variables' ON_CHECK functions relied on set_var's "value"
member, which is NULL for SET ... =default. Fixed by using
save_result instead.
Also, for many wsrep variables, pointers to their respective
global variables were used to provide default values. The patch
fixes this by using appropriate macros and string literals.
Diffstat (limited to 'sql/wsrep_var.h')
| -rw-r--r-- | sql/wsrep_var.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h index b69f670a14b..2a5e94b6724 100644 --- a/sql/wsrep_var.h +++ b/sql/wsrep_var.h @@ -16,7 +16,9 @@ #ifndef WSREP_VAR_H #define WSREP_VAR_H -#define WSREP_NODE_INCOMING_AUTO "AUTO" +#define WSREP_CLUSTER_NAME "my_wsrep_cluster" +#define WSREP_NODE_INCOMING_AUTO "AUTO" +#define WSREP_START_POSITION_ZERO "00000000-0000-0000-0000-000000000000:-1" // MySQL variables funcs |