3349 Alexander Nozdrin 2010-11-16
Fix mysql-test/collections/default.experimental.
modified:
mysql-test/collections/default.experimental
3348 Marc Alff 2010-11-16 [merge]
Merge mysql-5.5-bugteam --> mysql-trunk-bugfixing
modified:
mysys/mf_iocache.c
sql/binlog.cc
sql/log.cc
sql/log.h
sql/mysqld.cc
sql/mysqld.h
storage/perfschema/pfs_global.h
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_instr_class.h
storage/perfschema/table_events_waits.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2010-11-15 09:26:03 +0000
+++ b/mysql-test/collections/default.experimental 2010-11-16 06:46:10 +0000
@@ -31,7 +31,7 @@ perfschema.server_init
rpl.rpl_heartbeat_basic # BUG#54820 2010-06-26 alik rpl.rpl_heartbeat_basic fails sporadically again
rpl.rpl_innodb_bug28430* # Bug#46029
rpl.rpl_row_sp011* @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-rpl.rpl_delayed_slave # BUG#57514 rpl_delayed_slave fails sporadically in pb
+rpl.rpl_delayed_slave* # BUG#57514 rpl_delayed_slave fails sporadically in pb
sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
sys_vars.slow_query_log_func @solaris # Bug#54819 2010-06-26 alik sys_vars.slow_query_log_func fails sporadically on Solaris 10
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (alexander.nozdrin:3348 to 3349) | Alexander Nozdrin | 16 Nov |
