database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
This commit is contained in:
unknown
2006-11-15 10:03:54 -05:00
parent cab0dc6544 78278bc4f5
commit ce51ceb5e1
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/mysql_fix_privilege_tables.sh
View File

@ -120,9 +120,6 @@ then
fi fi
cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host" cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"
if test ! -z "$password" ; then
cmd="$cmd --password=$password"
fi
if test ! -z "$port"; then if test ! -z "$port"; then
cmd="$cmd --port=$port" cmd="$cmd --port=$port"
fi fi
@ -178,11 +175,22 @@ then
s_echo "" s_echo ""
fi fi
run_cmd() {
# Password argument is added here to allow for spaces in password.
if test ! -z "$password"
then
cat $sql_file | $cmd --password="$password"
else
cat $sql_file | $cmd
fi
}
if test $verbose = 0 if test $verbose = 0
then then
cat $sql_file | $cmd > /dev/null 2>&1 run_cmd > /dev/null 2>&1
else else
cat $sql_file | $cmd > /dev/null run_cmd > /dev/null
fi fi
if test $? = 0 if test $? = 0
then then