From: marko.makela
Date: May 26 2011 1:22pm
Subject: bzr commit into mysql-5.5 branch (marko.makela:3401)
List-Archive: http://lists.mysql.com/commits/138216
Message-Id: <201105261323.p4QDN75w016282@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1783645689=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MjAwODIyLXUzbThk
Z3EzM3cxNWFiZnEKCiAzNDAxIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDUtMjYKICAgICAgSW5ub0RC
OiBEbyBub3QgcHJvdGVjdCBQQUdFX01BWF9UUlhfSUQgd2l0aCBidHJfc2VhcmNoX2xhdGNoLgog
ICAgICAKICAgICAgVGhpcyBpcyBhbiBleHBlcmltZW50YWwgcGF0Y2ggZm9yIHRlc3RpbmcuIFRo
ZSBwcm90ZWN0aW9uIHNlZW1zIHVubmVjZXNzYXJ5LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvcGFnZTBwYWdlLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9w
YWdlL3BhZ2UwcGFnZS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvcGFnZTBwYWdlLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBhZ2Uu
aAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNDIwMDgyMi11M204ZGdxMzN3
MTVhYmZxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdlMHBhZ2UuaAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUyNjEzMjI0NC1zMHhtaWFnYzliZHU5MmVuCkBA
IC02NSwxMyArNjUsMTAgQEAgdHlwZWRlZglieXRlCQlwYWdlX2hlYWRlcl90OwogI2RlZmluZQlQ
QUdFX05fRElSRUNUSU9OIDE0CS8qIG51bWJlciBvZiBjb25zZWN1dGl2ZSBpbnNlcnRzIHRvIHRo
ZSBzYW1lCiAJCQkJZGlyZWN0aW9uICovCiAjZGVmaW5lCVBBR0VfTl9SRUNTCSAxNgkvKiBudW1i
ZXIgb2YgdXNlciByZWNvcmRzIG9uIHRoZSBwYWdlICovCi0jZGVmaW5lIFBBR0VfTUFYX1RSWF9J
RAkgMTgJLyogaGlnaGVzdCBpZCBvZiBhIHRyeCB3aGljaCBtYXkgaGF2ZSBtb2RpZmllZAotCQkJ
CWEgcmVjb3JkIG9uIHRoZSBwYWdlOyB0cnhfaWRfdDsgZGVmaW5lZCBvbmx5Ci0JCQkJaW4gc2Vj
b25kYXJ5IGluZGV4ZXMgYW5kIGluIHRoZSBpbnNlcnQgYnVmZmVyCi0JCQkJdHJlZTsgTk9URTog
dGhpcyBtYXkgYmUgbW9kaWZpZWQgb25seQotCQkJCXdoZW4gdGhlIHRocmVhZCBoYXMgYW4geC1s
YXRjaCB0byB0aGUgcGFnZSwKLQkJCQlhbmQgQUxTTyBhbiB4LWxhdGNoIHRvIGJ0cl9zZWFyY2hf
bGF0Y2gKLQkJCQlpZiB0aGVyZSBpcyBhIGhhc2ggaW5kZXggdG8gdGhlIHBhZ2UhICovCisjZGVm
aW5lIFBBR0VfTUFYX1RSWF9JRAkgMTgJLyogaGlnaGVzdCB0cnhfaWRfdCB3aGljaCBtYXkgaGF2
ZSBtb2RpZmllZAorCQkJCWEgcmVjb3JkIG9uIHRoZSBwYWdlOyBkZWZpbmVkIG9ubHkgb24gbGVh
ZgorCQkJCXBhZ2VzIGluIHNlY29uZGFyeSBpbmRleGVzIGFuZCBpbgorCQkJCXRoZSBpbnNlcnQg
YnVmZmVyIHRyZWUgKi8KICNkZWZpbmUgUEFHRV9IRUFERVJfUFJJVl9FTkQgMjYJLyogZW5kIG9m
IHByaXZhdGUgZGF0YSBzdHJ1Y3R1cmUgb2YgdGhlIHBhZ2UKIAkJCQloZWFkZXIgd2hpY2ggYXJl
IHNldCBpbiBhIHBhZ2UgY3JlYXRlICovCiAvKi0tLS0qLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvcGFnZS9wYWdlMHBhZ2UuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9w
YWdlL3BhZ2UwcGFnZS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MjAw
ODIyLXUzbThkZ3EzM3cxNWFiZnEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwcGFn
ZS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI2MTMyMjQ0LXMweG1pYWdj
OWJkdTkyZW4KQEAgLTIxNSwxMiArMjE1LDYgQEAgcGFnZV9zZXRfbWF4X3RyeF9pZCgKIHsKIAlw
YWdlX3QqCQlwYWdlCQk9IGJ1Zl9ibG9ja19nZXRfZnJhbWUoYmxvY2spOwogI2lmbmRlZiBVTklW
X0hPVEJBQ0tVUAotCWNvbnN0IGlib29sCWlzX2hhc2hlZAk9IGJsb2NrLT5pc19oYXNoZWQ7Ci0K
LQlpZiAoaXNfaGFzaGVkKSB7Ci0JCXJ3X2xvY2tfeF9sb2NrKCZidHJfc2VhcmNoX2xhdGNoKTsK
LQl9Ci0KIAl1dF9hZCghbXRyIHx8IG10cl9tZW1vX2NvbnRhaW5zKG10ciwgYmxvY2ssIE1UUl9N
RU1PX1BBR0VfWF9GSVgpKTsKICNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KIApAQCAtMjQx
LDEyICsyMzUsNiBAQCBwYWdlX3NldF9tYXhfdHJ4X2lkKAogCX0gZWxzZSB7CiAJCW1hY2hfd3Jp
dGVfdG9fOChwYWdlICsgKFBBR0VfSEVBREVSICsgUEFHRV9NQVhfVFJYX0lEKSwgdHJ4X2lkKTsK
IAl9Ci0KLSNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKLQlpZiAoaXNfaGFzaGVkKSB7Ci0JCXJ3X2xv
Y2tfeF91bmxvY2soJmJ0cl9zZWFyY2hfbGF0Y2gpOwotCX0KLSNlbmRpZiAvKiAhVU5JVl9IT1RC
QUNLVVAgKi8KIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKCg==

