From: Anitha Gopi
Date: March 10 2011 4:21am
Subject: bzr commit into mysql-trunk branch (anitha.gopi:3742)
List-Archive: http://lists.mysql.com/commits/132723
Message-Id: <0LHT007HLQS1CEB0@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_NMp++jA/DAysU5fewB4Cfg)"

--Boundary_(ID_NMp++jA/DAysU5fewB4Cfg)
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/ based on revid:guilhem.bichot@stripped

 3742 Anitha Gopi	2011-03-10 [merge]
      Automerge from 5.5

    modified:
      mysql-test/t/disabled.def
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-03-01 14:47:01 +0000
+++ b/mysql-test/t/disabled.def	2011-03-10 04:19:54 +0000
@@ -16,3 +16,4 @@ read_many_rows_innodb    : Bug#37635 201
 sum_distinct-big         : Bug#56927 2010-11-15 mattiasj was not tested
 alter_table-big          : Bug#37248 2010-11-15 mattiasj was not tested
 create-big               : Bug#37248 2010-11-15 mattiasj was not tested
+archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc


--Boundary_(ID_NMp++jA/DAysU5fewB4Cfg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/anitha.gopi@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/anitha.gopi@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-trunk/
# testament_sha1: d9faff8d7cccdf2520423e2233de2f0010dae62c
# timestamp: 2011-03-10 09:51:22 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: guilhem.bichot@stripped\
#   02gijiignyljh3ty
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUjWuzAAAvhfgAAQWGP/937j
HQC////wUAXN7QAA2wCpABCSpNPSY1NJtMAnqaBNqMgDQZABzAJgBMAAJgACYAAlTSNTTQ0aaBoM
gAAMg0aAHMAmAEwAAmAAJgACSQTQNNBAJgJqp+mptNRPT0pobRPKb81QSevacjwICeZsIV1SS4TA
hb67I8EbBsQ++RsasdOAghaWLEO0qidpsYIOvvzMaYttcLouM5KlenvE30dGGZnxcKDBHlVwNh/B
4MS2uo9BPe4Rur4c3rdbcFoC59zG5xQBOVDxKFByKjSIx0K7E2Ug4+NZMshCwFyEHBbjTKpznVtB
BrXmDnADgz3mkIIFvHPfoj1CAC1BJ0dYA0HA5czqRLYM21wrRQRqsshe4iVl0MlCgSZJ0sMC8A/q
lQCqibwp3P2igVGJrx2keLDYrJljyd21bIeQv+1Fh9y41BXDhUriL1mIsDb74VkbQ4HGUBbSUkYm
fmI2R0Lq7HhEWOqxHkE2AWoq0Wq29swYsy8MVN/bGpkqgiDvyG2tYh+U8erxhCzsnnbgFYN2CGA5
+6sl5Q9mbup+ohup7CevGqLGQt1oNeKkdSkIgwpy646tweSrJTVr4bej7LyoQ8kJiIYUCAPFzDCM
KDLfzuC+eW3AHhzoKSjFiBwB9afIKguqMnAdlWy1sPsr151hE2FTFRYo5J5a/oEnEHbcF2LrFdiF
ZXQeioNmyRxlArdB2eSz1jlJhFLghWoBCCmTFs130CWgblOJcTGxne9b8gumTiDmHbQupytLlLIq
wwqFF7xGcr5izwiFYqypxltYdYTO7E9EZL6bsS3IcUKM5w8Uxw+BiZJ1Q9PHhGqogJhw1QSSlUMV
lgSN5eemDM4QNBIayMoKcVpFB4wvYFVCqgggIZN7GTrPTknls56+fzhY+18+uhkxMY0HHvfE8hK2
4MIzROy/r4efCID6fUQnHrK/k0CKXzETHiO2hoVH7n+D0GrQw4Z38mOPhhHvgTXqB309w+n4GC6H
6+7kwjucK5A9cKwMzpt0F0snfezA7h1D4carWVgTcYg4QmMRCoPOamMLPHmftqFLG87xDFFYnuOo
pVCvlpYFBVkjiHQmDgfafbmHx4cfVkJY78O0tzQtar8C13B09DzPscitwzqF6W71eWsl5cR0Sljj
D7dhcTwYVsSGPF/3HhRVBwEwtLlqoP78zePIDEgNB4nlwphTQMQ8nsG4Lg9Tae5tZchvZx/CgYnj
eOK6NqDYtoOIleINxItg4RuWDQhGkBkU8P0BohYL9BG1HYidRnCDNybitpQ/AmHMKQY1QilXUrhW
rcESLqXJZpwyh96iwYRhCBVS/+lAnAVIRMF5BTGO4CeVi1iNKuHCIQ2qfqdEtCZ7lgDgJjgO9hgM
CTDMcuwD8QUE3hcCgdi4JjEg7G4mgWCYxRyUyUHjg3jyBAOQx1KogtB1QyTDxyIDvhQEFNYVBFXi
HMJhTXnT5ixiH7u2iFFikRXJjgNxUl9y8QfgQrUpo5uF2WXAz+RwMReA9lpr8hwwqg5hcJHIXtij
oHGszMA1nA5MaDMF6AO5AghhFZ2MgkecVWi7fChURj9U4XQ3WKOwgB0MyAiwojzJlKwHH6ki9hmP
cLV9T4GPUJnJMGAGXCZExEexE1KByCYeYnIxOZrBjWgTrCyK9CFAgOpcleL5DUroIeK8vXZcuu/4
O6gWzx+fxlrCBhQTzeB8jqIjqUD8ucExhtGFqWVZ86vWRbQkCzIspIXCOK/xdyRThQkEjWuzAA==


--Boundary_(ID_NMp++jA/DAysU5fewB4Cfg)--