From: Alexander Nozdrin
Date: November 15 2010 9:26am
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3204 to 3205)
List-Archive: http://lists.mysql.com/commits/123849
Message-Id: <201011150926.oAF7LMUP005624@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3205 Alexander Nozdrin	2010-11-15
      Merge followup: fix default.experimental file.

    modified:
      mysql-test/collections/default.experimental
 3204 Alexander Nozdrin	2010-11-14
      Fix version tag (to 5.6.1-m5).

    modified:
      configure.in
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-11-08 14:35:45 +0000
+++ b/mysql-test/collections/default.experimental	2010-11-15 09:26:03 +0000
@@ -18,11 +18,13 @@ main.lowercase_table2 @darwin           
 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.server_uuid                         # Bug#57482 2010-11-02 alik server_uuid fails on PB2
+main.server_uuid_embedded                # Bug#58171 2010-11-15 alik server_uuid_embedded fails sporadically
 main.signal_demo3 @solaris               # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.type_float @freebsd                 # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris
 
+perfschema.func_file_io                  # Bug#58172 2010-11-15 alik perfschema.func_file_io fails sporadically in PB
 perfschema.start_server_on               # Bug#55576 2010-08-02 alik Two perfschema tests failed on mysql-next-mr-innodb PB2 tests#
 perfschema.server_init                   # Bug#55576 2010-08-02 alik Two perfschema tests failed on mysql-next-mr-innodb PB2 tests#
 

No bundle (reason: useless for push emails).