From: marko.makela
Date: May 4 2010 1:09pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3441) Bug#53306
List-Archive: http://lists.mysql.com/commits/107318
X-Bug: 53306
Message-Id: <201005041309.o44CF83H010335@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0970686242=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMjU1MTAtZ2VtY2Zo
ajdtZWZyaGFsbwoKIDM0NDEgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBmc3BfaW5p
dF9maWxlX3BhZ2VfbG93KCk6IFplcm8gb3V0IHRoZSBwYWdlLiAoQnVnICM1MzMwNikKCiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2ZzcC9mc3AwZnNwLmMKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9mc3AvZnNwMGZzcC5jJwotLS0gYS9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vZnNwL2ZzcDBmc3AuYwkyMDEwLTAyLTIwIDE2OjQ1OjQxICsw
MDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9mc3AvZnNwMGZzcC5jCTIwMTAtMDUtMDQg
MTM6MDk6MTcgKzAwMDAKQEAgLTg2OSwxMiArODY5LDEwIEBAIGZzcF9pbml0X2ZpbGVfcGFnZV9s
b3coCiAJCXJldHVybjsKIAl9CiAKLQlVTklWX01FTV9JTlZBTElEKHBhZ2UsIFVOSVZfUEFHRV9T
SVpFKTsKKwltZW1zZXQocGFnZSwgMCwgVU5JVl9QQUdFX1NJWkUpOwogCW1hY2hfd3JpdGVfdG9f
NChwYWdlICsgRklMX1BBR0VfT0ZGU0VULCBidWZfYmxvY2tfZ2V0X3BhZ2Vfbm8oYmxvY2spKTsK
LQltZW1zZXQocGFnZSArIEZJTF9QQUdFX0xTTiwgMCwgOCk7CiAJbWFjaF93cml0ZV90b180KHBh
Z2UgKyBGSUxfUEFHRV9BUkNIX0xPR19OT19PUl9TUEFDRV9JRCwKIAkJCWJ1Zl9ibG9ja19nZXRf
c3BhY2UoYmxvY2spKTsKLQltZW1zZXQocGFnZSArIFVOSVZfUEFHRV9TSVpFIC0gRklMX1BBR0Vf
RU5EX0xTTl9PTERfQ0hLU1VNLCAwLCA4KTsKIH0KIAogI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAoK

--===============0970686242==
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: 0f5bb19417d14acc9eca2173c99f9a5f4b02228e
# timestamp: 2010-05-04 16:09:25 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   gemcfhj7mefrhalo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWco7VeYAAarfgEAwW2f//3Oj
SxC////wUAO6eGg0ClW0MkRqegmjJM9CnoE0wIMgNDGgmg5hMAmAEwmE0wAACZNNAwlEaptT1I2m
U/REfqagDQ0AHqAAAOYTAJgBMJhNMAAAmTTQMJJJpoDQTCAmTU8SHqmanonp6po02oepkpfklZcT
8/g6rsCYRUirpZ3sDbDgofqvWeO+mcLCmtRENG7abVxjbM1pangxMCLS7Fij+Ov5KNqLRvFix9oB
MgnY63cvCtQbnSrSQFXZlgDKMizAOHrW/+oIY9Xp2OtOAsQoPuGgH0hlMuPpxFwr1QfkniNoi3An
3y+SP9pgAzRTOtbm8QyDeElqBkEodMpml0jxYkvIpPDyDWZq1UNpZe6Khcg6VzyBJYmgX5OHi/s+
h7/NYRFZmdc5R2mkeFhljkZiKSnMln+ZQOCVYFCMBgtvW9B5UaRKITwCPfHHHM9kkGLKIw8Y+RF2
bqxkE46N4w6H/dxqD1hOQu0N51oOF6whgRNcHF616T3FNQbTMkLglrL5pSeU4WmFsXF8QsWkMX/C
S0vcK2lUhod23JynZgbGKyHDjao5xiDtgNOPLbIhoGVUrygYmJ8b6AkJmFAHExiSKbM7Omm4upwx
qGLlLOVBCidUye9md2OTC3saC3ApnG5yj+rG/lGrStigxalynMCOEjxRE17Oa97SN1fHJJy6BfMJ
0koLsU2xhOy+sulnBtDgeQj807xFTikkB38iPrSolcCTfML7TiPwMwMfHxDuNB4nTqHUxFXv8/p0
ExWGWo/UKz4BYDg8R5jip9nydqkYQ0RHsj5F1wTpyiOnF/VxWFfzDSZkOO/1HJEnZoHMvHDyzdmU
GN3Jqx6GjIZY8rCleiRQnP+yZHdZHw+WYW7CqpQKQJ1JoqDnpO9484mAsgidDNenfxPjp3SKK/Cr
TDPt0ZtGcgKMOAHljGi4MIGEqwxqoN4vPiKhwLw7RPiCoQ818gqnw7bnwvAqwAt9j/DvFzWRBeu0
RcGlI46hVJwh04hgh3Mpt0YdRH6CK+O8/gcmtVirNR6v0yi9ZsRCDkC6wydCaRrgD4DyKwKnKU44
wFoRpCcpOOWxwiaSQ2JEAOD0eojkFC9rldop4iKdTn96dyVVVGZoiA2AyOa0J7UA3aaTCCb4tvAw
ZpYkK3GMIIhFH5myA8ZRkcjhwq2lkmcQMoC0JiQN5oKAqliykG9utxTq/JY1egma7cOIBMEUw9lQ
4cJp7amSEZwTU4awKLRILoZI1KqyJaBKzabPhr/xdyRThQkMo7VeYA==


--===============0970686242==--