summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/ha_innodb.cc
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2018-08-21 15:58:09 +0300
committerGitHub <noreply@github.com>2018-08-21 15:58:09 +0300
commitb87b8c13445a631de28e47a8f4ccdc10c47534d4 (patch)
treea2f5ecb5bd26ea3c443c86de11530c3dccc6cf28 /storage/innobase/handler/ha_innodb.cc
parentdc7c080369472f6f33344299d2e3d01619edf885 (diff)
parent4ff7f14feffc8cbb685910ecd595095629f7a764 (diff)
downloadmariadb-git-b87b8c13445a631de28e47a8f4ccdc10c47534d4.tar.gz
Merge pull request #828 from tempesta-tech/sysprg/10.1-MDEV-10754
MDEV-10754 wsrep_sst_rsync does not support innodb_data_home_dir
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
-rw-r--r--storage/innobase/handler/ha_innodb.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 3d569a2d1d7..d134d157945 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -3623,6 +3623,12 @@ innobase_init(
srv_data_home = (innobase_data_home_dir ? innobase_data_home_dir :
default_path);
+#ifdef WITH_WSREP
+ /* If we use the wsrep API, then we need to tell the server
+ the path to the data files (for passing it to the SST scripts): */
+ wsrep_set_data_home_dir(innobase_data_home_dir);
+#endif /* WITH_WSREP */
+
/* Set default InnoDB data file size to 12 MB and let it be
auto-extending. Thus users can use InnoDB in >= 4.0 without having
to specify any startup options. */