From: Anitha Gopi
Date: June 3 2011 8:55am
Subject: bzr commit into mysql-trunk branch (anitha.gopi:3150)
List-Archive: http://lists.mysql.com/commits/138634
Message-Id: <201106030855.p538tcug021184@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1115725385=="

--===============1115725385==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/anitha/mysql/repo/mysql-trunk-mod/ based on revid:anitha.gopi@stripped

 3150 Anitha Gopi	2011-06-03 [merge]
      Automerge - mysql-5.5 ->mysql-trunk

    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-06-03 08:49:47 +0000
+++ b/mysql-test/collections/default.experimental	2011-06-03 08:54:55 +0000
@@ -12,7 +12,6 @@ main.mysqlslap @windows                 
 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.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-06-03 08:49:47 +0000
+++ b/mysql-test/t/disabled.def	2011-06-03 08:54:55 +0000
@@ -16,3 +16,4 @@ alter_table-big          : Bug#11748731 
 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
+log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists


--===============1115725385==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/anitha.gopi@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-trunk-mod/
# testament_sha1: 4c1bd1f99f6e745f4a6c262604d1f4947ea0b2fd
# timestamp: 2011-06-03 14:25:31 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5-mod/
# base_revision_id: anitha.gopi@stripped\
#   feooo1tfa347xnab
# 
# Begin bundle
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


--===============1115725385==--