diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-29 18:38:18 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-29 18:38:18 +0100 |
| commit | 450cc26b47992c71d2c69301c831a12ef7dcd7e7 (patch) | |
| tree | 6ab2275b41577e6aa010075c5f0e6f5ca1f6e6b3 /mysql-test/r/mysql_upgrade.result | |
| parent | a7b0312c753d87225e3fe700b14b0c0334e410a8 (diff) | |
| download | mariadb-git-450cc26b47992c71d2c69301c831a12ef7dcd7e7.tar.gz | |
Post-merge fixes to fix test cases.
Diffstat (limited to 'mysql-test/r/mysql_upgrade.result')
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index be14e282f2a..ca887df4019 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,7 +1,7 @@ Run mysql_upgrade once -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -32,9 +32,9 @@ mysql.user OK Run it again - should say already completed This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade Force should run it regardless of wether it's been run before -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -65,9 +65,9 @@ mysql.user OK CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; GRANT ALL ON *.* TO mysqltest1@'%'; Run mysql_upgrade with password protected account -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -97,12 +97,12 @@ 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' (errno) when trying to connect +mysqlcheck: Got error: 2003: Can't connect to MySQL server on '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 +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK |