3311 Alfranio Correia 2010-10-18
Set rpl_delayed_slave as experimental and fixed the tree name.
modified:
.bzr-mysql/default.conf
mysql-test/collections/default.experimental
3310 Alfranio Correia 2010-10-18 [merge]
merge mysql-next-mr.crash-safe --> mysql-next-mr-stage
WL#5125
modified:
client/mysqlbinlog.cc
mysys/mf_iocache2.c
sql/log.cc
sql/log_event.cc
sql/rpl_info_handler.h
sql/rpl_rli.cc
sql/rpl_slave.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf 2010-10-08 14:35:24 +0000
+++ b/.bzr-mysql/default.conf 2010-10-18 10:32:23 +0000
@@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@stripped"
post_push_to = "commits@stripped"
-tree_name = "mysql-next-mr.crash-safe"
+tree_name = "mysql-next-mr-stage"
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2010-09-28 15:30:47 +0000
+++ b/mysql-test/collections/default.experimental 2010-10-18 10:32:23 +0000
@@ -33,6 +33,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
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
Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20101018103223-21gp3ny8jpbl0hws.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr-stage branch (alfranio.correia:3310 to 3311) | Alfranio Correia | 18 Oct |
