List:Commits« Previous MessageNext Message »
From:Hemant Kumar Date:June 29 2012 6:59am
Subject:bzr push into mysql-trunk branch (hemant.hk.kumar:3919 to 3920)
View as plain text  
 3920 Hemant Kumar	2012-06-29 [merge]
      Merging the changes related to disabled.def from mysql-5.6 to mysql-trunk.

    modified:
      mysql-test/t/disabled.def
 3919 kevin.lewis@stripped	2012-06-29 [merge]
      Merge from mysql-5.6

    modified:
      mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
      mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
      storage/innobase/dict/dict0load.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2012-06-15 21:11:49 +0000
+++ b/mysql-test/t/disabled.def	2012-06-29 06:56:30 +0000
@@ -15,5 +15,4 @@ sum_distinct-big         : Bug#11764126
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 ds_mrr-big @solaris      : Bug#14168107 2012-04-03 Hemant disabled new test added by Olav Sandstå,since this leads to timeout on Solaris on slow sparc servers
-partition_locking_4	 : Bug#13924750 2012-04-04 lost connection.
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (hemant.hk.kumar:3919 to 3920) Hemant Kumar29 Jun