bzr push into mysql-trunk branch (Georgi.Kodinov:3296)

[Georgi Kodinov]

 3296 Georgi Kodinov	2011-03-17 [merge]
      merge

    modified:
      mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_slow_query_log.result
      mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
      mysql-test/suite/rpl/t/rpl_semi_sync.test
      mysql-test/suite/rpl/t/rpl_slow_query_log.test
      mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      sql/rpl_slave.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-03-17 11:33:17 +0000
+++ b/.bzr-mysql/default.conf	2011-03-17 13:36:11 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
-post_commit_to = "dbg_mysql_security@stripped"
-post_push_to = "dbg_mysql_security@stripped"
-tree_name = "mysql-trunk-security"
+post_commit_to = "commits@stripped"
+post_push_to = "commits@stripped"
+tree_name = "mysql-trunk"

No bundle (reason: useless for push emails).