From: Anitha Gopi
Date: May 27 2011 4:56am
Subject: bzr push into mysql-trunk branch (anitha.gopi:3118)
List-Archive: http://lists.mysql.com/commits/138275
Message-Id: <201105270456.p4R4uUMB008400@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2053602200=="

--===============2053602200==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3118 Anitha Gopi	2011-05-27 [merge]
      Automerge : Update local tree

    added:
      mysql-test/suite/binlog/r/binlog_reset_master.result
      mysql-test/suite/binlog/t/binlog_reset_master.test
      mysql-test/suite/rpl/t/rpl_typeconv-master.opt
    modified:
      BUILD/SETUP.sh
      cmake/configure.pl
      cmake/os/WindowsCache.cmake
      include/violite.h
      libmysql/errmsg.c
      mysql-test/include/subquery.inc
      mysql-test/lib/mtr_misc.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/func_math.result
      mysql-test/r/openssl_1.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_none.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/t/func_math.test
      sql-common/client.c
      sql/binlog.cc
      sql/item_func.cc
      sql/item_subselect.cc
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sql_array.h
      sql/sql_base.cc
      sql/sql_parse.cc
      sql/sql_select.cc
      sql/sql_select.h
      storage/innobase/handler/i_s.cc
      storage/innobase/lock/lock0lock.c
      storage/innobase/que/que0que.c
      storage/innobase/srv/srv0start.c
      vio/test-ssl.c
      vio/test-sslclient.c
      vio/test-sslserver.c
      vio/viossl.c
      vio/viosslfactories.c
      vio/viotest-ssl.c
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-25 11:36:16 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-27 04:52:39 +0000
@@ -16,19 +16,14 @@ main.log_tables-big                     
 main.type_float @freebsd                 # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris
 
-rpl.rpl_checksum                         # BUG#12370830 2011-04-18 sven rpl_checksum failed on pb2 (server crash)
-rpl.rpl_cross_version                    # BUG#12416611 2011-05-02 sven fails sporadically on pb2, valgrind errors
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_heartbeat_basic                  # BUG#12403008 2011-04-27 sven fails sporadically
-rpl.rpl_row_ignorable_event              # BUG#12416768 2011-05-02 sven fails sporadically on pb2, result mistmatch in output from mysqlbinlog
 rpl.rpl_row_sp011  @solaris              # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_seconds_behind_master            # BUG#11765124 2010-11-24 luis fails sporadically on pb2
-rpl.rpl_show_slave_hosts                 # BUG#12416700 2011-05-02 sven fails sporadically
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-sys_vars.plugin_dir_basic                     # Bug#11759877 2010-11-24 alik Test "plugin_dir_basic" does not support RPM build (test) directory structure
 sys_vars.wait_timeout_func                    # Bug#11750645 2010-04-26 alik wait_timeout_func fails
 
 # BUG #59055 : All ndb tests should be removed from the repository


--===============2053602200==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/anitha.gopi@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-trunk-mod/
# testament_sha1: a8d5cd1d40f1e2b0b40e683d381490edd475103f
# timestamp: 2011-05-27 10:26:19 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5-mod/
# base_revision_id: sunny.bains@stripped\
#   pw0cghxlx54103v9
# 
# Begin bundle
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


--===============2053602200==--