Backport fix for mysqladmin on windows test failure

8b6e5d4d · msvensson@neptunus.(none) · b9a4ae99 · 8b6e5d4d
Commit 8b6e5d4d authored Dec 08, 2006 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/t/mysqladmin.test mysql-test/t/mysqladmin.test +2 -2

No files found.
--- a/mysql-test/t/mysqladmin.test
+++ b/mysql-test/t/mysqladmin.test
@@ -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