diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-15 09:55:24 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-15 09:55:24 -0500 |
| commit | 574902e355362f70e888c57698ec9147f69a6351 (patch) | |
| tree | 485c08f6c589cf079a9d63e257ee9e977082bda4 /scripts | |
| parent | 154c6e06775d6e644fd4e5f863104ab566fc4a68 (diff) | |
| parent | 78278bc4f5c53324e895ebc30911da3687db0b53 (diff) | |
| download | mariadb-git-574902e355362f70e888c57698ec9147f69a6351.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700
scripts/mysql_fix_privilege_tables.sh:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 073964d4bde..910992191f3 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -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 @@ -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 |