Skip to content

M
mariadb
Commit 8b6e5d4d authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files
Options

Backport fix for mysqladmin on windows test failure

parent b9a4ae99
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/t/mysqladmin.test
View file @ 8b6e5d4d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
database=db1 database=db1
EOF EOF
--replace_regex /\/.*mysqladmin/mysqladmin/ --replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/
--error 7 --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 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
...@@ -27,6 +27,6 @@ EOF ...@@ -27,6 +27,6 @@ EOF
loose-database=db2 loose-database=db2
EOF EOF
--replace_regex /Warning: .*mysqladmin/Warning: mysqladmin/ --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 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7