database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Small changes to mysql_config.sh

Browse Source 
Docs/manual.texi:
  Changelog
scripts/mysql_config.sh:
  Fix script to search in different directories for include and lib
This commit is contained in:
unknown
2001-12-05 23:56:56 +02:00
parent 2a74eb824f
commit 6f8f45e959
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Docs/manual.texi
View File

@ -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. not yet 100% confident in this code.
@menu @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.46:: Changes in release 3.23.46
* News-3.23.45:: Changes in release 3.23.45 * News-3.23.45:: Changes in release 3.23.45
* News-3.23.44:: Changes in release 3.23.44 * News-3.23.44:: Changes in release 3.23.44
@ -46836,9 +46836,12 @@ not yet 100% confident in this code.
@end menu @end menu
@node News-3.23.47, News-3.23.46, News-3.23.x, News-3.23.x @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 @itemize @bullet
@item
Fixed bug when using @code{t1 LEFT JOIN t2 ON t2.key=constant}. 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 @end itemize
@node News-3.23.46, News-3.23.45, News-3.23.47, News-3.23.x @node News-3.23.46, News-3.23.45, News-3.23.47, News-3.23.x

28
scripts/mysql_config.sh
View File

@ -37,20 +37,32 @@ which ()
IFS="$save_ifs" 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 () fix_path ()
{ {
eval path=\$"$1" var=$1
if [ ! -f "$path" ] ; shift
then for filename
eval "$1"=$basedir/$2 do
fi path=$basedir/$filename
if [ -d "$path" ] ;
then
eval "$var"=$path
return
fi
done
} }
abs_path=`expr \( substr $0 1 1 \) = '/'` abs_path=`expr \( substr $0 1 1 \) = '/'`
if [ "x$abs_path" = "x1" ] ; then if [ "x$abs_path" = "x1" ] ; then
me=$0 me=$0
else else
me=`which mysql_config` me=`which $0`
fi fi
basedir=`echo $me | sed -e 's;/bin/mysql_config;;'` basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
@ -59,9 +71,9 @@ ldata='@localstatedir@'
execdir='@libexecdir@' execdir='@libexecdir@'
bindir='@bindir@' bindir='@bindir@'
pkglibdir='@pkglibdir@' pkglibdir='@pkglibdir@'
fix_path pkglibdir lib/mysql fix_path pkglibdir lib/mysql lib
pkgincludedir='@pkgincludedir@' pkgincludedir='@pkgincludedir@'
fix_path pkgincludedir include/mysql fix_path pkgincludedir include/mysql include
version='@VERSION@' version='@VERSION@'
socket='@MYSQL_UNIX_ADDR@' socket='@MYSQL_UNIX_ADDR@'
port='@MYSQL_TCP_PORT@' port='@MYSQL_TCP_PORT@'