diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-06 23:45:09 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-06 23:45:09 +0100 |
| commit | 1fb5bd372796fbcd90e2c210bf402621ca3a85ac (patch) | |
| tree | 365cccf67e454be978544beef906f9ace2020ef4 /mysql-test | |
| parent | 1963159f70ccbb250fa6aa705111ec33a5cb20fd (diff) | |
| parent | d5e094d798a20c44d442c48061c9e314a26c20c4 (diff) | |
| download | mariadb-git-1fb5bd372796fbcd90e2c210bf402621ca3a85ac.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/t/disabled.def:
Manual merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/mysqladmin.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index 7c016fd7416..850abc1ee69 100644 --- 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 |