bzr push into mysql-trunk branch (anitha.gopi:3118)

[Anitha Gopi]

 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


Attachment: [text/bzr-bundle] bzr/[e-mail]