Skip to content
Permalink
Browse files

mysql_install_db: assume builddir is dirname0

The assumption in the original commit for --builddir (648d3ce),
was to assume that without a --builddir, and when --srcdir
is specified, that the builddir is the same as the srcdir.

The problem is that this assumption does not hold for out-of-source
builds and we can figure out the builddir by looking for where
mysql_install_db script is.

As mysql_install_db is in the builddir, we use dirname0 as the builddir after
checking that my_print_defaults is also located from dirname0, otherwise
default to old behavior.
  • Loading branch information...
grooverdan authored and cvicentiu committed Apr 14, 2019
1 parent 69be8f3 commit d890c45b62c0d841b464a0d3539f2c99f241aacf
Showing with 6 additions and 1 deletion.
  1. +6 −1 scripts/mysql_install_db.sh
@@ -245,7 +245,12 @@ if test -n "$srcdir"
then
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"

0 comments on commit d890c45

Please sign in to comment.
You can’t perform that action at this time.