mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Merge 10.0.14 into 10.1
This commit is contained in:
@@ -76,7 +76,8 @@ get_full_path ()
|
||||
|
||||
me=`get_full_path $0`
|
||||
|
||||
basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
|
||||
# Script might have been renamed but assume mysql_<something>config<something>
|
||||
basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
|
||||
|
||||
ldata='@localstatedir@'
|
||||
execdir='@libexecdir@'
|
||||
@@ -85,11 +86,11 @@ bindir='@bindir@'
|
||||
# If installed, search for the compiled in directory first (might be "lib64")
|
||||
pkglibdir='@pkglibdir@'
|
||||
pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
|
||||
fix_path pkglibdir $pkglibdir_rel lib64/mysql lib64 lib/mysql lib
|
||||
fix_path pkglibdir $pkglibdir_rel @libsubdir@/mysql @libsubdir@
|
||||
|
||||
plugindir='@pkgplugindir@'
|
||||
plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
|
||||
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
|
||||
fix_path plugindir $plugindir_rel @libsubdir@/mysql/plugin @libsubdir@/plugin
|
||||
|
||||
pkgincludedir='@pkgincludedir@'
|
||||
fix_path pkgincludedir include/mysql
|
||||
@@ -131,10 +132,10 @@ Options:
|
||||
pkglibdir [$pkglibdir]
|
||||
plugindir [$plugindir]
|
||||
EOF
|
||||
exit 0
|
||||
exit $1
|
||||
}
|
||||
|
||||
if test $# -le 0; then usage; fi
|
||||
if test $# -le 0; then usage 0 ; fi
|
||||
|
||||
while test $# -gt 0; do
|
||||
case $1 in
|
||||
@@ -153,10 +154,10 @@ while test $# -gt 0; do
|
||||
pkgincludedir) echo "$pkgincludedir" ;;
|
||||
pkglibdir) echo "$pkglibdir" ;;
|
||||
plugindir) echo "$plugindir" ;;
|
||||
*) usage ;;
|
||||
*) usage 1 >&2 ;;
|
||||
esac
|
||||
;;
|
||||
*) usage ;;
|
||||
*) usage 1 >&2 ;;
|
||||
esac
|
||||
|
||||
shift
|
||||
|
Reference in New Issue
Block a user