List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:May 25 2011 11:02am
Subject:bzr commit into mysql-trunk branch (anitha.gopi:3111)
View as plain text  
#At file:///home/anitha/mysql/repo/mysql-trunk/ based on revid:mikael@dator9-20110525101808-zhqd5az1tffaa3hu

 3111 Anitha Gopi	2011-05-25 [merge]
      Automerge from 5.5

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-25 05:30:40 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-25 11:01:25 +0000
@@ -13,7 +13,6 @@ main.outfile_loaddata @solaris          
 main.signal_demo3 @solaris               # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.subquery_sj_none @solaris          # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-main.query_cache_28249                   # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
 main.log_tables-big                      # Bug#11756699 2010-11-15 mattiasj report already exists
 main.type_float @freebsd                 # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-05-24 06:42:00 +0000
+++ b/mysql-test/t/disabled.def	2011-05-25 11:01:25 +0000
@@ -15,3 +15,4 @@ sum_distinct-big         : Bug#11764126 
 alter_table-big          : Bug#11748731 2010-11-15 mattiasj was not tested
 create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
+main.query_cache_28249                   # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically


Attachment: [text/bzr-bundle] bzr/anitha.gopi@oracle.com-20110525110125-x97pcil75467b4np.bundle
Thread
bzr commit into mysql-trunk branch (anitha.gopi:3111) Anitha Gopi25 May