diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
| commit | 49c853fb948aeaeb5c7e3f02da3f14da51ee4100 (patch) | |
| tree | 8c3d487a02209cc0c6f126144f1340fc5897d527 /mysql-test/t/mysqladmin.test | |
| parent | ae18a28500974351cf42fa3cac67c83e0647d510 (diff) | |
| parent | 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff) | |
| download | mariadb-git-49c853fb948aeaeb5c7e3f02da3f14da51ee4100.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/t/mysqladmin.test')
| -rw-r--r-- | mysql-test/t/mysqladmin.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index c04c8d50f3c..2580db88456 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -45,3 +45,9 @@ EOF --exec $MYSQLADMIN --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/cnf_file -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1 --remove_file $MYSQLTEST_VARDIR/tmp/cnf_file + +# +# MDEV-7883 Segmentation failure when running mysqladmin -u root -p +# +--error 1 +--exec $MYSQLADMIN -u root -p 2>&1 > /dev/null |