List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:February 9 2013 1:31am
Subject:bzr push into mysql-trunk branch (anitha.gopi:5576 to 5577)
View as plain text  
 5577 Anitha Gopi	2013-02-09 [merge]
      Merged up from 5.6 and removed some duplicate lines

    modified:
      mysql-test/collections/default.experimental
 5576 Vasil Dimov	2013-02-08
      Fix typo

    modified:
      storage/innobase/handler/i_s.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2013-02-05 12:50:21 +0000
+++ b/mysql-test/collections/default.experimental	2013-02-09 01:29:49 +0000
@@ -15,16 +15,9 @@ innodb.innodb_monitor                   
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
+rpl.rpl_gtid_logs_without_rotate_or_stop_event @windows    # Bug#16207800 2013-02-09 anitha Fails very frequently on windows
 
 sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
 
-# For easier human reading (MTR doesn't care), please keep entries
-# in alphabetical order. This also helps with merge conflict resolution.
-# For easier human reading (MTR doesn't care), please keep entries
-# in alphabetical order. This also helps with merge conflict resolution.
-
 thread_pool.thread_pool_func4 @windows # mleich: test is sometimes unstable on Windows
-# For easier human reading (MTR doesn't care), please keep entries
-# in alphabetical order. This also helps with merge conflict resolution.
-# For easier human reading (MTR doesn't care), please keep entries
-# in alphabetical order. This also helps with merge conflict resolution.
+

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (anitha.gopi:5576 to 5577) Anitha Gopi3 Apr