diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-25 13:27:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-25 13:27:11 +0200 |
| commit | ae476868a5394041a00e75a29c7d45917e8dfae8 (patch) | |
| tree | b2f82005fe87bc5ce1ea92504b505a9d4e8b9781 /scripts/mysql_install_db.sh | |
| parent | 8d0dabc56b09c6b40db15aac7da0da43d988759d (diff) | |
| parent | 2536c0b1ebf6c5012ae34435d82fb2f5fa54aea5 (diff) | |
| download | mariadb-git-ae476868a5394041a00e75a29c7d45917e8dfae8.tar.gz | |
Merge branch '5.5' into 10.1
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 0afbca87c20..1479ffc0443 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -273,9 +273,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" |