diff options
| author | unknown <konstantin@mysql.com> | 2006-03-30 18:43:42 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-03-30 18:43:42 +0400 |
| commit | 0b098ca2625e0e57fabbb8e3ed3ffd6482198d56 (patch) | |
| tree | e3d33fa43591b7e3198be0a8da21e71368a5391a /scripts | |
| parent | 83a208d4966b5c3e236bd46b4eb3d0b327ba3bec (diff) | |
| parent | 686b42da4de324d17d41307bdf7100ef829c34af (diff) | |
| download | mariadb-git-0b098ca2625e0e57fabbb8e3ed3ffd6482198d56.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_load.cc:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_config.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 4d732485b1d..84ff518c381 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -82,10 +82,15 @@ basedir=`echo $me | sed -e 's;/bin/mysql_config;;'` ldata='@localstatedir@' execdir='@libexecdir@' bindir='@bindir@' + +# If installed, search for the compiled in directory first (might be "lib64") pkglibdir='@pkglibdir@' -fix_path pkglibdir lib/mysql lib +pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` +fix_path pkglibdir $pkglibdir_rel lib/mysql lib + pkgincludedir='@pkgincludedir@' fix_path pkgincludedir include/mysql include + version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' port='@MYSQL_TCP_PORT@' |