bzr push into mysql-trunk branch (anitha.gopi:3111 to 3113)

[Anitha Gopi]

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

    modified:
      mysql-test/t/disabled.def
 3112 Anitha Gopi	2011-05-25
      Removed main.outfile_loaddata since the bug is fixed

    modified:
      mysql-test/collections/default.experimental
 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 11:01:25 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-25 11:36:16 +0000
@@ -9,7 +9,6 @@ main.func_math @freebsd                 
 main.gis-rtree @freebsd                  # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.lock_multi_bug38499                 # Bug#11755645 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
 main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
-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
 main.subquery_sj_none @solaris          # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-05-25 11:01:25 +0000
+++ b/mysql-test/t/disabled.def	2011-05-25 14:10:40 +0000
@@ -15,4 +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
+main.query_cache_28249   : Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically


Attachment: [text/bzr-bundle] bzr/[e-mail]