Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
parents 95fabc65 b27a4bb8
......@@ -119,9 +119,6 @@ then
fi
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
cmd="$cmd --port=$port"
fi
......@@ -174,11 +171,22 @@ then
s_echo ""
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
then
cat $sql_file | $cmd > /dev/null 2>&1
run_cmd > /dev/null 2>&1
else
cat $sql_file | $cmd > /dev/null
run_cmd > /dev/null
fi
if test $? = 0
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