From: Anitha Gopi
Date: May 24 2011 4:34am
Subject: bzr commit into mysql-5.5 branch (anitha.gopi:3395) Bug#12584161
List-Archive: http://lists.mysql.com/commits/137918
X-Bug: 12584161
Message-Id: <201105240434.p4O4Ywqf007711@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0089340569=="

--===============0089340569==
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-5.5-mod/ based on revid:luis.soares@stripped

 3395 Anitha Gopi	2011-05-24 [merge]
      Bug#12584161 - Up merge 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-23 11:33:41 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 04:33:59 +0000
@@ -12,6 +12,7 @@ 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.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-23 11:33:41 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 04:33:59 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 lowercase_table3         : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
-query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 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


--===============0089340569==
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-5.5-mod/
# testament_sha1: 24cff22a4a9a36c7a7f1c8fad10f5034e6ca3b72
# timestamp: 2011-05-24 10:04:47 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.1-mod/
# base_revision_id: luis.soares@stripped\
#   cubjr2teo7mwqgvs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSYvvfoABGR/gEAQBABYY//3
coICAL////BgB58UAAAAJAKUEVARSVT0jwxT00k9oyaZU09qj0am0j00Qww0NAAABoAAAAAw0NAA
ABoAAAAAw0NAAABoAAAAAw0NAAABoAAAAASRAQExNDSaZJgJqan6SZPTKPUw/9uNOHMowf7+DX5N
h+RWEBXlsZb9rxTKOiTIP6hIoY9zXUJ3W0iPVt4RmtQ+odAYYYZmZH9fcWX+SJUHNwydpXUjFmve
eV/9ynBqyekndip0+x2LdujmG3cSq6efbbWHWBPXskBGquK4LzOdDJkiKym+GsyOfwIjJxB6Xrwm
xx3BvHA3BoZhsklo5odeKZUCQcjwGOIUpxP+EO4yQrCZSD7scdgAuE6vF1QLHNbwfGo7ubcxpCDB
kzZmoOwLiZuICO8gOmBtBOdZFRS1YkhDBGAOJKiiXlnG3AKpRrQBkTtmQVKDnxiBgYpfXc/oMO7u
xa8gwJ29i24PeYnEldsHPcS8y0QGHAayhU/CFZ+jQPVW7G1nKCmRDQ7zA/neNmWHMmWJgNxM8TQl
uLAl04nToA6w3dGdHradxapBkDIXC4yLD3JVciEDuOhpA3PWBpilx0CbCqmSSqaRWMycGC1VSzJS
ii1SIoUEImJtggXXq9Cgfg07d3BCx40sQXjl5wP2FTYm3cw4UCxZrK4eX5N8QY1MYEyIouoEHTkF
QC2ekTPOkEjgxgWAeSWtHFQy7StjFi5iRndAgs3MeDZnuVISWuQTQo6wHCZFCLygF5ATOSTUSUWA
0A8QtNZzK8TMoBQp4RtDDG00h0wHQMMshMt0SAxZZA7BC3LG29XLrz6lhMvC/XkQiDpnQlTnzzqF
aQKlK6np7jHEgLeuY+uqsJAWqivGTugqtSU9JKEB8B7EJiwysOYVrxKYO5zc09jjf3nEuNSKUDM0
MBoamcDA0OkR7gIgfoD9oUDO10fsLi6VhLraYl+pZGsvE1628A11s6cSIGWF99rMjoanyuV8jPpu
N0YyCJYQLMoeMbEWLlJyhGzAx11tMVz1LOA+JMiZm4SmXBZhGSeo0twE3Sg5LNNkZHGsK0peODKz
PAMThOhYU4vblEcWRCkUF5bkUoVIvNDjioSIAMUGkKqClRiC7z7i6l5YMw3mcGGTjDDBof2HyQp4
r4PNMkjvLC8ZkyGYb8wMYsDH3MS0gMMkWe0BDJC1O8cFohcyhQkoG3uT+O86VS4ED4+AArIvh1mQ
rUmTQN5d2iXOzUIFDkdDcwSGCTBLqcaheLezphcjSOPE++84XnyIsMe8pLo27py4wJ3w93KvNGx4
q6C8oKKiRqO2s1T3kD5MTy4RM/bzJTGmDuMAHkcEAakMBj1ThsMLj6j9NBuhwwPVWq045paYAOa1
EfxiXF9dgtx5nXl5nIWx7DG2FhcVj6iqvipyD5JBqYah88/pAEGpCD+HHe1MsyUZtNnKEsQrsVY2
u/gPqEbWZeYw/2MgtQZEIyMJnr/DxYTdjoeZu8iWZw3uXiVX7eQx70yPPByr/ggG/uXqLmlwE4Hg
Hcs+jk/aSDUovoSJpjYiI8/QUhEjcKYX9jU18jw5nb3qQMbhQGb36HhP0HFAxKGov9B5BcFh4uzk
EEg2P2OzboUt7guLUHEmxn58mw3kXqMwJyfvEPAI5gZcEvEmcxnQLXs3nzNT7CGKExZLu7Amw9Qu
SoFFtLvQZaBeH+djkSLw3CJihnW4SkqUdwWH4cwW5kcTY2FgeBrhN4DnshQuOqD4wJHelVeiuAkI
3DheMEUXgAwETBJ67HoahoRoE4CvIHcohzIcSxAGDHh9EXBVKFg4WmxQ8CKoTFYvY9l0CJ+albBm
NUJhYBcRQQGRI/RFAtgiEjBIHYBhMHbV1JZGlCgbEBkgHEdRhiC/6cUDRpAC2dChJSHvm2Geh/9v
vwMhqGQV7SAgDIO8MA8VnRaRzRgGQmyuY/QGWo83kBoXYcPLDA9WD6AeXKYRMTucqBSaCsc54wuV
NN5Gwy/koU1UXFA27j1Wair9iKXA5HtM38/QcWga3MJINJMm+CI4huf4dCCzqmJStAlFVBrKxciR
tEPICg6TGpAzWhutGAYkklYWYmAciBS5BeKI02AqQWrljex+F49cVNC+gwscMFwN4fUCoTWibMUC
Yi4PMqHieKt8EL5wsSgMIuCYXSA9UKCPMM+KPZULDcf/F3JFOFCQJi+9+g==


--===============0089340569==--