diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-19 21:35:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-19 21:35:10 +0200 |
| commit | 45face8fb459740d268e778250d16bb9346f53e3 (patch) | |
| tree | db2981ce6377165c4515b670593b38a94101cd31 | |
| parent | 36cd228af11ab85df1dbab55138316933107f8bd (diff) | |
| download | mariadb-git-45face8fb459740d268e778250d16bb9346f53e3.tar.gz | |
Add replace for varying errno
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index f8b55a7ce49..0c32f413bd8 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -58,5 +58,5 @@ mysql.time_zone_transition_type OK mysql.user OK DROP USER mysqltest1@'%'; Run mysql_upgrade with a non existing server socket -mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (1) when trying to connect +mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 7ac7aecb838..51db2e99efd 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -56,6 +56,6 @@ DROP USER mysqltest1@'%'; --echo Run mysql_upgrade with a non existing server socket --replace_result $MYSQLTEST_VARDIR var ---replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ +--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/ --error 1 --exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1 |