From: Alexander Nozdrin
Date: September 21 2012 10:25am
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:4527 to 4528)
 Bug#14620456
List-Archive: http://lists.mysql.com/commits/144837
X-Bug: 14620456
Message-Id: <20120921102533.10374.35121.4528@quad>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4528 Alexander Nozdrin	2012-09-21
      Bug#14620456: update default.experimental.

    modified:
      mysql-test/collections/default.experimental
 4527 Jimmy Yang	2012-09-21 [merge]
      Merge from mysql-5.6 to mysql-trunk

    modified:
      mysql-test/suite/innodb_fts/r/fulltext.result
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/include/fts0priv.h
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-09-19 09:09:22 +0000
+++ b/mysql-test/collections/default.experimental	2012-09-21 10:23:45 +0000
@@ -20,8 +20,6 @@ rpl.rpl_seconds_behind_master
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
 rpl.rpl_parallel_switch_sequential       # BUG#13626976 2012-02-07 dlenev Fails sporadically on pb2
 rpl.rpl_report_port                      # BUG#13812374 2012-05-10 Hemant Fails after the post fix for bug#13812374
-rpl.rpl_switch_stm_row_mixed @solaris    # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
-rpl.rpl_insert_id @solaris               # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun
 
 # BUG #59055 : All ndb tests should be removed from the repository
 # Leaving the sys_vars tests for now. sys_vars.all_vars.test fails on removing ndb tests

No bundle (reason: useless for push emails).