2719 Mats Kindahl 2008-10-30 [merge]
Merging fixes from 5.1-rpl.
modified:
mysql-test/r/mysql_upgrade.result
2718 Mats Kindahl 2008-10-29 [merge]
Merging 5.1-rpl with 6.0-rpl
=== modified file 'mysql-test/r/mysql_upgrade.result'
--- a/mysql-test/r/mysql_upgrade.result 2008-10-29 17:40:17 +0000
+++ b/mysql-test/r/mysql_upgrade.result 2008-10-30 13:53:21 +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.backup_history
Error : You can't use locks with log tables.
status : OK
@@ -38,9 +38,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.backup_history
Error : You can't use locks with log tables.
status : OK
@@ -77,9 +77,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.backup_history
Error : You can't use locks with log tables.
status : OK
@@ -118,9 +118,9 @@ Run mysql_upgrade with a non existing se
mysqlcheck: Got error 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.backup_history
Error : You can't use locks with log tables.
status : OK
| Thread |
|---|
| • bzr push into mysql-6.0-rpl branch (mats:2718 to 2719) | Mats Kindahl | 30 Oct |
