diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 22:42:35 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 22:42:35 +0200 |
| commit | d97342b6f2cfdd55eb0f82b390ebc89c5997c382 (patch) | |
| tree | 238dbb11c51a2352c99de198586b84f260b3aad9 /scripts/mysql_install_db.sh | |
| parent | 00a254cc069e77f2088f6fbf8c367f247cfdd0dc (diff) | |
| parent | 32c6f40a6319d493e5270c72ac5d27dc99d1b242 (diff) | |
| download | mariadb-git-d97342b6f2cfdd55eb0f82b390ebc89c5997c382.tar.gz | |
Merge branch '10.2' into 10.3
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 d315248ce9c..025e4439940 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" |