summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-28 10:48:53 +0300
committerAlexander Nozdrin <alik@sun.com>2009-10-28 10:48:53 +0300
commit48c15f0fb0a21c775398e34357f6425501a27914 (patch)
tree21d09b868d7678bd05f100fc769943acc09a9bea /scripts
parent804e9d30ca57dfcfb2c9772afe3cef3d5fd48633 (diff)
parent273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff)
downloadmariadb-git-48c15f0fb0a21c775398e34357f6425501a27914.tar.gz
Automerge from mysql-next-mr.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_fix_privilege_tables.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index 3b179957932..dd5edb699a0 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -134,7 +134,7 @@ then
exit 1
fi
-cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"
+cmd="$bindir/mysql --no-defaults --default-character-set=latin1 --force --user=$user --host=$host"
if test ! -z "$port"; then
cmd="$cmd --port=$port"
fi