diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
commit | 22fe8e10e297c40bc88104fb6a13e5183238850e (patch) | |
tree | 76a0977cebe3775f61ae3281cc608601eb883243 /mysql-test/t/mysqladmin.test | |
parent | a4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff) | |
parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
download | mariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz |
Merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/t/mysqladmin.test')
-rw-r--r-- | mysql-test/t/mysqladmin.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index 839ecf00b60..eb59e60eefe 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -4,7 +4,7 @@ # Test "mysqladmin ping" # ---exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 +--exec $MYSQLADMIN --no-defaults --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 # @@ -19,7 +19,7 @@ EOF --replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/ --error 7 ---exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 +--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf; # When mysqladmin finds "loose-database" in .cnf file it shall print @@ -30,6 +30,6 @@ loose-database=db2 EOF --replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/ ---exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 +--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf; |