Commit ce51ceb5 authored by unknown's avatar unknown

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

parents cab0dc65 78278bc4
...@@ -120,9 +120,6 @@ then ...@@ -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 ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment