From: marko.makela
Date: December 2 2010 8:16am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3251) Bug#58226
List-Archive: http://lists.mysql.com/commits/125758
X-Bug: 58226
Message-Id: <201012020816.oB28GFwU031679@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2048754133=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTEzMDkwMi1xMGc1
NHVmaWkwNm9yNG9lCgogMzI1MSBNYXJrbyBNw6RrZWzDpAkyMDEwLTEyLTAyCiAgICAgIEZpeCBV
TklWX01FTV9ERUJVRyBjb21waWxhdGlvbiBmYWlsdXJlIGNhdXNlZCBieSBCdWcjNTgyMjYgZml4
LgogICAgICAKICAgICAgVG8gZml4IEJ1ZyM1ODIyNiAoc3BlZWQgdXAgVU5JVl9ERUJVRyksIGFt
b25nIG90aGVyIHRoaW5ncyB3ZSBubyBsb25nZXIKICAgICAgZGlzYWJsZSB0aGUgaW5saW5pbmcg
b2YgdGhlIGZ1bmN0aW9ucyB0aGF0IGFyZSBkZWZpbmVkIGluIElubm9EQiAuaWMgZmlsZXMuCiAg
ICAgIEluc2lkZSBVTklWX01FTV9ERUJVRywgdGhlcmUgd2FzIGFuIGltcGxpY2l0IHR5cGUgY29u
dmVyc2lvbiBmcm9tIHZvaWQqCiAgICAgIHRoYXQgaXMgYWxsIHJpZ2h0IGluIEMsIGJ1dCBub3Qg
aW4gQysrLiBOb3cgdGhhdCBpbmxpbmluZyB3YXMgZW5hYmxlZCwKICAgICAgdGhlIEMrKyBjb21w
aWxlciB3b3VsZCBzZWUgdGhlIGNvZGUgYW5kIGNvbXBsYWluLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbWVtMG1lbS5pYwo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL21lbTBtZW0uaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9tZW0wbWVtLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAx
MjAxMTMwOTAyLXEwZzU0dWZpaTA2b3I0b2UKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L21lbTBtZW0uaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDIwODE2MDYt
YzE2dGFja3ZnN3ZicXZpMApAQCAtMzUwLDcgKzM1MCw3IEBAIG1lbV9oZWFwX2dldF90b3AoCiAJ
dWxpbnQJCW4pCS8qITwgaW46IHNpemUgb2YgdGhlIHRvcG1vc3QgZWxlbWVudCAqLwogewogCW1l
bV9ibG9ja190KglibG9jazsKLQl2b2lkKgkJYnVmOworCWJ5dGUqCQlidWY7CiAKIAl1dF9hZCht
ZW1faGVhcF9jaGVjayhoZWFwKSk7CiAKQEAgLTM1OSwxMiArMzU5LDEyIEBAIG1lbV9oZWFwX2dl
dF90b3AoCiAJYnVmID0gKGJ5dGUqKWJsb2NrICsgbWVtX2Jsb2NrX2dldF9mcmVlKGJsb2NrKSAt
IE1FTV9TUEFDRV9ORUVERUQobik7CiAKICNpZmRlZiBVTklWX01FTV9ERUJVRwotCXV0X2FkKG1l
bV9ibG9ja19nZXRfc3RhcnQoYmxvY2spIDw9KHVsaW50KSgoYnl0ZSopYnVmIC0gKGJ5dGUqKWJs
b2NrKSk7CisJdXRfYWQobWVtX2Jsb2NrX2dldF9zdGFydChibG9jaykgPD0odWxpbnQpKGJ1ZiAt
IChieXRlKilibG9jaykpOwogCiAJLyogSW4gdGhlIGRlYnVnIHZlcnNpb24sIGFkdmFuY2UgYnVm
IHRvIHBvaW50IGF0IHRoZSBzdG9yYWdlIHdoaWNoCiAJd2FzIGdpdmVuIHRvIHRoZSBjYWxsZXIg
aW4gdGhlIGFsbG9jYXRpb24qLwogCi0JYnVmID0gKGJ5dGUqKWJ1ZiArIE1FTV9GSUVMRF9IRUFE
RVJfU0laRTsKKwlidWYgKz0gTUVNX0ZJRUxEX0hFQURFUl9TSVpFOwogCiAJLyogQ2hlY2sgdGhh
dCB0aGUgZmllbGQgbGVuZ3RocyBhZ3JlZSAqLwogCXV0X2FkKG4gPT0gKHVsaW50KW1lbV9maWVs
ZF9oZWFkZXJfZ2V0X2xlbihidWYpKTsKCg==

