From: Anitha Gopi
Date: June 3 2011 6:09am
Subject: bzr commit into mysql-5.1 branch (anitha.gopi:3635) Bug#11756699
List-Archive: http://lists.mysql.com/commits/138611
X-Bug: 11756699
Message-Id: <201106030610.p536A1U9007092@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0420845516=="

--===============0420845516==
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:davi.arnaut@stripped

 3635 Anitha Gopi	2011-06-03
      Bug#11756699 : Move test to disabled 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 10:16:14 +0000
+++ b/mysql-test/collections/default.experimental	2011-06-03 06:09:21 +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 06:09:21 +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
+


--===============0420845516==
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: 775957523ccf585d3e2f1d0cb62540a75d774c3f
# timestamp: 2011-06-03 11:39:47 +0530
# base_revision_id: davi.arnaut@stripped\
#   0glodzdalw635ulv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdalbcIAAg9fgBAQWGP/93KC
AAC////wUASZd5nvcNved7aZ693V4JJIaVPMExU9kME000FDQ9INAkkmiYyaapmTUep6IGgAAAMh
NBCaaJ6aIyaaDEGhkyAJFIpsGpGhp6aBGTATCMAgkkExBMmmIT1T0jwkepkA0aC8mvu0H435OYfK
xmuODGCE8bxmwgueDJC42TyjcMQRAh48DzhFGvWtICtFRVg+vzSeb94DivuK7h0QckMkA2UKv39c
Ya8Dlf5CBhGwu8Rp5i7ZIZzH6QmdATlGLTk9fOMgE1jhZNjV4SoVKxpEfcdVorInkIjBP6H+rkaY
Ho+SZClBuZtjAeo6gbiQmJEXoUgJN50VYElQCoJKwg5jzC5XMNQdSMSquQFeL9JRyYjQri3hI9Ce
eSJ+pFIz7N25TN1j5B+FnLRaTW1haOt4mtsXMjJy3aTtG5O1tVl0JSiBkKFxeAz1i9TxYrTUDyRI
5DPPClGGwptP4yNpQRJWOhux5HMjc4AigmVhb2zfCqTaq9qVMIiKi1A7AIEh71aGwzz9ieTFRvuG
cUeJpLO23Q2kQMK7CnC0oPHLdiUHrS245G1lAqImHGsxzNg7krXXAD3XyWZ/VVChJjfM7Nfp4XGR
TJwby0jlry6U24mZxNcbjLYTpswwB0VIoP4kN3ICESlc90FMampeXl1UnGPLCEyq4Q5QHK1gGOK+
NTUTJWDiZRSN56WvYZVsZ1uxe9FxqZOwCSRzMiU0p7HTpFNwwCsrZX+n5nJ00F+mdsbb5xlkgRmk
bFt2yI+YCC4UYWxwGBZ3hDb36iUExo6BG9631SqohfWWFqYd6roS8qWYM1Kplpfgc8sz4hITAiG+
m5FW/oKQwv209iNBu2Y4EnMJZ5CU4vYkyv3bJD7dpcGoGjClFfA96gqz73qfi2GZ2A8Vzjqd4GFl
GXc9GAG1LHRlUBsKDjUdDjT1YdOTI75wwnNl9ZMJrq25pY5ZyubT04vWCtTg4zN0MsuqoNeGkKhr
Ec3QnofJVkTv3trJlg5+vyWrjJbl4LykuY7DomvPaoCrwBqJxUsOCRlrPoXAshUuN5HWGUii4NAk
YubfN8IaH5rryF5E1Ex04IvyLD192cbDRFmgGAZo/2QLudpnk3fj4Mbj5aoqOvBc5hBFbijHUrEm
CHiienTadcV0mJQNrVBjocyoCath2OJnUgzy7nc7+sLCUUQCYoZwRBlH2gkbyBHRA5gZMdcNleKe
BJ0jeAMjC3aO91I7iVCKlhIKqylKV0eKL+W57amVyl6xjB6wPbmdFUhcqkzeLiLdJZQBuKnXyLtM
kGmsz0r7PFTTahoYm2GW147AAqoY4MufUB0vfGL0GIRIQT4+8gX6n59N/SYJUStJpRPVxXJ+ChMQ
jjgToKbtjAlgJpoezEN8JwAFRFZdFZQKUkANeZeY3OdBhUxmTHsoJnrBF3S9aj2rqDRkWG8vtTje
RetajXdwA/xdyRThQkNalbcI


--===============0420845516==--