diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-09-09 13:43:01 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-09-09 13:43:01 -0400 |
| commit | 4ffccff45dfb8e1856c5582913d31c7e18c2f788 (patch) | |
| tree | 0bb68482a755a0543aefb1cf562d7297f8d7ff89 /sql | |
| parent | f3e95caacdd366d2c1300a7044b05d5a91ca1ffa (diff) | |
| download | mariadb-git-4ffccff45dfb8e1856c5582913d31c7e18c2f788.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')
| -rw-r--r-- | sql/sys_vars.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 7954ef3e2eb..4236b37e4e3 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4506,7 +4506,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( diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 7bf2cdda34f..f2ef776e5a0 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -559,9 +559,6 @@ int wsrep_init() wsrep->provider_vendor, sizeof(provider_vendor) - 1); } - if (!wsrep_data_home_dir || strlen(wsrep_data_home_dir) == 0) - wsrep_data_home_dir = mysql_real_data_home; - char node_addr[512]= { 0, }; size_t const node_addr_max= sizeof(node_addr) - 1; if (!wsrep_node_address || !strcmp(wsrep_node_address, "")) |