diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-09-09 13:41:22 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-09-09 13:41:22 -0400 |
commit | e5267cae8ae4e09aaedeba0fea8408585f1f409f (patch) | |
tree | 2a430ad4de02ad60e513485c9b96ff19e0101d10 /sql/sys_vars.cc | |
parent | 140fd7adbdf5a998c5e984d3b8e3737587efc680 (diff) | |
download | mariadb-git-e5267cae8ae4e09aaedeba0fea8408585f1f409f.tar.gz |
MDEV-6717 : wsrep_data_home_dir should default to @@datadir
Used mysql_real_data_home as wsrep_data_home_dir's default.
Added a test case.
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 8fbd96ed662..0868d0ebdfd 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3707,7 +3707,7 @@ static Sys_var_charptr Sys_wsrep_provider_options( static Sys_var_charptr Sys_wsrep_data_home_dir( "wsrep_data_home_dir", "home directory for wsrep provider", READ_ONLY GLOBAL_VAR(wsrep_data_home_dir), CMD_LINE(REQUIRED_ARG), - IN_FS_CHARSET, DEFAULT(""), + IN_FS_CHARSET, DEFAULT(mysql_real_data_home), NO_MUTEX_GUARD, NOT_IN_BINLOG); static Sys_var_charptr Sys_wsrep_cluster_name( |