From: Anitha Gopi
Date: May 24 2011 4:26am
Subject: bzr commit into mysql-5.1 branch (anitha.gopi:3625) Bug#12584161
List-Archive: http://lists.mysql.com/commits/137917
X-Bug: 12584161
Message-Id: <201105240427.p4O4REGX015513@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1002655899=="

--===============1002655899==
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:vasil.dimov@stripped

 3625 Anitha Gopi	2011-05-24
      Bug#12584161 - Moved 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-16 20:04:01 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 04:26:24 +0000
@@ -19,6 +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
+
 
 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-02-22 21:03:32 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 04:26:24 +0000
@@ -10,6 +10,5 @@
 #
 ##############################################################################
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
-query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 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


--===============1002655899==
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: c3b8c974dd208b97015d683c88780bb210a87971
# timestamp: 2011-05-24 09:56:48 +0530
# base_revision_id: vasil.dimov@stripped\
#   d5bemprd5a5ruziu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSWVBA0AAhz/gEAQBABYY//3
coIAAL////BQBL72z3s1YveAPOm9ZhJJNJppkYjRoxNGp4mqeRqGj1ACUlPJhTTGmSehQ0aaeoAA
A0EpMgTIkybU2o02UZBoAADDTVT8pM1NNAA09Q0ABppkABJIEU80TBGjUyZTyT9UAHpA01nrs28J
Mfj45mW2hyaq+HgnsB+cyY+nfJ7RvCqRgakoJJKUzp5auZDHAygs6Msy1oMnF9WN04pfbqotYB4K
PT3A21XRfO9+/oTHdDmQYRlubU3l+somOKFO7mER5u8mwMcvR3C0CnhQ+yzNCqTlWuSCzEadBvIJ
Ft45kttjgCFwyeNtTjlHAI4NEBiDxwKRUnUgFJhJLICpB1KpV25zlWKvN8tnfYG+1FBNpSIzqgAb
HNd8gPuNB+BNTMC7I9DE0WCzfbWSOeRZni5ee55MYC+cjUhKBtzyjNzrdiOPiRZUJkKi6BxlJFqp
DKEnjgIARTZjyqZWA89DfeBXkhJCh/kRcHEC4rJfriYdpM7MDKK2Zn3bUXS505LmWuctK7TWT7iA
DtjEB4FIMrYD4oIfpg+8yiUkUi52SKmlTWSxJ5ttE2VJFmdWOZFRDDLO147U4djJJqsKxgjaknlr
SDngKHldCVMC7ST8zAfNgLIopWVnEByJxKDVzKX1MsM5YxiG52J/ZwZAqMK92T0sJKGi5Y8tL6pQ
NZEtQGayMWKcKYg8jfoo8jYUvfEw0XTtC5mrS6EmWCqlJsDpOgk0EMRVH0I+y4mYXgpJGHuOawzJ
vQCWIRggk+1kYjHua44GYXnzAhhFIwqAOJoNFyfnYPDaOM+yFnDHBCWvgQ2XGcKotpBFyK0xV6zn
StUq51gTLHPCwvMZTDfZqORcvEQfAG8ySjNUpsJINZtPckOc7z/XPhGhHOZCtoEp4OrMsGW2+Yqq
JOq9lGUzhqBtCO8pH3zJbfxuVOTUxHB2K0LvopPMJRJQb+bklwIILLme5iaQ8wxeDM5aTwzvc1ka
N5BBl4cHYl69JmoSs69Os+TYenFFaxXENycFxsrryejcdI4RtKPbBPQ/YuJbfZphUwzcCq86qZfB
cRlrGbM4pO+qcVVBy4IMZMZfrkViNQnD8nmA/XtC6GtnILrG61UeENFoUy3+Ims6lYUFC2x0RdeT
P5x3RmbETmGiMBHA69lQaZAa6aGJ2Ap0RrVDeH1OyqCKLHFbEFWhOB+QLPVu0mh8iLJazGpb5iJa
7HJKEw1uMI4skIqlefAf/aKKWbEBlMqgh7KP+ggzIEZiHMDJjrhsulIzeyScjizPPXJBbehaVomn
OXSe+q1f/S+DcnHDiwwPVpcdglSJlG1w+TSo4p9Kp6Z22rtjGiBvijUTZCaQ0UD0t5GQta32RepF
mFIT3h9beD7/Xp1KcpUaHE8qtbI+/y1X5WwJRSzy7qVZDwedAicDOmnSwNgCpp6zNz6KkVqDSYKc
WPBux+jnxiB5MrJ1q8uIK5Nan5Iq6UHfXkB3nSD2RUe4rijuA9cC+idiOhd/i7kinChIEsqCBoA=


--===============1002655899==--