diff options
| author | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
| commit | 67ea8aac5e9e9ae98a22aff063c48053ea68e5de (patch) | |
| tree | 788ab6bf4fc7ac236c7c862ab122f19dcdd83768 /scripts | |
| parent | d212d76094f83b1b7ce0692663439f3a67a432ad (diff) | |
| parent | 6b465557670093b038cb3d2be930e6a036292192 (diff) | |
| download | mariadb-git-67ea8aac5e9e9ae98a22aff063c48053ea68e5de.tar.gz | |
merge with 4.0 (to get compiler error fixes for innodb)
client/mysqltest.c:
Auto merged
include/errmsg.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/que/que0que.c:
Auto merged
mysql-test/t/rpl000009.test:
Auto merged
sql/set_var.cc:
Auto merged
libmysql/errmsg.c:
merge with 4.0
libmysql/libmysql.c:
merge with 4.0
mysql-test/mysql-test-run.sh:
merge with 4.0
mysql-test/r/rpl000009.result:
merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
merge with 4.0
sql/repl_failsafe.cc:
merge with 4.0
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" |