diff options
| author | unknown <guilhem@mysql.com> | 2004-06-28 15:39:04 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-28 15:39:04 +0200 |
| commit | dcb1d8ff63f63aed905d2bcc960e03daec557fa4 (patch) | |
| tree | 5c78c573cec433d07e443f72f5565baf5ce59d3d /scripts/mysql_fix_privilege_tables.sh | |
| parent | 3b95283baaf7afc0e865b54204061afa3c3f461e (diff) | |
| parent | 7bd97ab7640ce705396a0363c51211f101a316a9 (diff) | |
| download | mariadb-git-dcb1d8ff63f63aed905d2bcc960e03daec557fa4.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
scripts/mysql_fix_privilege_tables.sh:
Auto merged
Diffstat (limited to 'scripts/mysql_fix_privilege_tables.sh')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index f841a21b788..bb48d8ba5c9 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -102,7 +102,7 @@ then fi cmd="$bindir/mysql -f --user=$user --host=$host" -if test -z "$password" ; then +if test ! -z "$password" ; then cmd="$cmd --password=$password" fi if test ! -z "$port"; then @@ -155,7 +155,7 @@ s_echo "" if test $verbose = 1 then s_echo "You can safely ignore all 'Duplicate column' and 'Unknown column' errors" - s_echo "as this just means that your tables where already up to date." + s_echo "as this just means that your tables are already up to date." s_echo "This script is safe to run even if your tables are already up to date!" s_echo "" fi |