From: marko.makela
Date: May 19 2010 7:58am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3470)
List-Archive: http://lists.mysql.com/commits/108574
Message-Id: <201005190758.o4J66QUG022672@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2036683651=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwNzU2MTMtcDN1aHph
NjV1dWRtM2I3dQoKIDM0NzAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBBZGQgVmFs
Z3JpbmQgY2hlY2tzIHRvIGNvbXByZXNzZWQgQkxPQiBhY2Nlc3MuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTkwNzU2MTMtcDN1aHphNjV1dWRtM2I3dQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
YnRyL2J0cjBjdXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA3NTg0
My00Z2wzdWlqbzZjd2p0Y2Y5CkBAIC0zODcxLDYgKzM4NzEsOCBAQCBidHJfc3RvcmVfYmlnX3Jl
Y19leHRlcm5fZmllbGRzKAogCQkJZmllbGRfcmVmICs9IGxvY2FsX2xlbjsKIAkJfQogCQlleHRl
cm5fbGVuID0gYmlnX3JlY192ZWMtPmZpZWxkc1tpXS5sZW47CisJCVVOSVZfTUVNX0FTU0VSVF9S
VyhiaWdfcmVjX3ZlYy0+ZmllbGRzW2ldLmRhdGEsCisJCQkJICAgZXh0ZXJuX2xlbik7CiAKIAkJ
dXRfYShleHRlcm5fbGVuID4gMCk7CiAKQEAgLTQ1MDcsNiArNDUwOSw3IEBAIGJ0cl9jb3B5X2Js
b2JfcHJlZml4KAogCQltdHJfY29tbWl0KCZtdHIpOwogCiAJCWlmIChwYWdlX25vID09IEZJTF9O
VUxMIHx8IGNvcHlfbGVuICE9IHBhcnRfbGVuKSB7CisJCQlVTklWX01FTV9BU1NFUlRfUlcoYnVm
LCBjb3BpZWRfbGVuKTsKIAkJCXJldHVybihjb3BpZWRfbGVuKTsKIAkJfQogCkBAIC00NjkwLDYg
KzQ2OTMsNyBAQCBidHJfY29weV9leHRlcm5hbGx5X3N0b3JlZF9maWVsZF9wcmVmaXhfCiAJCQkJ
ICAgICAgc3BhY2VfaWQsIHBhZ2Vfbm8sIG9mZnNldCk7CiAJCWluZmxhdGVFbmQoJmRfc3RyZWFt
KTsKIAkJbWVtX2hlYXBfZnJlZShoZWFwKTsKKwkJVU5JVl9NRU1fQVNTRVJUX1JXKGJ1ZiwgZF9z
dHJlYW0udG90YWxfb3V0KTsKIAkJcmV0dXJuKGRfc3RyZWFtLnRvdGFsX291dCk7CiAJfSBlbHNl
IHsKIAkJcmV0dXJuKGJ0cl9jb3B5X2Jsb2JfcHJlZml4KGJ1ZiwgbGVuLCBzcGFjZV9pZCwKCg==

--===============2036683651==
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: c6a55d6783c33ec41259a96f6122ff71ae79db86
# timestamp: 2010-05-19 10:58:52 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   p3uhza65uudm3b7u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaTzMV4AAb7fgEAwW2f//3Mn
n4q////wUAP5Pd3YbOuVbdtnBJKaTE0E9GmCaaTTCjNQ2TU9QDI9MJqAkoE1PQ00TTU8hTaQwmgB
iAABkBKamU0E0yYhMo9T00JoABppkD1AAHMCYmgwmTJkyMJgmmmRiYAhgElGk1E09JoZmVBtJ6mg
NAAAAACuTOySbNfoWPJu7jLj1QztMTWKnLY8DFm3bfEpqNGF9uJfYkg4/APxE7LqFBasU91Mn7NK
6Va+sw7f7xyKmc3JjzYXOTpTY6oi97p6mm1oHnpHAaB5RHHdyn/Sa9jM38oQ9CI4LuFgWKC2pu7j
CtlNDq5l2pHCjOIw4JyfYu86L9kQNtnuqc2JIcIkmSILPQUPwlY2UpImK6PSppeqFojoltcsC6DG
0m1P5DpLeB1q52FiDW3USbgI/M9T58k+lmKPUUX2ts5qkVm0WJbRMmzhl1LciopgiZhQqJ0O+45V
E6hlUWFZkxQULOK1NNkjVd9zsRRUxrCBQliblgMF/HYxryOrfUZ3oHZGGyTCtVJgqLYNW+5bdCTe
QbqTiwpxUyUweSUgiuYUjunCjB62nVcnwH60EVF5YTJjU4uO3JXPv1q3cqQhAUJrbpOrUYF4UNWZ
WMT0yKDeMxnWpGb5VLM9Ii9o0lYTzs/Wz+ZLf1nIht6MOC1GFQumCPIlVqNfxdA8QOedZiWPqyD2
WDhDhZMaPN75ririPVZ4biiUnNcXJ9W1wXJcFyUblP9pF0XRZpq0yGy7+ro/TNEQ7XoBtLjP5UFh
ApEQ4TkKuUzZkjDpDw7hGjXONRCMvfGKqMR4MqNVCunkSnkoMY+TrabD27NfVDON3iJi6i2GjjGi
oTLhihE7Fgmrts3Ct39ffi6tqQ29IerlQVVsm0MHj1mOTaxVSr+M15sTnL+Vcu8lxLnsYhYh1I2W
ol1VneTRGS4Php1QGmwc/Ler7cpBySH7o6tMRXfdYzMNRSeBJkWgRXB+GRat/fOM22iyXMaGA+nr
okJ8jy/GmLQK1huiyc7DThMgNdalSIr/thfk3izTuGma0qRYIhEjKm0ME97VaN4CsC1+ps4hUeIp
kl3cBG0NaRDmlWK1RekPgkMUR5nwuq6UiGa8Yxd5eB8iTLAKSWy815pUVD8sSxENWth0VTYhS3aW
aeS8DOQ5PsyOEeYo35IVwC1kN8pF0M5ZXhTjy4YJuw000WECSLMnRiM7PBjpetSYtFYktztZUKdv
RhcmeynnqZjM1lCosByEQ0m7uqIFwk5uWuhFZZuAlS2+bEwhTyi7mg2/4loz3DRnWRVPlHakK256
ROxvyJiFlK8bJpU8WzxQZoFczrs8E16m+sN2kDlnaMXy02gv1MzZDarKTU/DN/xdyRThQkKTzMV4


--===============2036683651==--