diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 07:03:39 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 07:03:39 +0200 |
| commit | cf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b (patch) | |
| tree | 0e9c8d48fda7b7494b5d3b220bc6af64e4f3e64a /scripts/mysql_install_db.sh | |
| parent | fc77a66c7eb1b8e90753814aa567daeaabd0dd90 (diff) | |
| parent | 584d213235704113cf0d70319c0521d93b8744c6 (diff) | |
| download | mariadb-git-cf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 1560f887620..b2e38ae6641 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -274,9 +274,16 @@ then fi if test -n "$srcdir" then + # In an out-of-source build, builddir is not srcdir. Try to guess where + # builddir is by looking for my_print_defaults. if test -z "$builddir" then - builddir="$srcdir" + if test -x "$dirname0/extra/my_print_defaults" + then + builddir="$dirname0" + else + builddir="$srcdir" + fi fi print_defaults="$builddir/extra/my_print_defaults" elif test -n "$basedir" |