2688 Mats Kindahl 2008-10-30
Fixing result file for mysql_upgrade test.
modified:
mysql-test/r/mysql_upgrade.result
2687 Mats Kindahl 2008-10-29 [merge]
Merging with 5.1-rpl
removed:
mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt
mysql-test/suite/rpl/t/rpl_bug26395-master.opt
mysql-test/suite/rpl/t/rpl_bug26395-slave.opt
mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt
mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt
mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_idempotency-master.opt
mysql-test/suite/rpl/t/rpl_insert_id-slave.opt
mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt
mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt
mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt
mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt
mysql-test/suite/rpl/t/rpl_read_only-slave.opt
mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt
mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt
mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt
mysql-test/suite/rpl/t/rpl_row_func003-slave.opt
mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt
mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp003-master.opt
mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt
mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt
mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt
mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt
mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt
modified:
mysql-test/suite/rpl/r/rpl_innodb.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
mysql-test/suite/rpl/rpl_1slave_base.cnf
mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_idempotency-slave.opt
mysql-test/suite/rpl/t/rpl_innodb-master.opt
mysql-test/suite/rpl/t/rpl_innodb.test
mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt
mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt
=== 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 push into mysql-5.1 branch (mats:2687 to 2688) | Mats Kindahl | 30 Oct |
