diff options
| author | monty@mysql.com <> | 2004-03-19 15:17:56 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-19 15:17:56 +0200 |
| commit | 933278a52bb107feab2d4dcfd8b5ba9f51cc1896 (patch) | |
| tree | 788ab6bf4fc7ac236c7c862ab122f19dcdd83768 /scripts | |
| parent | 00630a2640dff553961d31da7476b328633ea7ec (diff) | |
| parent | f375eb50f86bee97281819d8360ab14f685ba12f (diff) | |
| download | mariadb-git-933278a52bb107feab2d4dcfd8b5ba9f51cc1896.tar.gz | |
merge with 4.0 (to get compiler error fixes for innodb)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index d4291e7f496..39a4554be77 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -13,6 +13,7 @@ args="" port="" socket="" database="mysql" +bindir="" file=mysql_fix_privilege_tables.sql @@ -40,6 +41,7 @@ parse_arguments() { --port=*) port=`echo "$arg" | sed -e "s;--port=;;"` ;; --socket=*) socket=`echo "$arg" | sed -e "s;--socket=;;"` ;; --database=*) database=`echo "$arg" | sed -e "s;--database=;;"` ;; + --bindir=*) bindir=`echo "$arg" | sed -e "s;--bindir=;;"` ;; *) if test -n "$pick_args" then @@ -76,11 +78,17 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@" if test -z "$basedir" then basedir=@prefix@ - bindir=@bindir@ + if test -z "$bindir" + then + bindir=@bindir@ + fi execdir=@libexecdir@ pkgdatadir=@pkgdatadir@ else - bindir="$basedir/bin" + if test -z "$bindir" + then + bindir="$basedir/bin" + fi if test -x "$basedir/libexec/mysqld" then execdir="$basedir/libexec" |