From: marko.makela
Date: January 25 2011 10:03am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3691) Bug#59486
List-Archive: http://lists.mysql.com/commits/129527
X-Bug: 59486
Message-Id: <201101251003.p0P9TLZQ005879@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1096244285=="

--===============1096244285==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTA5NTQ1MC1jbWU1
eW5lem9pdnlncjh0CgogMzY5MSBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI1CiAgICAgIEJ1ZyAj
NTk0ODYgSW5jb3JyZWN0IHVzYWdlIG9mIFVOSVZfVU5MSUtFTFkoKSBpbiBtbG9nX3BhcnNlX3N0
cmluZygpCiAgICAgIAogICAgICBtbG9nX3BhcnNlX3N0cmluZygpOiBFbmNsb3NlIHRoZSBjb21w
YXJpc29uIGluIFVOSVZfVU5MSUtFTFksCiAgICAgIG5vdCB0aGUgY29tcGFyYW5kLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vbXRyL210cjBsb2cuYwo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL210ci9tdHIwbG9nLmMnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9tdHIvbXRyMGxvZy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMTI1MDk1NDUwLWNtZTV5bmV6b2l2eWdyOHQKKysrIGIvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL210ci9tdHIwbG9nLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTAxMjUxMDAzMTAtYWo2aHp1eHBrbnJ0cWY1YQpAQCAtNDA4LDcgKzQwOCw3IEBAIG1sb2dfcGFy
c2Vfc3RyaW5nKAogCXB0ciArPSAyOwogCiAJaWYgKFVOSVZfVU5MSUtFTFkob2Zmc2V0ID49IFVO
SVZfUEFHRV9TSVpFKQotCQkJfHwgVU5JVl9VTkxJS0VMWShsZW4gKyBvZmZzZXQpID4gVU5JVl9Q
QUdFX1NJWkUpIHsKKwkgICAgfHwgVU5JVl9VTkxJS0VMWShsZW4gKyBvZmZzZXQgPiBVTklWX1BB
R0VfU0laRSkpIHsKIAkJcmVjdl9zeXMtPmZvdW5kX2NvcnJ1cHRfbG9nID0gVFJVRTsKIAogCQly
ZXR1cm4oTlVMTCk7Cgo=

--===============1096244285==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marko.makela@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# testament_sha1: 704fd5a97e324cdcb9f4efdf2adde9a969802bf2
# timestamp: 2011-01-25 12:03:18 +0200
# base_revision_id: marko.makela@stripped\
#   cme5ynezoivygr8t
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTLhEMIAAYbflEAwWm//93Ov
SzC///98BAAIAFADh4rokMjQwyQp6jDVPTAJkmNIA0Bo0GmQGhkHMARgmIBgEwTRkNDAJgjEwyKZ
MSn+op5RoyeSaGgAAMQA0ABzAEYJiAYBME0ZDQwCYIxMJJAgBqaaNATJMUep4CR6gDTI09Q0LXFT
Z+pr7BnrojeKI+AH2VLapQmW4xeD2uR0CIgX5n5Y3EikRFK3Myumn07ofQ+u3WytJW27FkRMRuGg
Nl315iFId+Ckbv1aDuvva30dGOsP5QfEJhNBWGrHl8tsOdBoWYjdxEbMaape3ndITJWp03i80jgD
hGAr8QlSqpM5hy1QKH+Ib1aoUOIjeT+XcKwUkHZz+ZPtqLUBUy4sg3UomRp0YgkWx5vc/oN+XBRQ
wZoq1gNshAoc9WgppQbYg61gx9W9UZnHfuFi6DgnbIMYOfYWs+srrPKiAuwQcKVX7RhEXgMV6AlY
b5kgLnVKZBBcr834B97pBAVdg+0KR3RNYb69N+GYWJh9irquC4ob2E/hEMrwzU653XLG+JXbiGsJ
vjoH7dNkrbjKo37KrG3KVu2IaH4mrWGU8iBKpTONOUZGRkeEolRzQtS01FiQqArmD1KRR4oAg6Ky
PYLeG6wR3lmtxw4qTcCPVolETmxfDvM+WhQR4+hzgez85mLFne5PyFAQzgpTe1DLbhsYPwPX8YkD
rRxgHe4Oxh3aI+nlA+zyEV1lo8PMXuEemicV1Vpf3QIcMvPQHce/vp8TToJO1wB54O6T39wMZ3A2
w9KxXGFwWxeDg7T/YE9m1qnMIduWAjR2EJjatPDGzIkoptZBfpneGEw3EpczJbEokZ7WKGESMlxm
PKqjE1FQQAQh0Yy1ZMMkKSYKd59Ge6hpJF9w8ih4J3SWS2Uhl4BpjLLHwMGRLdoM9YpSoHAmWf57
uqbF9DdcChFgvgrTUGRS/qFaoHHMs6/FNHYTTjQuQV1FHxywjMOjkFPHWo88xa8kzhHz1B0irSMw
qCpwlvqEMY1z38FMoqqmI6xGS/I/MZ1+wyNTqw1tbToJx+ENVIPRMCGUR0dKzgPxlTr6pXDh0CuR
Bky5vSI5XmxHJa0LhUD5HyEdIWKjk9VWY7rLnbnMncxiP0FXlKwWbCyXiqRLwI6WRRneU31kgVSc
+18CMxPkmT3Xa3wtLcmNlukGrOxn1EgiMXPr13wbIv7hzWYmbFFWi0qCtPFmJ4+Cg5RX+2W4bsFY
MzxlAuPmcFZvHGeYxtHC0DoBd97v4U6P8XckU4UJAy4RDCA=


--===============1096244285==--