From: Anitha Gopi
Date: May 25 2011 2:13pm
Subject: bzr push into mysql-5.5 branch (anitha.gopi:3402 to 3403)
List-Archive: http://lists.mysql.com/commits/138086
Message-Id: <201105251413.p4PEDMOq017022@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0848470546=="

--===============0848470546==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3403 Anitha Gopi	2011-05-25
      Fixed formatting in disabled.def

    modified:
      mysql-test/t/disabled.def
 3402 Anitha Gopi	2011-05-25
      Bug#12584161 : Test is failing consistently. Move nack to disabled list

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-05-25 10:57:48 +0000
+++ b/mysql-test/t/disabled.def	2011-05-25 14:09:24 +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


--===============0848470546==
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/
# testament_sha1: 274d44799a081f6a1207d39fa57e71901d28e483
# timestamp: 2011-05-25 19:43:06 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   zeusqoaea84i3at3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXl6jckAAXBfgAAQWGP/93OA
AAC///9wUANnu5JZ1FbLQSiKbU0wpsmKfkqfqabQ9Seqb0p5TekASlMKnh6BGqep6TIAYgyNABJE
AgSbSbVPyp6am9U0GEABjAaA0AAGmg0A0AaBJIQjCjwTJlMjGk9JoDQab7sedu5k+7cbPJrETK17
YMa3W6na2ro9VXvmnjU5VqVWSyb8pZ8+1/UfXXoqeFG6ocq8LOgxRHW6oiV7DQQm0aX6moK+ls4Q
qouSJAvSJSltMVkEY7RznKdhDqpjB/kk4+WLExKGTwogdMWhBy5He2p3SEXh9NBexRBjdrYRqska
KJRIFVfiWaoZRN6nblUlWVz2EBTMhYIVG9QmhePkIYyt5eBhyMdoVuCN4kf47bxbGM45RtEgQfLN
pYPygFOYcN9Sbqh4ZixzL0FCcjpKQ89DHAMCpSSGsU2LgjDamezJxEhggpsDPp5nhNhsm2GGifpf
fbrnnnpKUqURxPXZjzsR5GQUMGYPSdXhdQHRYOiK4jaLAGq6HXlqLIjJcr+ytfm0Qx0e1seMEQtm
8uTSwclKCabSKhSbaeRdjla6Zxw989yRrkJWGOk74OcZk9D0c/R6YFSwVwq8SQM4A845pD8I33ns
GUcA4Xl81dceoNZgKzvcJGxCjEFSN31q4j3m6mcF4I8yEkll5mZCLfv+QoPMZzJG8XNIpfMcGCKr
dFXlLOnEac9SEwSGJ04ZjQNcfdBMA67qpzzkMuOXnkxkSigJgbNb+Y6w2wxqXr6hhO+pi8/hhmdE
VJYP4zczfhIrglBqNmCwvsMC0xYY86T3vdBSRVYlfahDkPiiEeBcCXhxEeTwMzeKlbIYNED0jw2t
ZRyTSRGCs4kC8eXB3VSLsNL7HTFwUg8KgT2Mfp0IchIFYx4OzcDA1uHfRIY8wcWufA3hUpc7mr8d
0i3TqFtbHOkYmTbIyJhlojeD2CH9BItIFqGZMvKoKHloJgveda0jqkY3BKDnKmbajV3pxZazKBWj
AaLQhXFW1NrYSFw+JdorgDpBFenYT7qBe+UYgxlLjqH5U6j0UncC/7YlvsZaLX4IBSlCF1F7AirP
+bhdt2A2YlTTfApCwXLwabKte33H73tmGR7RXJ4B6XuvIUcUdSplQ6hzFS3qLuSKcKEg8vUbkg==


--===============0848470546==--