From eadebef273f7095d0f1ee977489a662704d19d08 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Jan 2002 00:43:50 +0200 Subject: Fixed bug when making a range join based on information from a const table. Docs/manual.texi: Changelog mysql-test/r/join.result: Test of join bug mysql-test/t/join.test: Test of join bug mysys/hash.c: Fix for SUNPRO_C scripts/mysql_config.sh: Fix for MacOS X --- scripts/mysql_config.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index af11957576b..9320efdd2a1 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -58,12 +58,16 @@ fix_path () done } -abs_path=`expr \( substr $0 1 1 \) = '/'` -if [ "x$abs_path" = "x1" ] ; then - me=$0 -else - me=`which $0` -fi +get_full_path () +{ + case $1 in + /*) echo "$1";; + ./*) tmp=`pwd`/$1; echo $tmp | sed -e 's;/./;/;' ;; + *) which $1 ;; + esac +} + +me=`get_full_path $0` basedir=`echo $me | sed -e 's;/bin/mysql_config;;'` @@ -81,6 +85,7 @@ ldflags='@LDFLAGS@' client_libs='@CLIENT_LIBS@' libs="$ldflags -L'$pkglibdir' -lmysqlclient $client_libs" +libs=`echo $libs | sed -e 's; +;;'` cflags="-I'$pkgincludedir'" usage () { -- cgit v1.2.1