diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 22:42:35 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 22:42:35 +0200 |
commit | 78829a5780d3e48da376c1ca4e62731da450c551 (patch) | |
tree | 6561f2b6f09662220b9965bb14d745f69a4ecd34 /sql/wsrep_sst.cc | |
parent | d6ba8496175a2dd85d772f8486eb032c31969f59 (diff) | |
parent | 947b6b849d907dc0793f076aec7e553869db744f (diff) | |
download | mariadb-git-78829a5780d3e48da376c1ca4e62731da450c551.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/wsrep_sst.cc')
-rw-r--r-- | sql/wsrep_sst.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 4e3a7072629..afbcd4d6c52 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -60,12 +60,7 @@ bool wsrep_sst_method_check (sys_var *self, THD* thd, set_var* var) return 0; } -bool wsrep_sst_method_update (sys_var *self, THD* thd, enum_var_type type) -{ - return 0; -} - -static const char* data_home_dir= NULL; +static const char* data_home_dir; void wsrep_set_data_home_dir(const char *data_dir) { |