From: marko.makela
Date: May 20 2010 1:07pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3475)
List-Archive: http://lists.mysql.com/commits/108786
Message-Id: <201005201307.o4KCn2ko007258@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1152096349=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMDQwNDItbWEybnNz
Y3FkdndvcGg4awoKIDM0NzUgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yMAogICAgICBidWZfTFJV
X2ZyZWVfYmxvY2soKTogQ29ycmVjdCBhbiBlcnJvciBpbiB0aGUgY29tbWVudC4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMKICAgICAgc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnVmMGxydS5oCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2J1Zi9idWYwbHJ1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1
MjAxMDQwNDItbWEybnNzY3FkdndvcGg4aworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVm
L2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDEzMDczNC11
ZW93OW1uNjBjenA3bzRtCkBAIC0xMzY0LDcgKzEzNjQsNyBAQCBidWZfTFJVX21ha2VfYmxvY2tf
b2xkKAogVHJ5IHRvIGZyZWUgYSBibG9jay4gIElmIGJwYWdlIGlzIGEgZGVzY3JpcHRvciBvZiBh
IGNvbXByZXNzZWQtb25seQogcGFnZSwgdGhlIGRlc2NyaXB0b3Igb2JqZWN0IHdpbGwgYmUgZnJl
ZWQgYXMgd2VsbC4KIAotTk9URTogSWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIEJVRl9MUlVfRlJF
RUQsIGl0IHdpbGwgbm90IHRlbXBvcmFyaWx5CitOT1RFOiBJZiB0aGlzIGZ1bmN0aW9uIHJldHVy
bnMgQlVGX0xSVV9GUkVFRCwgaXQgd2lsbCB0ZW1wb3JhcmlseQogcmVsZWFzZSBidWZfcG9vbF9t
dXRleC4gIEZ1cnRoZXJtb3JlLCB0aGUgcGFnZSBmcmFtZSB3aWxsIG5vIGxvbmdlciBiZQogYWNj
ZXNzaWJsZSB2aWEgYnBhZ2UuCiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w
bHVnaW4vaW5jbHVkZS9idWYwbHJ1LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNs
dWRlL2J1ZjBscnUuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDEwNDA0
Mi1tYTJuc3NjcWR2d29waDhrCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1
ZjBscnUuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDEzMDczNC11ZW93
OW1uNjBjenA3bzRtCkBAIC05Niw3ICs5Niw3IEBAIGJ1Zl9MUlVfaW5zZXJ0X3ppcF9jbGVhbigK
IFRyeSB0byBmcmVlIGEgYmxvY2suICBJZiBicGFnZSBpcyBhIGRlc2NyaXB0b3Igb2YgYSBjb21w
cmVzc2VkLW9ubHkKIHBhZ2UsIHRoZSBkZXNjcmlwdG9yIG9iamVjdCB3aWxsIGJlIGZyZWVkIGFz
IHdlbGwuCiAKLU5PVEU6IElmIHRoaXMgZnVuY3Rpb24gcmV0dXJucyBCVUZfTFJVX0ZSRUVELCBp
dCB3aWxsIG5vdCB0ZW1wb3JhcmlseQorTk9URTogSWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIEJV
Rl9MUlVfRlJFRUQsIGl0IHdpbGwgdGVtcG9yYXJpbHkKIHJlbGVhc2UgYnVmX3Bvb2xfbXV0ZXgu
ICBGdXJ0aGVybW9yZSwgdGhlIHBhZ2UgZnJhbWUgd2lsbCBubyBsb25nZXIgYmUKIGFjY2Vzc2li
bGUgdmlhIGJwYWdlLgogCgo=

--===============1152096349==
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/mysql/5.1-innodb/
# testament_sha1: 31da17b1da17a40ec1a839ba51ee5911dc9ed38e
# timestamp: 2010-05-20 16:07:44 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   ma2nsscqdvwoph8k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbcRHp0AAlZfgEAQW2f//18n
lgC/7//wUASM5c9rTend69UN29PCSRKemQnpM1M2qPKep6mm1PKAAAyBoElRop6nmJGp5NT1GmaT
TamnqHqNA0A0AJFNEajSYj1T8plHpNDNQBoyD1Gh+pqAbUiEeoTYjKGnoTRiGg9JoDBDICSSGRT2
QnqaAU8pvQp6jJkMgAGg3chPTtYb37fY86Y1QmWNpYp4RRkYJ9VVMUstWB9cudZC8bab/HBGU7Ga
dWpzc4c3DyPQsa8Lhmzv1FT75R1FkiGVGd7P0MIgkXGvboxv28/Q3n5umnSbKSn7QHYLjwWdOJFB
OL/rZzRNP26VAKbCRuCYIrAUT5GKHpLBTS+5+FAhjIIlV4hikVYuq3ICZmmaWYQ0l5EmBOOiklrU
yAXXvISZMYFFjSaiQF3WlYJ4GG+0FsgTTVrgcyJJk5lbRNkkAevhPTIy/uFjlxXvhaypyiS3is3V
FWKiV3Cq0KFIinaaTYSF5C95rxoMyUhyKfFhm8RFQWLbaaxxWBnHyTEb7aQxlUrapQHiwOvPynlp
yATkmXKSqSHIpL53G8hI8tapLzYlEpPQB5a5HjdhcwLLUb9ecxwUhXNSMSkIlKQDDgSqZWqIKHaw
HtcY4wcOLEsCkmQBkth/L07CZBKsqPjERoV5UOLHoIlFzhWnECUasbb4JSGNyTynAm+456h97ZiR
QOPOr51G8ErSVhUaVDdoseGkZmOoqXGAH14EcxdCD4ZoJlQEUixojlkE7rZoehvMlYxpMktINIRX
son5hrz+pfD3xbIsiUcotyFLkGNj3G1syIkZHE4mYRaQndaeB+zwXE3lyuKHr1Rsk3emJ3+zCgQi
tNq40rjKTEJpMEKM/tGhCtNRLnKCND0LbSp8KjPbECg+9gBt7ks5sNLkmMrMvDehzDdPVzSZWwo8
A0BpUoXQqXtOrPRqdzv1OEPH3RFSxFqNVgOn1kyRzIlYYEysKNOvADEnkYpaTSpK5LasHiuS0zJk
lruGjdcT3GpbSeq9w7EokaSaYvfY4sMwlaRpPkmFqAsvfx5agu3mEU+1IrRRP+kpsXJaHCfQPNXK
SEfkUJVnCsy1lpQocTl0WuNWFLc+qzn2LVDrTuAm3xc4vQ3AjPACk8ynil9CsqMTuXJEc3610PnW
MBHmakFRyqOmjo2kTOPLehakYiUDKwGQthYhMiDGXbkLKyAPO8XahMbVxQsMu9j6jgYmsFpo3xKI
npAfYsTvxrg9h251gDJblN6kOZMKNn34kPqzXlWSojZDEWVBoSXZVCGPCBBI0xIkV8O5CuR0k6/Y
WLJQA9oDrLFbbnCmNTJMR1wgN8NChFt16cIOAxox6PAzEexxJlR1PeAZlpMJ6w0UtTZ4xWChXmBQ
mN4oxhrOqIGVBs5PK00ErtNhTV4SeUH+CTZyTA9lfgOIkEVhITFTBKRQBt9lq4gbRG1PFbeVWqHX
agf1LFblAynfzKRGEmmZm0GidWPrkoAz/4u5IpwoSFuIj06A


--===============1152096349==--