#At file:///home/bzr/merges/merge-5.1-rpl/
2688 Mats Kindahl 2008-10-30
Fixing result file for mysql_upgrade test.
modified:
mysql-test/r/mysql_upgrade.result
=== modified file 'mysql-test/r/mysql_upgrade.result'
--- a/mysql-test/r/mysql_upgrade.result 2008-10-29 17:38:18 +0000
+++ b/mysql-test/r/mysql_upgrade.result 2008-10-30 13:52:04 +0000
@@ -1,7 +1,7 @@
Run mysql_upgrade once
-mtr.global_supressions OK
+mtr.global_suppressions OK
mtr.suspicious_patterns OK
-mtr.test_supressions OK
+mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
@@ -32,9 +32,9 @@ mysql.user
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_supressions OK
+mtr.global_suppressions OK
mtr.suspicious_patterns OK
-mtr.test_supressions OK
+mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
@@ -65,9 +65,9 @@ mysql.user
CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
GRANT ALL ON *.* TO mysqltest1@'%';
Run mysql_upgrade with password protected account
-mtr.global_supressions OK
+mtr.global_suppressions OK
mtr.suspicious_patterns OK
-mtr.test_supressions OK
+mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
@@ -100,9 +100,9 @@ Run mysql_upgrade with a non existing se
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_supressions OK
+mtr.global_suppressions OK
mtr.suspicious_patterns OK
-mtr.test_supressions OK
+mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (mats:2688) | Mats Kindahl | 30 Oct |
