List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:January 14 2011 1:07pm
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3507 to 3508)
View as plain text  
 3508 Georgi Kodinov	2011-01-14 [merge]
      merge.

    modified:
      mysql-test/collections/default.experimental
 3507 Luis Soares	2011-01-14 [merge]
      Automerge from mysql-5.5 into mysql-trunk.

    added:
      mysql-test/extra/rpl_tests/rpl_show_binlog_events.inc
      mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
    modified:
      mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
      mysql-test/include/setup_fake_relay_log.inc
      mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-01-12 15:13:48 +0000
+++ b/mysql-test/collections/default.experimental	2011-01-14 13:06:00 +0000
@@ -12,7 +12,6 @@ main.gis                                
 main.gis-rtree @freebsd                  # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.information_schema                  # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
 main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
-main.lowercase_table2 @darwin            # Bug#55509 2010-07-26 alik main.lowercase_table2 fails on Mac OSX (again)
 main.mysqlslap @windows                  # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.outfile_loaddata @solaris           # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
 main.signal_demo3 @solaris               # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3507 to 3508) Georgi Kodinov14 Jan