diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
| commit | ca2d1846950b07115a001a37d84ce63ab2acdc6c (patch) | |
| tree | da19273bb9e832fe232c5251aa3f4d9dc29ee7f0 /mysql-test/r/mysql_upgrade.result | |
| parent | 162e550fcf986454cd1a542e98d8adc8fa81fd00 (diff) | |
| parent | 1d521f6c20881997c9162bd11cadcbc77d20520b (diff) | |
| download | mariadb-git-ca2d1846950b07115a001a37d84ce63ab2acdc6c.tar.gz | |
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
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 c13624d8d09..be14e282f2a 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -97,7 +97,7 @@ mysql.time_zone_transition_type OK mysql.user OK DROP USER mysqltest1@'%'; Run mysql_upgrade with a non existing server socket -mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect +mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; mtr.global_suppressions OK |