From: Anitha Gopi
Date: May 24 2011 4:52am
Subject: bzr commit into mysql-5.1 branch (anitha.gopi:3626) Bug#11756699
List-Archive: http://lists.mysql.com/commits/137919
X-Bug: 11756699
Message-Id: <201105240453.p4O4r4bM015478@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1998835837=="

--===============1998835837==
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.1-mod/ based on revid:anitha.gopi@stripped

 3626 Anitha Gopi	2011-05-24
      Bug#11756699: Move test from disabled to experimental group

    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-24 04:26:24 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 04:52:00 +0000
@@ -19,7 +19,8 @@ innodb_plugin.*  @solaris               
 main.ctype_gbk_binlog  @solaris          # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
 main.func_str  @solaris                  # joro: Bug#40928
 main.sp @solaris                         # joro : Bug#54138
-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
+main.log_tables-big                      # Bug#11756699 2010-11-15 mattiasj report already exists
 
 
 ndb.*                                    # joro : NDB tests marked as experimental as agreed with bochklin

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-05-24 04:26:24 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 04:52:00 +0000
@@ -10,5 +10,4 @@
 #
 ##############################################################################
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
-log_tables-big           : Bug#48646 2010-11-15 mattiasj report already exists
 read_many_rows_innodb    : Bug#37635 2010-11-15 mattiasj report already exists


--===============1998835837==
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.1-mod/
# testament_sha1: 2994d4d0f5c9b44fcde5849db4f359137e023c7a
# timestamp: 2011-05-24 10:22:54 +0530
# base_revision_id: anitha.gopi@stripped\
#   x6yauj11a28kbn37
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdU5w8EAAjF/gAAQkABYY//3
coIAAL////BQBK13muj1bx4e2xk8oSSJqanpgTTJoahtNKfqjxlJo9TQ0CUgmhtE0yk000aNGgAA
0AGhMkTxT0k8hPJGmAIwh6RoaCRQjJNEHinpqNqAGgAAASSTCaBNGRk1T9AU9Q000ABpRs3+GPf6
9drrbnhbXFMtzAfhxQPjoif8u4bQL6fK06lQMzMyv6FD7ag6jZ0HB7Okas5H5hx1Q6+F0bher+vx
MsPhj9MsNbg1WzWb5fF0V2s8emaHsgyylXLvR0Ok09JhvmaFdCMiJWBw87gUx+M9SKZzMRKasXMJ
Wq8aqITekWEwNChkliwk/iXG9fGF4RghMUTHIVSok6HwIg5TaSeWGsX5AWXBYxU1BDz50+21QQuJ
dlJGhZEUMUTGwhTHTsfC2PcVfT0I7w904wqr0OG04Gd57r84FwyGsxHyoN+UrFvdt12GtQG4kyYy
BU5GWKWsFpJ+WhUQhgIFEpBKwoksCFauzfQUicTI4SRceo+we+0sJk4Oy20DbYlEnkClxiVk7auq
OdYeOwFt95UhwyF8ZA5UOV0BkPX9LjN4ESLiJk+oTcVjG8DDeajqlTpI4nN5hsAghash+zahaoti
4xMomuRYqaTFjm3dGdXuWKoMG6iJIrMplPh5xLVdjiEn+qN3qWkMmu2FpZ0OBdcGC53g1jCxxWOU
Cc7GGZQpAik8nUjeXVpFCDyV8wmBQHxttlZUHgwYpriJYQkxNaEmTGgKlnLYbQgrqog5upUROjy8
llpLDkMSLbMPY7dolr0TbTb+tMnJjNhbqi2Lw8Io64IRv5XIwJ9nIQCzlNvYJSpqi4wRz4qgY2X3
Ep4I1mSZD427yVukMkbi6eWDdD5uInmN0488zs9GiK8Uo5IyTMr/3F0pkM5hLhoJTzRMYMqMLoSS
hAGcjEzA8TKfk0h6rF+8tA0gTa/Kw0PZycAMWnIv0ZTmfAH2rVgdjI1XnVnZlJKh3bpCHdglPYr5
usqrZwWDLnpMWtr+HFStDNODUarPPxBHvN/OqI00dzwnofathyXeg7UZhI26K1KpMnlqXkZlDoA2
QLW4Vu9d271CZxYCWjR6gczckuInFDzcVBxfczhLg7zdtn7IaEF3vFZkTCJueoAcEXbSs/emELDF
FmwMkfLBJeR1kdm5I8aaGB5I8aopo4h6Ug9FbibHcqEmB/NFPDvuL395DqXq19Bk7GYlkA1Z06pq
yYexjOXOEF5aDpTrad6IAQVhSKItVfkhLIkVaxEGDTOi/c3a75mUmkoIzbifuIl+iWdqNKgQVvDT
+2bN65QMc2GB65HM6hYAXKeTsiFlV8jDoeYGlasBHKx6W2vq5S7MFKtzftuhFgYjXhRRjqH6whsO
rFpFDFfSIa9x7e7NO8mEkJMXbTK2hO2DjmCEHA11Z4MBioBhw3LI634RQVHsbBoY46NxvRyGxiLj
QoOijdyPSB9tEWAQQ5kSNSm69cgPMBx+EROhtxU1z/xdyRThQkNU5w8E


--===============1998835837==--