--===============2048754133==
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.5-innodb/
# testament_sha1: 04976458c9023d5043fa77f337c3b9788998de50
# timestamp: 2010-12-02 10:16:17 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   q0g54ufii06or4oe
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZtxZwEAAclflAAwWn///3/n
HxC////wBAAIAFAEZngC2UoAaQ0Qp6J6p6PQU09qNqho09T0gBo9R6jIepoHqaBxkyaaYTIyBgRi
aMEYQaNMAAg0QaJPEmmptE8poGhoeiABo0AaABxkyaaYTIyBgRiaMEYQaNMAAgkkIaACaZNBMQmm
mFA09EwgGGo0QoQYaWA35CP17pg50AnlUzaIhrdjOgKXChEjscSrBmnllMzAt1EPhV88phpyJQhS
ArF+/mz0iLO+j5gX9uNEibUjRwLWEirBGzTQiG+INag6ta/UY2F7uUJfj9k6X3H/LYTJkpDcQ02A
KMB4vk0RxZRObt9yHY7JNMet1A4MRjmVFfCKvmvyXQJ64XZfTsXLnv1aTU60jlVdgxzERfCqbtIL
tYGbteOZ1wlyThGtPS1rwuFXFSCpG9SoKIgyhoRfHvXmtStVjI7YiPLqzOmmROe4FjK7sxLU5eJ3
x1T2ijZ7VkLTxp77Cxlht28d5iqdwiKDCAtJsY4jON+Es8sXUq5wY+xvJFld5F941Ke+4oV0xmWo
mYxVG5lSSy4zPoL2HDZTWPIFkVOYk6gqY57rrWNvirHKGxeRTcPcFoeqNeGd2ZOJ8orR8l2umSVj
FUPoovvT3wUlx6bFAXKUlLOitYUyF5tiryTatWGCtq6DYKaiSfNbk/ET1eXvJmtgxGHpsnt2EjKd
TbtUKcHyKrVJaIC4EsUTDlUqe8aIBBYaojcbQ8BzzkTKs3dg6AdubfcG8qE2U8fJMWx4IN034zBm
aQIyHTcWq261hM9tZJhaXgx9U/+/kvpdhhKPcp3RTPhJ3KCrCvzYscfXjp63auLB+Hxgnjg6V4eG
n3CPtPR8KRe5IzrpmgHfRcI9udTUtM1J4CE8IIL9xUnERiKtL0FXuFP0Kmr7Cg0Bcwu7XyAqrrzb
BnbuwTK5cT3CxxOSgYLCrWn6l7T7c7DL1jmcgHqf3pGtwPrZjg0sXY9btUJlImcrKsVfB9q9xZXw
VfWJcLGZcIpRAiZIzMSpZcQSAXCMi6KBHp3heohFm7nqW8NdbSHExwJCuzi+O74S6HdwgboOi2dV
L4Ztb5uPBI1pcuB2plllrs02QyjjNyqKKQnT+oyrWBu4kl/Vmt0pGwmXw65zYxuY5MzOUpSshcUQ
7qXczaGS62CplpailE6aBbp0g26vb2XK10+RHNScHJmrxmJs0P9i5hNqtOV5Etd3b9kbL0NG24Nv
O29o18pb0y5tiI89gbEiAo794Ug9wlthybsmSHDmIVklRk6Va5qJ06jgkMJm6BGi+J2jO34K3qWh
N0TVG6uL2gPT0MPZzKu6EFg5yJGGZm4sQTH5tLkNLCEUMyZP4dP+xcIbNNnj3qrm+CSpF6tU74SH
Sv6SPQFq5OVld/jX78nSaMycfLri8KZpdq6hbd7IiIHywgyJeuoh6HSJEVfhJU5DRCMsLBqWpW5K
WftE9ApO7GVcAGRK3HIMmIPF7KoWUU1EIO/oo4CwNpC7AxY2DK1ip1dw/opCwIKRyujjStq5r2Fe
e8pU9c9tHlPb5CuD0C+Yo6BVFg1LSBRulhUHoG/wo7f8XckU4UJCbcWcBA==


--===============2048754133==--