From: Alexander Nozdrin
Date: November 23 2010 9:13pm
Subject: bzr push into mysql-trunk-bugfixing branch (alexander.nozdrin:3387 to 3388)
List-Archive: http://lists.mysql.com/commits/124774
Message-Id: <201011232115.oANKw8Hq020271@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3388 Alexander Nozdrin	2010-11-24
      Make innodb.innodb_bug56143 experimental due to 58432.

    modified:
      mysql-test/collections/default.experimental
 3387 Sergey Glukhov	2010-11-23 [merge]
      5.5-bugteam->trunk-bugfixing merge
     @ mysql-test/suite/innodb/r/innodb_mysql.result
        5.5-bugteam->trunk-bugfixing merge
     @ mysql-test/suite/innodb/t/innodb_mysql.test
        5.5-bugteam->trunk-bugfixing merge
     @ sql/opt_range.h
        5.5-bugteam->trunk-bugfixing merge
     @ sql/records.cc
        5.5-bugteam->trunk-bugfixing merge

    modified:
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      sql/opt_range.h
      sql/records.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-11-18 09:07:14 +0000
+++ b/mysql-test/collections/default.experimental	2010-11-23 21:13:08 +0000
@@ -6,6 +6,7 @@ binlog.binlog_multi_engine              
 funcs_1.charset_collation_1              # depends on compile-time decisions
 funcs_1.myisam_views @solaris            # Bug#50595 2010-03-05 alik funcs_1.myisam_views takes longer time on 6.0 branch than 5.1 branch
 
+innodb.innodb_bug56143                   # Bug#58432 2010-11-24 alik innodb.innodb_bug56143 fails under valgrind
 innodb.innodb_information_schema         # Bug#48883 2010-05-11 alik Test "innodb_information_schema" takes fewer locks than expected
 
 main.func_math @freebsd                  # Bug#43020 2010-05-04 alik main.func_math fails on FreeBSD in PB2

No bundle (reason: useless for push emails).