Small changes to mysql_config.sh (0f71e337) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+5 −2

Original line number	Diff line number	Diff line
		@@ -46784,7 +46784,7 @@ users use this code as the rest of the code and because of this we are
		not yet 100% confident in this code.

		@menu
		* News-3.23.47::
		* News-3.23.47:: Changes in release 3.23.47
		* News-3.23.46:: Changes in release 3.23.46
		* News-3.23.45:: Changes in release 3.23.45
		* News-3.23.44:: Changes in release 3.23.44
		@@ -46836,9 +46836,12 @@ not yet 100% confident in this code.
		@end menu

		@node News-3.23.47, News-3.23.46, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.46
		@appendixsubsec Changes in release 3.23.47
		@itemize @bullet
		@item
		Fixed bug when using @code{t1 LEFT JOIN t2 ON t2.key=constant}.
		@item
		@code{mysqlconfig} now also work with binary (relocated) distributions.
		@end itemize

		@node News-3.23.46, News-3.23.45, News-3.23.47, News-3.23.x

+20 −8

Original line number	Diff line number	Diff line
		@@ -37,20 +37,32 @@ which ()
		IFS="$save_ifs"
		}

		#
		# If we can find the given directory relatively to where mysql_config is
		# we should use this instead of the incompiled one.
		# This is to ensure that this script also works with the binary MySQL
		# version

		fix_path ()
		{
		eval path=\$"$1"
		if [ ! -f "$path" ] ;
		var=$1
		shift
		for filename
		do
		path=$basedir/$filename
		if [ -d "$path" ] ;
		then
		eval "$1"=$basedir/$2
		eval "$var"=$path
		return
		fi
		done
		}

		abs_path=`expr $ substr $0 1 1 $ = '/'`
		if [ "x$abs_path" = "x1" ] ; then
		me=$0
		else
		me=`which mysql_config`
		me=`which $0`
		fi

		basedir=`echo $me \| sed -e 's;/bin/mysql_config;;'`
		@@ -59,9 +71,9 @@ ldata='@localstatedir@'
		execdir='@libexecdir@'
		bindir='@bindir@'
		pkglibdir='@pkglibdir@'
		fix_path pkglibdir lib/mysql
		fix_path pkglibdir lib/mysql lib
		pkgincludedir='@pkgincludedir@'
		fix_path pkgincludedir include/mysql
		fix_path pkgincludedir include/mysql include
		version='@VERSION@'
		socket='@MYSQL_UNIX_ADDR@'
		port='@MYSQL_TCP_PORT@'