--===============1783645689==
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/mysql-5.5/
# testament_sha1: 77ac067fedbebba20d09413ca726a6d233b87228
# timestamp: 2011-05-26 16:22:57 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: marko.makela@stripped\
#   u3m8dgq33w15abfq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeu0l7UAAkTflEAwWnP//3ei
VEC/7//wBAAIAFAErPDq1R3NzuqVhuwkkjQhoyGmU9CY0gANNAGIaNAkomjTEyk/U9NRHqgANHlA
AAAAkSBCmyR6U9TxI0eU00DINAZDQAc0xMBGmBGEYAAAAmEYCSQp5SfojCnqT9I2hJ6bSZQeo000
Bk0aDAnLPT3avWemvPQx7eWuQiuSVpq6s18I4XAZTK+B+Z8EX+/cZGA2xtZfFfedtO54zxcZRc6O
0Q3H959enRt7jZLo5Kk+z+HR4y+VYtaWw0VsfilD7Yy7ZrArARFOJ8+/v4VDUF8yL/cgeyNlwoBv
judiLxQvyLo6xSFTbXuLQOnFQ8bsnK1ASZahLX25i4aMTLTkBbmcq2QuoUHlY5CcK47WH3FiawoR
BOkZiMNm7kKsXWBYLhGMkLhpMXUIWc5oZICzjNTBqCfOA/EPkvvGh+1rn7RbLavPlDCY0YMFtkWr
YuU4XotHLqQrvJpsAKqjK+BQnoHMOQTFIrkjp3sM3cIeR6zjcCNVN6B+J+U7iyUG1FEhmLtHBh+l
op6yhmxuYEpXhnLViprXAE8oNtDxKm0Wt8hLgVJJEe2jWqcKzdhbzNYC6Ds9PiKPsSGAQlBjXQcy
mpdswNlRYVyN2eYUyFe6uHLCRnIUaSU3WE5igbN9MXXJSDgXM7PfhoKbzgKZgZOanjlYlDSxLyp9
zcZ9GkZRFgYX2A03bxQNWmtnQMrk2W5MccdqgSrOLVdmjZ72Y1FxwWL8AY9mSzRnkzoFTmrQ50g8
g6CCAw2GS6LIJbjcXZGZMzavjcab8W4uCNpvNjDRXmPHU+ZE/ZmGNFLNf6OR9e9vfENPlANYxLWl
ibdTzgJN/eJiMSXhUJTk0TvAyJKxoobcJb8dRu2TN0c0vBASvJo6rbMcc94onIYUNBpcVjUB6ya4
ZnXvAZoF1e41+zJixJi7QJlTEVhM9p10z5uaOaWpsSmuMS1WRJ1ee2NRowsFQe+QoveIpl91TxWC
pJCVaF3SvAdPJYWcGK8mJhwyeJMmGE/wdg5qzkrLHEd5iVRNjOpIo66n6ol/QXQ10FVD8D5dFGJn
2+SotGGlr+9x6pJoQLyqxpwR2q6LuVm69N9F+l2WlFGt6IaYAV3mo52HCtHbRnKRi7KVLa36cxMS
mROXPpTQSpJSW1ZhpHDBjFbhNduvY+GYJoziArxtf6fETVR4AjgFHCSrgtKHPLr4OFeF76ERXOxF
1uQ433CbqEvT1IuSVpDjoCaJuEEsCYkwTyYM0kSvWuxC0ps4lUjYbUw7HQppid7HQBVciiiWLtA5
Uhkk2MKE5ptEmZOKMg35ik+2t1bJNg1t8f1YBXHTrSV9zaI6cidDDuEuCLSXVJcVTk0X+VdImbmO
Xz2QMHVbbtGytT0rSuC5btwZwkHqnF05JX8Jq3kdElZWniqE5pOjb5Zj49wFcTsIzoM2hsrECaGO
YOP64E0SFVhhZXRnixoBodw4dkUqjrr2MH5aUJUYia6c24iblgEdVqgms+p4rsMcFqR8j0Kpae8B
iiz4moOV6VT/Fez/i7kinChIddpL2oA=


--===============1783645689==--