diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-19 21:35:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-19 21:35:26 +0200 |
| commit | b7c46548164a99d41823d6373ec2bdb3326a5041 (patch) | |
| tree | 764ecdbcdc434f37cbccd3b5277c23c913ef4750 /mysql-test/r/mysql_upgrade.result | |
| parent | 6349071f7fdf1ffbbd83d8716e7edff0cef601e9 (diff) | |
| parent | 45face8fb459740d268e778250d16bb9346f53e3 (diff) | |
| download | mariadb-git-b7c46548164a99d41823d6373ec2bdb3326a5041.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
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 39221bf4f5e..95aa795a2eb 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: 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 |