From: Anitha Gopi
Date: June 3 2011 8:57am
Subject: bzr push into mysql-5.1 branch (anitha.gopi:3635 to 3636) Bug#11756699
List-Archive: http://lists.mysql.com/commits/138635
X-Bug: 11756699
Message-Id: <201106030857.p538vrT0022844@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0818357601=="

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

 3636 Anitha Gopi	2011-06-03
      Bug#11756699 : Move test to disabled group

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
 3635 Sergey Vojtovich	2011-06-03 [merge]
      Merge.

    added:
      mysql-test/r/archive_debug.result
      mysql-test/t/archive_debug.test
    modified:
      storage/archive/azio.c
      storage/archive/ha_archive.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-24 10:16:14 +0000
+++ b/mysql-test/collections/default.experimental	2011-06-03 08:43:10 +0000
@@ -19,7 +19,6 @@ main.ctype_gbk_binlog  @solaris         
 main.func_str  @solaris                  # joro: Bug#11750406
 main.sp @solaris                         # joro : Bug#11761625
 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 06:38:13 +0000
+++ b/mysql-test/t/disabled.def	2011-06-03 08:43:10 +0000
@@ -11,3 +11,5 @@
 ##############################################################################
 kill                     : Bug#11748945 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 read_many_rows_innodb    : Bug#11748886 2010-11-15 mattiasj report already exists
+main.log_tables-big      : Bug#11756699 2010-11-15 mattiasj report already exists
+


--===============0818357601==
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: 5dd234d1b18d64460874d07b15c6962468b4fe77
# timestamp: 2011-06-03 14:27:42 +0530
# base_revision_id: sergey.vojtovich@stripped\
#   aqrbw280o24xjocs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf7Xqk4AAhlfgBAQWGP/93KC
AAC////wUASZ5OzQXt6VR1ne5CSSmSejTRp6U9E2mTE1NhQADTDKTUeUafqmyn6k00ABoAAADITR
CZqaaaTyjTTT1A000ZGgAxRE0yPRA9QDQaD1AAACSgTI0aEyaaJhMjRqh6hskYL8NfbieO7RcHvY
rRptUwQnlIasILgzQotNdNw8Q4RAh5cDzhFGvWpITuRmZXjs3JTq/eA5L6jNoHyg90MkArvWfz9s
n5ZnDl4BzBFZw94HOVczrcfSEyic8qAcX8mOJafVsdWaxNBKKrXFInJbBrajaWV1CLhDwvYzEXzG
TAmBcQKHFe12JGgRdCoqCiWdSQ9YBqESjAQPMUu1ahD5zNiBEaEA+/ZCsAce+2aobBBxC/UkpBlL
xvDn3g5WOpVCpmqos0gTnPMiqIXBqbt567uhUUJK6DF6/8UNOTkRMEPYhQanLLK8kqNieyqPKWBg
cD8KzKCKojJn6N4/ZurqOoFDGcRSoObSqki4AOVCzsy20ZsZVZJunbkIh1E0CdEYAwLCGDyrEeBv
l+Ssi5pEutGNIOTIKxrChFdGD+Mi0cNMdxYWYHmacYEBwFsivIkn2j5YTQMtekZupNZELQoBnEn3
269bzI0zaGY7EgZcPPloR6G2Jv3jldpQ0vNAJmMQugRGmPIftrqUKiubVEZaBQvKy2q5pt9KPrGq
NY4HavLrKYsMLKkxwziI9uuVbpGpjKtw96PpUydgElIrE0EUQSngddolgHhjWJB/UcYDgUQMVgV0
gkPLomsFlzUgeUrSe7QXBgsSGWJA/h4S3ePUSfaejXIzis8cR0NhtNyYd85LnsSj1Bcrqjladcxu
OJxUkiNjwrFpsXQ0nCWuQcxzWCWvgSu+FzgwtYqc27Ccp9QMSgd7AbfGKO5YTvwUejMeJzXV+88P
LrJQA8H9MAN3Ax990UMegmPPF2Jeb58WHSmtFXPMc2TQ212TzNalbBtiuZvy0uWxeSaGp5NnppeF
QY5cp1DK0efZPRqoXqsuJsLLynh3jGhZyBVbVkUjyli8dC2B7bPEXgnFXBIz9beyPIFzFMC9xmSx
Dm/RjUi9tE3ZT8oZDyXfeLuSUDLTYi/MmffhthM0RO8NiP1kC7HaJ6M9tYrfzA5p5md7QOKLD33r
4mD0UaWMOxMSYD+iFGE7Bn7pCLGxqRhqpBNW07ahI60GMux3O/qCwlFEBIi5DmJ/4ekRA3ECrRA1
gMTDth7L5V+EsqzoqAByOTNnOu9I6iUiNa5DlqozRf8Kipu2z4sUQHGlhgzqw97jonoVT0zZUkMs
b5R9ie0awkSC+vgZ5CXu2MMwEEZjQ27RFGkjHfazBoAqvR1GcB6LhIQwRXigGPWO3dnsTAIQkQBI
mq5CfAcLmjKA5zTI3HhJgMtEpawnabnysRNUUGui0LLHgS47fubgO8VVHExHTTWrNHwqdqKR9Rj9
kxc2ImdDZMemNAaKBG6Yvh/F3JFOFCQ/teqTgA==


--===============0818357601==--