#At file:///home/bm136801/my/60-al/ based on revid:alik@stripped
3607 Bjorn Munch 2009-09-23 [merge]
merge 5.1-mtr->5.1->trunk->next-mr
modified:
mysql-test/collections/default.experimental
mysql-test/mysql-test-run.pl
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/t/rpl_log_pos.test
mysql-test/suite/rpl/t/rpl_packet.test
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2009-09-22 18:28:01 +0000
+++ b/mysql-test/collections/default.experimental 2009-09-23 05:54:19 +0000
@@ -1,33 +1,28 @@
-backup.backup_external_non_win* # BUG#45877
+# For easier human reading (MTR doesn't care), please keep entries
+# in alphabetical order. This also helps with merge conflict resolution.
+
+backup.backup_datatypes @darwin # Bug#46934 2009-08-26 alik backup_datatypes fails on Mac OS X
backup.backup_dbname_lctn2 @windows # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
+backup.backup_external_non_win* # BUG#45877
backup.backup_xpfm_compat_backup_lctn2 @windows # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
-backup.backup_datatypes @darwin # Bug#46934 2009-08-26 alik backup_datatypes fails on Mac OS X
-
-binlog.binlog_tmp_table* # Bug#45578 2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
-
+binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
funcs_1.charset_collation_1 # depends on compile-time decisions
-
-main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
-main.truncate_coverage # Bug#46785 2009-08-18 alik main.truncate_coverage fails sporadically
-
-rpl.rpl_backup_multi* # BUG#45284
-
-rpl.rpl_killed_ddl* # Bug#45520 2009-07-10 alik rpl_killed_ddl fails sporadically in pb2
-rpl.rpl_row_create_table* # Bug#45576 2009-07-10 alik rpl_row_create_table fails on PB2
innodb.innodb_information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
-
-main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
+main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
main.information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
-
-rpl_ndb.rpl_ndb_log # Bug#38998
-rpl.rpl_innodb_bug28430* @solaris # Bug#46029
+main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
+main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled
main.plugin_load @solaris # Bug#47146
-rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
-
+main.truncate_coverage # Bug#46785 2009-08-18 alik main.truncate_coverage fails sporadically
ndb.ndb_restore # Bug#37778 2009-07-30 alik ndb.ndb_restore fails randomly
ndb.ndb_restore_print # Bug#37778 2009-07-30 alik ndb.ndb_restore fails randomly
-main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled
+rpl.rpl_backup_multi* # BUG#45284
+rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
+rpl.rpl_innodb_bug28430* @solaris # Bug#46029
+rpl.rpl_killed_ddl* # Bug#45520 2009-07-10 alik rpl_killed_ddl fails sporadically in pb2
rpl.rpl_plugin_load* @solaris # Bug#47146
+rpl.rpl_row_create_table* # Bug#45576 2009-07-10 alik rpl_row_create_table fails on PB2
+rpl_ndb.rpl_ndb_log # Bug#38998
ndb.n* # Consider all NDB tests experimental.
rpl_ndb.r* # Consider all NDB tests experimental.
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2009-09-22 18:28:01 +0000
+++ b/mysql-test/mysql-test-run.pl 2009-09-23 05:54:19 +0000
@@ -1825,7 +1825,7 @@ sub environment_setup {
my $plugin_filename;
if (IS_WINDOWS)
{
- $plugin_filename = "ha_example.dll";
+ $plugin_filename = "ha_example.dll";
}
else
{
=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2009-03-18 02:54:46 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2009-09-23 05:54:19 +0000
@@ -108,4 +108,5 @@ n
2
3
drop table t1;
+call mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event', Error_code: 1236");
End of 5.0 tests
=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result 2009-09-21 09:04:22 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result 2009-09-23 05:54:19 +0000
@@ -63,4 +63,8 @@ Got fatal error 1236 from master when re
DROP TABLE t1;
SET @@global.max_allowed_packet= 1024;
SET @@global.net_buffer_length= 1024;
+call mtr.add_suppression("Slave I.O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");
+call mtr.add_suppression("log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master");
DROP TABLE t1;
+call mtr.add_suppression("Slave I.O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");
+call mtr.add_suppression("log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master");
=== modified file 'mysql-test/suite/rpl/t/rpl_log_pos.test'
--- a/mysql-test/suite/rpl/t/rpl_log_pos.test 2008-07-10 16:09:39 +0000
+++ b/mysql-test/suite/rpl/t/rpl_log_pos.test 2009-09-23 05:54:19 +0000
@@ -39,4 +39,7 @@ connection master;
drop table t1;
sync_slave_with_master;
+connection slave;
+call mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event', Error_code: 1236");
+
--echo End of 5.0 tests
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test 2009-09-21 09:04:22 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test 2009-09-23 05:54:19 +0000
@@ -145,8 +145,12 @@ connection master;
DROP TABLE t1;
eval SET @@global.max_allowed_packet= $old_max_allowed_packet;
eval SET @@global.net_buffer_length= $old_net_buffer_length;
+call mtr.add_suppression("Slave I.O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");
+call mtr.add_suppression("log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master");
# slave is stopped
connection slave;
DROP TABLE t1;
+call mtr.add_suppression("Slave I.O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");
+call mtr.add_suppression("log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master");
# End of tests
Attachment: [text/bzr-bundle] bzr/bjorn.munch@sun.com-20090923055419-om6nha1vt5u6yni6.bundle
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (Bjorn.Munch:3607) | Bjorn Munch | 23 Sep |
