List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:May 24 2011 4:56am
Subject:bzr commit into mysql-5.5 branch (anitha.gopi:3396)
View as plain text  
#At file:///home/anitha/mysql/repo/mysql-5.5-mod/ based on revid:anitha.gopi@stripped

 3396 Anitha Gopi	2011-05-24 [merge]
      Upmerge from 5.1

    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-24 04:33:59 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 04:55:56 +0000
@@ -12,7 +12,8 @@ main.lock_multi_bug38499                
 main.outfile_loaddata @solaris           # Bug#11755168 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
 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
-query_cache_28249                        # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
+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 04:33:59 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 04:55:56 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 lowercase_table3         : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
-log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 read_many_rows_innodb    : Bug#11748886 2010-11-15 mattiasj report already exists
 sum_distinct-big         : Bug#11764126 2010-11-15 mattiasj was not tested
 alter_table-big          : Bug#11748731 2010-11-15 mattiasj was not tested


Attachment: [text/bzr-bundle] bzr/anitha.gopi@oracle.com-20110524045556-839fi46x0yym73v0.bundle
Thread
bzr commit into mysql-5.5 branch (anitha.gopi:3396) Anitha Gopi24 May