From: Anitha Gopi
Date: May 24 2011 10:16am
Subject: bzr commit into mysql-5.1 branch (anitha.gopi:3628) Bug#12371924
List-Archive: http://lists.mysql.com/commits/137966
X-Bug: 12371924
Message-Id: <201105241016.p4OAGjQJ029529@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0772514751=="

--===============0772514751==
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

 3628 Anitha Gopi	2011-05-24
      BUG#12371924 # Bug is fixed. Move test out of experimental group

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-24 06:38:13 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 10:16:14 +0000
@@ -2,7 +2,6 @@
 # in alphabetical order. This also helps with merge conflict resolution.
 
 binlog.binlog_multi_engine               # joro : NDB tests marked as experimental as agreed with bochklin
-binlog.binlog_bug23533			 # skozlov: BUG#12371924
 
 
 funcs_1.charset_collation_1              # depends on compile-time decisions


--===============0772514751==
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: 257aacf705c6e5c549b3e04f60fa644cff75fb5c
# timestamp: 2011-05-24 15:46:38 +0530
# base_revision_id: anitha.gopi@stripped\
#   qskpou6p1ervrbua
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSYx7FwAAXHfgAAQWGP/93KC
AgC////wUAM68o67mkaASiQU9Nooe0mEam0eiNR6g009QMGlE0MI9TekAJoMjABNAwaammUCHqaa
ABB6AmBMgDAADQABk0AAAaASSjJkyJkZNGmhNTyjT1NNNDTRkpxjp1U4ZKIVGYVlA71rYsLHou24
SSOvwPEXM88FKkVPKzPPTn/9PjnTQfbE1KYukV22HJGKhw9lvtInSmggvgaa9X7rE8NrbeOx+KRW
uCRrsk+9wrW8FDZQId0YWQU0IV9oOog/6lwVKC4yNY90PG1DHPTvNBARaWPaIMgfBS6ugRr46xI0
9y1uJGJVThsc4pJoJ5g9c8jehNZr0vVZZ6m+QjYmeYE44VhxgRpE9nUuJmcHaZtYGApHCo1WcaWu
KhZuChMgYvw/pjCnhtJQKiO1DYk5OjFxucPrEVQHGgTnuJFhGnGIaV1krglW0KBQBBycQToQZk3t
CYQUYL6B+DBuKk00r5GwWVDRtcOIhC4xKISkmYrnQsaqapGGMLBUDVTVBRZclVTJlQPFy0i1MBcZ
UMxYUATTmXEWzytcMXdzywRB8cqoozSaH8YbJu+JDPOAUEssrgC7rk9EIJTgDYQaFM7IHBUVis0x
nQtTklTzlvH32qKtO1W3hzCBwHQ6b8t2DMkZd0iNqsz4EI1p6votcnsMdWug6eFyybTJseWagkeC
mZ864TF9DzFksgU8ai+LDrJnu33a18p1TddqnWXRhxKg2oxO44iS22YRINC+WJaw7/NOTunNmu0Z
cyR34TMmOB46IuSJifyLwWIReKRi+5qEjAt6+6Z+8wVQUmr0CftjdTeEIcQ1As7KuvpsFtMAeHTe
HxuBwV0EWNK0hh0NfLiEYIgyozgYiK2zswrBdgMTKApf9iiCN5AGKFGMZTrquQoB0Znnt3SPdI0C
a20KVAQn8RF5mTHya/qG0UcmZOH8TyDUhZCuOwOtr5WBnFfcUkl59geiPTWR6sEVvpvye9gZcu0L
3zV8oA3YILP/RUUX4zs+adRkMDqJbFVqBQv5TOsgmDmUKg3Bf69Jp9bXDVrWEwceTxWPDJlA8CKa
VQ/l/xdyRThQkCYx7Fw=


--===============0772514751==--