diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-28 13:43:26 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-28 13:43:26 +0200 |
| commit | 2792c6e7b057b18c19b506f37c35716529f80979 (patch) | |
| tree | cead6068286ee469dbfe33a28d4585742eb26cbb /scripts/mysql_install_db.sh | |
| parent | c0743e4b0056eba0b19a19458c85e52a83cef676 (diff) | |
| parent | 4b5a14d0fe3d6945a0a9516261f563dcfd1f2c9c (diff) | |
| download | mariadb-git-2792c6e7b057b18c19b506f37c35716529f80979.tar.gz | |
Merge branch '10.3' into 10.4
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 c68e34020cd..253cad72e0b 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -272,9 +272,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" |