From: marko.makela
Date: April 6 2011 6:22am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3360)
List-Archive: http://lists.mysql.com/commits/134772
Message-Id: <201104060622.p366Mvee013408@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0824014558=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTExMTg1NC0yeDdj
bXNsM2R6cjUzMHVlCgogMzM2MCBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTA2CiAgICAgIEVuYWJs
ZSBfX2F0dHJpYnV0ZV9fKChjb2xkKSkgb25seSBmb3IgR0NDIDQuMyBhbmQgbGF0ZXIuCiAgICAg
IFRoaXMgYXR0cmlidXRlIHdhcyBpbnRyb2R1Y2VkIGluIGJ6ciByZXZpc2lvbi1pZAogICAgICBt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTA3Mzc1OC1iOHk3MzN5dmtxdW05NDBpCiAg
ICAgIGFuZCBjYXVzZWQgb2xkZXIgR0NDIHZlcnNpb25zIHRvIGVtaXQgd2FybmluZ3MuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9vczB0aHJlYWQuaAogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS91dDBkYmcuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwdXQuaAo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL29zMHRocmVhZC5oJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA0MDUxMTE4NTQtMng3Y21zbDNkenI1MzB1ZQorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwdGhyZWFkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3Z3hudnc4aQpAQCAtMTA5LDcgKzEwOSw3IEBA
IG9zX3RocmVhZF9leGl0KAogLyo9PT09PT09PT09PSovCiAJdm9pZCoJZXhpdF92YWx1ZSkJLyoh
PCBpbjogZXhpdCB2YWx1ZTsgaW4gV2luZG93cyB0aGlzIHZvaWQqCiAJCQkJaXMgY2FzdCBhcyBh
IERXT1JEICovCi0JX19hdHRyaWJ1dGVfXygoY29sZCwgbm9yZXR1cm4pKTsKKwlVTklWX0NPTEQg
X19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgdGhlIHRo
cmVhZCBpZGVudGlmaWVyIG9mIGN1cnJlbnQgdGhyZWFkLgogQHJldHVybgljdXJyZW50IHRocmVh
ZCBpZGVudGlmaWVyICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTExMTg1NC0yeDdjbXNsM2R6cjUzMHVlCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3Z3hudnc4aQpAQCAtMjU1LDYgKzI1NSwx
OSBAQCBlYXN5IHdheSB0byBnZXQgaXQgdG8gd29yay4gU2VlIGh0dHA6Ly9iCiAjZWxzZQogIyBk
ZWZpbmUgVU5JVl9JTlRFUk4KICNlbmRpZgorI2lmIGRlZmluZWQgX19HTlVDX18gJiYgKF9fR05V
Q19fID4gNCB8fCBfX0dOVUNfXyA9PSA0ICYmIF9fR05VQ19NSU5PUl9fID49IDMpCisvKiogU3Rh
cnRpbmcgd2l0aCBHQ0MgNC4zLCB0aGUgImNvbGQiIGF0dHJpYnV0ZSBpcyB1c2VkIHRvIGluZm9y
bSB0aGUKK2NvbXBpbGVyIHRoYXQgYSBmdW5jdGlvbiBpcyB1bmxpa2VseSBleGVjdXRlZC4gIFRo
ZSBmdW5jdGlvbiBpcworb3B0aW1pemVkIGZvciBzaXplIHJhdGhlciB0aGFuIHNwZWVkIGFuZCBv
biBtYW55IHRhcmdldHMgaXQgaXMgcGxhY2VkCitpbnRvIHNwZWNpYWwgc3Vic2VjdGlvbiBvZiB0
aGUgdGV4dCBzZWN0aW9uIHNvIGFsbCBjb2xkIGZ1bmN0aW9ucworYXBwZWFycyBjbG9zZSB0b2dl
dGhlciBpbXByb3ZpbmcgY29kZSBsb2NhbGl0eSBvZiBub24tY29sZCBwYXJ0cyBvZgorcHJvZ3Jh
bS4gIFRoZSBwYXRocyBsZWFkaW5nIHRvIGNhbGwgb2YgY29sZCBmdW5jdGlvbnMgd2l0aGluIGNv
ZGUgYXJlCittYXJrZWQgYXMgdW5saWtlbHkgYnkgdGhlIGJyYW5jaCBwcmVkaWN0aW9uIG1lY2hh
bmlzbS4gIG9wdGltaXplIGEKK3JhcmVseSBpbnZva2VkIGZ1bmN0aW9uIGZvciBzaXplIGluc3Rl
YWQgZm9yIHNwZWVkLiAqLworIyBkZWZpbmUgVU5JVl9DT0xEIF9fYXR0cmlidXRlX18oKGNvbGQp
KQorI2Vsc2UKKyMgZGVmaW5lIFVOSVZfQ09MRCAvKiBlbXB0eSAqLworI2VuZGlmCiAKICNpZm5k
ZWYgVU5JVl9NVVNUX05PVF9JTkxJTkUKIC8qIERlZmluaXRpb24gZm9yIGlubGluZSB2ZXJzaW9u
ICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3V0MGRiZy5o
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJnLmgJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA0MDUxMTE4NTQtMng3Y21zbDNkenI1MzB1ZQorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwZGJnLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3Z3hudnc4aQpAQCAtNTMsNyArNTMsNyBAQCB1dF9k
YmdfYXNzZXJ0aW9uX2ZhaWxlZCgKIAljb25zdCBjaGFyKglleHByLAkvKiE8IGluOiB0aGUgZmFp
bGVkIGFzc2VydGlvbiAqLwogCWNvbnN0IGNoYXIqCWZpbGUsCS8qITwgaW46IHNvdXJjZSBmaWxl
IGNvbnRhaW5pbmcgdGhlIGFzc2VydGlvbiAqLwogCXVsaW50CQlsaW5lKQkvKiE8IGluOiBsaW5l
IG51bWJlciBvZiB0aGUgYXNzZXJ0aW9uICovCi0JX19hdHRyaWJ1dGVfXygobm9ubnVsbCgyKSwg
Y29sZCkpOworCVVOSVZfQ09MRCBfX2F0dHJpYnV0ZV9fKChub25udWxsKDIpKSk7CiAKICNpZiBk
ZWZpbmVkKF9fV0lOX18pIHx8IGRlZmluZWQoX19JTlRFTF9DT01QSUxFUikKICMgdW5kZWYgVVRf
REJHX1VTRV9BQk9SVAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS91dDB1dC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdXQwdXQuaAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTExMTg1NC0yeDdjbXNsM2R6cjUzMHVlCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1dC5oCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTEwNDA2MDYyMjM2LXkxMW8wZGRyd2d4bnZ3OGkKQEAgLTI3Niw3ICsyNzYs
NyBAQCB2b2lkCiB1dF9wcmludF90aW1lc3RhbXAoCiAvKj09PT09PT09PT09PT09PSovCiAJRklM
RSoJZmlsZSkJLyohPCBpbjogZmlsZSB3aGVyZSB0byBwcmludCAqLwotCV9fYXR0cmlidXRlX18o
KG5vbm51bGwsIGNvbGQpKTsKKwlVTklWX0NPTEQgX19hdHRyaWJ1dGVfXygobm9ubnVsbCkpOwog
LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCiBTcHJpbnRmcyBhIHRpbWVzdGFtcCB0byBhIGJ1ZmZlciwgMTMuLjE0IGNoYXJzIHBs
dXMgdGVybWluYXRpbmcgTlVMLiAqLwogVU5JVl9JTlRFUk4KCg==

