diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /mysql-test/t/mysqladmin.test | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'mysql-test/t/mysqladmin.test')
| -rw-r--r-- | mysql-test/t/mysqladmin.test | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index 4811c5fdbc6..c04c8d50f3c 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -4,35 +4,21 @@ # Test "mysqladmin ping" # ---exec $MYSQLADMIN --no-defaults --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 +--exec $MYSQLADMIN --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 # # Bug#10608 mysqladmin breaks on "database" variable in my.cnf # -# When mysqladmin finds database in .cnf file it shall fail ---write_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf -[client] -database=db1 -EOF - --replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/ --error 7 ---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; +--exec $MYSQLADMIN --database=db1 --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 -# When mysqladmin finds "loose-database" in .cnf file it shall print +# When mysqladmin finds "loose-database" it shall print # a warning and continue ---write_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf -[client] -loose-database=db2 -EOF - --replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/ ---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; +--exec $MYSQLADMIN --loose-database=db2 --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1 --echo # --echo # Bug#58221 : mysqladmin --sleep=x --count=x keeps looping |