diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-19 21:31:17 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-19 21:31:17 +0200 |
| commit | 6349071f7fdf1ffbbd83d8716e7edff0cef601e9 (patch) | |
| tree | 3afe52c8c68e559be6f4ad319a226479b473f905 /mysql-test/r/mysql_upgrade.result | |
| parent | f7027dba3a2bb67090d3831f487a2cee9ee6dcad (diff) | |
| parent | 36cd228af11ab85df1dbab55138316933107f8bd (diff) | |
| download | mariadb-git-6349071f7fdf1ffbbd83d8716e7edff0cef601e9.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/r/mysql_upgrade.result:
Auto merged
mysql-test/t/mysql_upgrade.test:
Auto merged
Diffstat (limited to 'mysql-test/r/mysql_upgrade.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 35f29d0ad84..39221bf4f5e 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -76,5 +76,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: 2002: Can't connect to local MySQL server through socket 'var/tmp/no_sock_here' (2) when trying to connect +mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (1) when trying to connect FATAL ERROR: Upgrade failed |