bzr push into mysql-5.5 branch (anitha.gopi:3406)

[Anitha Gopi]

 3406 Anitha Gopi	2011-05-27 [merge]
      Automerge : Updating 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/lib/mtr_cases.pm
      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/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/item_func.cc
      sql/log.cc
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sql_parse.cc
      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 10:57:48 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-26 07:05:46 +0000
@@ -21,7 +21,6 @@ rpl.rpl_heartbeat_basic                 
 rpl.rpl_show_slave_hosts                 # BUG#12416700 2011-05-02 sven fails sporadically
 
 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]