--===============0824014558==
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: d607577333c8cc742012afea4e3e42507c7122c6
# timestamp: 2011-04-06 09:22:50 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   2x7cmsl3dzr530ue
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbIp7RsAA+PflAAwW3f//1+n
nwC/7//0BAAIAGAHTpW+B1oFSWxVdOugFB4aagiekYk9TR4JqemUND1AAxDQxAaBJJGpkD1TyaaT
0jQGTAQNAAADQOYAjBMQDAJgmjIaGATBGJhKE0Q0JiU9pE/VNPyoH5U00ADRoAAA5gCMExAMAmCa
MhoYBMEYmEkgEATI0GiZNKNTZop6m9ImTCY0m1PQKRpHvkY6PAhQGnRoQiV/PNiM6oUENRqYab+q
RAl8ok7VM52aNa1DWe2l5wrx6aLkl09zO6P66Mw6g64KqqqqpQe0wA2MdEoTtlmYGGYsNwr6QtxE
BJRwKlbd5Piw282UUiivbQwoZb1rzDTYurG+81fvr4bgX9x0ABvQDWtTNWOClL2ypvV3krQLgsfd
TGg58bKgedXFoxQsYqtKsGB98AMGzrbHihicpK4ltZy5JlcTt3KUJDgLVgGy7kxiT9pwLOjdBVwM
I8xIwO5RmW/RB05DeljDh0lZVzBdQRwXxBeYK9WsCY8OGurdugLvuuG8LyNXJCNOva+oc5md8l9I
I4nDt3Bwbs7g2rKKE5gxZmXnwdn4cWBHuBSk/oz6V5kk8cQSDgqxgYqrBQgCgCqmoEC2DnsJgePg
bltBWGCupf6ArFw+bKCrVuQFGV56/sgCMY7/8dDf5wnkCJ0THcgp0kC5AoFz86nYcdLcah2AvuMm
D+MLiw+8E32TTWp69CJYCgiluA2gKDHJlIE5pl0DHobMEKyGnW19Q3HOyZgC1jMFWUzXMeVPtIug
MpoUCzBKkMzMzMzdgIgQLRaK9qdWHhVTsOjmoT7D51kTLa3gpEY9LgT1MFE2mqcULFeOuTiCQWlq
3Mq1SY9PGCNZtjKDjldmUKIjJxmCYmbNh7DcWlUNusTDQzQSyMS/NXqSeabmFtcU3LQYvGVELYk8
xuNJCVdM511D0JvBxuLQTExwKJMqCBOg8foC22j5lMtl4r8jEFQflQqfDBNjcSKbcZ0BdVnUr7C5
SVwK8eJ0HTJPMHC5rZeSjq1mKA0zM6ZySjvgo4qHqKnNbjg6/VQTawVSmptnEFMtsJkIGREzBYLQ
eQ45GafmUMLnRiEmo5yrXmfSlNEh7hNIz0SpSStUCj0rKi7182SknAYgGcIogkwYQcVTgtO4CISs
zDMwN36l4rUj6D9ET+iwEXKQfr+yPih8o1I+NgWopSSveDj9VNFaD5IYKB/7BE16MiKNQgHJkvu/
GAEjxeIxGTKMShoMZlxCWAYM4I/ZCZ5H29KEPFcclqCHs8y8GeYY8IGciFMNnjYiFEu8oIejc8YU
c8q1vrm+RqjD62Bcz0XE5cT4Jgh6cyYL3n4RInAgDX+3+eiTzmhYoVh5UO4K0F0vqMgV6FjGR5VY
ES07GNCTmQiyAL7U4N3p6j70I00oq7Bw2LPZPaxdBSCqzKikEwJFGsNjImsxN+VIkGrSSBE5cVmC
5OBPN4LA1N6zzyBXYdkaR5Atlx0W/v3ast79TwBYbPCC0O4JFATPs6YfF34kSN/Us3JlvaMDoeBE
5kg9QeV1jgc5GQZJVlDUjvWk9b8bn7z/kZ49MhYHhC2sYY8gXXCFteNMqRUNcZPJQwgINRERtC3o
80wrOBwzfo7dPbjwNSxBdQRCPcZiwFxO/fqcmOxE6wBQR2GK0es/gPqDENV1cDMXDIcuyxgXKdu1
FW4wWJVXXCYwCInMGsaDJzA/QXriB49BlEpggt5eZ/lA1hVSPkyPZtNnIF4zCXFfR/8E2RKExjrR
TvwjLyNpk8KBLgFVW3KlYE215hd7pc+oTQ4xBNx6dQR1Pl0SihF6qJMS8AtEPcAuWNiXjMLkIYCD
dcCwPaaNKdlrgTibGFoIqvdUm8QRXYcBfmfUhgdrYrAnDYXb3FrSih744pyelGjkH51BAiCwQ5OS
oykwuNIyQEYsZU6J6hUhmTDCiOD3gqdvHTsDgR7wWHGvI2GIUd0gKDAj2ssE9lNgPc949TH64B+y
EWJTeHZ69R4Yb+drW82BhMORVopPhDfq/GkpjbeCfyKtz08OzD08EpeJXZT6Ve4FOF0nIhXtS8ni
RML2cqipCQpKIJsCMnLkYyluV4uw1+1KS418j9bDAz8GRmGGAGyZAOCvFnKIXmVaT20sJdmlegg4
IAZU+cjxi5EWndNBtrcK6L+Scbs8TiO7AVLY16TlckxMFbMeK2xKFb6Zl4K9UOv8pkdjtcCxK8cH
1qZNhtUssFnngqn5gfBQQvIFExBMUq3fBVdgTCMtFUzrMIHUF7lp6LfgujCtq1XH57f6NUeQu5Ip
woSFkU9o2A==


--===============0824014558==--