MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:June 17 2010 10:59am
Subject:bzr push into mysql-5.1-rep+2 branch (aelkin:3189 to 3190) Bug#54549
View as plain text  
 3190 Andrei Elkin	2010-06-17
      main test suite disables xa due to  Bug#54549

    modified:
      mysql-test/t/disabled.def
 3189 Andrei Elkin	2010-06-17
      manual merging bug49019, "escaped" at auto-merging  BUG39934 (innodb code rm+add) and fixing results file incl bug30703 assym with 5.1 (as commented in the test)

    modified:
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_show_slave_running.result
      mysql-test/suite/rpl/t/rpl_show_slave_running.test
      sql/share/errmsg.txt
      sql/sql_class.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      storage/innobase/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.cc
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2010-04-30 10:02:36 +0000
+++ b/mysql-test/t/disabled.def	2010-06-17 10:59:10 +0000
@@ -13,3 +13,5 @@ kill                     : Bug#37780 200
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 partition_innodb_plugin  : Bug#53307 2010-04-30 VasilDimov valgrind warnings
 ps_3innodb               : Bug#53309 2010-04-30 VasilDimov valgrind warnings
+xa			 : Bug#54549 2010-06-17 Andrei
+ 	


Attachment: [text/bzr-bundle] bzr/aelkin@mysql.com-20100617105910-0ddt4k0knfctjfno.bundle
Thread
bzr push into mysql-5.1-rep+2 branch (aelkin:3189 to 3190) Bug#54549Andrei Elkin17 Jun