mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
Backport fix for mysqladmin on windows test failure
This commit is contained in:
parent
b9a4ae9909
commit
8b6e5d4dfa
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue