Commit ca1aebbd authored by unknown's avatar unknown
Browse files

Backport fix for mysqladmin on windows test failure

parent c586037a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
database=db1
EOF

--replace_regex /\/.*mysqladmin/mysqladmin/
--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

@@ -27,6 +27,6 @@ EOF
loose-database=db2
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