From: Anitha Gopi
Date: May 25 2011 2:12pm
Subject: bzr commit into mysql-trunk branch (anitha.gopi:3113)
List-Archive: http://lists.mysql.com/commits/138084
Message-Id: <201105251412.p4PECYuV016256@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0337042206=="

--===============0337042206==
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:anitha.gopi@stripped

 3113 Anitha Gopi	2011-05-25 [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-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


--===============0337042206==
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/
# testament_sha1: f9ef2422e653059f689f248931249b304f680eb7
# timestamp: 2011-05-25 19:42:07 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   3cph7q6rg994get3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfzURAoAAvffgAAQWGP/93OA
AAC///9wUAV54HQUKCQAAMBoDQAAaaDQDQBoEoiU/JTz1JshTTEB6nknqG1AAEqGU1D0mgeoMgAA
GmgaDAaA0AAGmg0A0AaAqUmgmQ0AmJPSYTECNTZTZK45Amp8HIrJyTG0HQS7FGDOa4pp6HjXKqkH
qt9cBxlRw4aVdmHxFJBo29a8oiuV0LJq6Er+5VmKUbRHe/VE//QqtdXq3PDw5PmVrYTDld7o35HQ
TT4T9a0uOzmoqcX5c2HDMvWM+aJok6omluUyusss5cvK+HgyTxKVqqVpmoJVxtM8q+6PzS0renTe
3UKkmu5bbvus0hZFDXVVYU57IUo+BXxwSwTWf3zNPmrbqEpLXnet+dM2W7k1tucouNSNyUT67HVm
v4luiV+OzltKZaTLOwTaMXTQmbYDRtjQHaI8a0OASUBIg+rgR2ONuthsyE5WXWduBq/Lh3juxkz3
5aUZ7v4Vsy1o3Gxddot0rSrKlquzh6SzArsV0LU0czdbxm/LvLbHKmR6r0bNiUw5GYWFEwvO+62c
rrV2FNJjbnttsMzwwaVySjIy19Z8DYc8L+1+W1TnyrFRMIsEx2x4De106uTHQW2WcbM8U4EJWJcs
koR/8DMU19V8eneYV0RZKpQIGBeg8iEn91m9d+5ZWm2+pQs5bzgaeaa7asE492nPrb7TFnQpyLW+
wtYG21jga9hotONM1+xnduLZLM2jQpXvoi2dNe/1xO0prfKjdt0CxanfXNrmxnytSW6Vqxc6qXNi
wuvvWpRYpcaJML1GL6nZeZSVXFY4OJ7HkZCCcEilSqKCn0z6HDjzGLFYffzqlCTbusG/xre4eRiX
/S6S18/oiVd9uFuGJ/Z7aF0nt0dMuDgvdw6u9SyKLFLP8dyO7ijV5FI9/Pn9FLq+h16HBnqko8kt
6H2RfpxxyPuw6a/W7+d67a4+xZVRE8Uf0icWmWs3opJfy8lzhu+WpsjTutMUtZXpQzkybT28X9FU
mBn6HJQRKbYUVvQdhOAT3UxFXQxNDcaOFdmWmxEYHtbrjFEnvMSc3GuuKJd2GwpsuHs4Xj8Dw5Bo
lE09ejr663u8Vq5R2mBiLUtaZMztzOKcz0sj0e7447D2+z4sXak0KKOyVjl4OJuh6T1Oz3RPd6vC
U+BJ8R3Iq22mR5p6o4xiudFLyqJt86cWb6JRguNfZOPuXHVVzk2YLqMT8/BxXsjuGuToNpJ6nyf7
e6dHsjobp9EytdJND7tAsGL5VFGKJQ+0liOvBpPRXQYZLFh1Wb3pImPb4pit6sTuVWrT5qPBeuUU
YJQ0MFslVEuf6tRNnE87zkilEonnwNVSnJE40VHR8Uun7dyJ+0Twxk0pwStUs1PKOj7pvSp26dVF
E/GB0i4pF8ZOUoSazKngddLTNi8b30auppQeKqMXi3n4mDz0E1c67ly66iWN1eTwk/jevZ+dKUml
eKPkxnSkp9j+35UcP0fA1pqHPU8FsqfVRV+DeUbHJqKN4MHd6tZhVnlJpTyU7tFiZMuXo/XZhlwP
ruPgjUli0fhojPOz/EuT6ow1DxNJuxmR0Rgxf8LuSKcKEh+aiIFA


--===============0337042206==--