mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -102,7 +102,7 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cmd="$bindir/mysql -f --user=$user --host=$host"
|
cmd="$bindir/mysql -f --user=$user --host=$host"
|
||||||
if test -z "$password" ; then
|
if test ! -z "$password" ; then
|
||||||
cmd="$cmd --password=$password"
|
cmd="$cmd --password=$password"
|
||||||
fi
|
fi
|
||||||
if test ! -z "$port"; then
|
if test ! -z "$port"; then
|
||||||
@ -155,7 +155,7 @@ s_echo ""
|
|||||||
if test $verbose = 1
|
if test $verbose = 1
|
||||||
then
|
then
|
||||||
s_echo "You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
|
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 "This script is safe to run even if your tables are already up to date!"
|
||||||
s_echo ""
|
s_echo ""
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user