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

Bug#17700: mysql_fix_privilege_tables cannot handle a password \

Browse Source 
with embedded spaces
  
Problem:  Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
  
Solution:  Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program.  Addendum:  Put this check inside of a shell fn
to simplify the code.
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-11-15 09:54:54 -05:00
parent 8f118827c4
commit 3ebd031e00
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
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
@ -178,11 +175,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