From: marko.makela
Date: May 25 2010 1:05pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3121) Bug#53627
List-Archive: http://lists.mysql.com/commits/109175
X-Bug: 53627
Message-Id: <201005251306.o4PCIHtl014454@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1801620793=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNTEzMDQ0NC1wNDZx
cXFydWV4bWMydHVhCgogMzEyMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTI1CiAgICAgIE1lcmdl
IGEgY2hhbmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAz
NDgyCiAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNTEy
NTM1Mi1oZ2FmcG1xaHJyajdwdjVpCiAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA1MjUxMjM3NDgtcG1wZWhiZzI5b3loYzFucwogICAgICBjb21taXR0ZXI6IE1hcmtv
IE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUu
MS1pbm5vZGIKICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0wNS0yNSAxNTo1Mzo1MiArMDMwMAog
ICAgICBtZXNzYWdlOgogICAgICAgIHJvd19zZWFyY2hfZm9yX215c3FsKCk6IEFkZCBhc3NlcnRp
b25zIHRvIHRyYWNrIGRvd24gQnVnICM1MzYyNy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNTEzMDQ0NC1wNDZxcXFydWV4bWMy
dHVhCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDUyNTEzMDU0OS1obm10d3JlZWJrcDVtZnE3CkBAIC0zNjExLDYg
KzM2MTEsMTMgQEAgc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM6CiAJCXRyeC0+aGFzX3NlYXJj
aF9sYXRjaCA9IEZBTFNFOwogCX0KIAorCXV0X2FkKHByZWJ1aWx0LT5zcWxfc3RhdF9zdGFydCB8
fCB0cngtPmNvbmNfc3RhdGUgPT0gVFJYX0FDVElWRSk7CisJdXRfYWQodHJ4LT5jb25jX3N0YXRl
ID09IFRSWF9OT1RfU1RBUlRFRAorCSAgICAgIHx8IHRyeC0+Y29uY19zdGF0ZSA9PSBUUlhfQUNU
SVZFKTsKKwl1dF9hZChwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQKKwkgICAgICB8fCBwcmVidWls
dC0+c2VsZWN0X2xvY2tfdHlwZSAhPSBMT0NLX05PTkUKKwkgICAgICB8fCB0cngtPnJlYWRfdmll
dyk7CisKIAl0cnhfc3RhcnRfaWZfbm90X3N0YXJ0ZWQodHJ4KTsKIAogCWlmICh0cngtPmlzb2xh
dGlvbl9sZXZlbCA8PSBUUlhfSVNPX1JFQURfQ09NTUlUVEVECgo=

--===============1801620793==
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: 6478f4e4f43ed5406a46aef389e56bd611d0d221
# timestamp: 2010-05-25 16:05:59 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   p46qqqruexmc2tua
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQghrH0AAdjflBAwemv//38v
nUC////0BAAIAFAETXgAyAADDRE0QADRiDIAAAA0AA0BxkyaaYTIyBgRiaMEYQaNMAAg01JpNip6
GUMT0xEAZMBAepiZAeo9IxxkyaaYTIyBgRiaMEYQaNMAAgkkIAmBMmRMEGmiTam0mZEyAyaHpCSS
C7Vq9Jsw46wfLQuSnQ2HWVQoYHYwG6dRKHjRUfeVJ1XEAkRlGnibPbrkke1gTLgPU6KRY4VMgff/
hAlZ2BUwUiln3+STgQsodZvPwj6YomHpCxUFUGhAzXaZIIMmJxLjwmaXHw7iOLj7DR9VkCt7Foj7
16Bgq12QFxIYk+3mpePXrjJ7nVrpEtwlHjXPFLBWMqxuTgVUELcnjva+ESYwlrZI7IhRK+eDnMmU
pvkfMuhaEb+865ELlXzoyJXzOHyKMklpg1WnWSILCO1eZ/dNWvzUl81LurvsNDLTIsrC2rIE0m8f
EkP09Mj45XFydh+FcQavJvJFyvJ7g22TM2pkEmm9k3KOCiOM5CO9Zkte2nhKFBew6dxhPJErnI3K
onYmE1ZOTD9azLMIv9lv0bcZ9MCNIdW9If5welwDjU9V23CmuD00ijtxJqwwKNTlXWot8asPSyhY
PJI3ETWwUGIMmmK1FFLHRGoZTeltGqPBUX1qJPvkkpbREPJZo71ElQWQCdtpORj7L+7l5b8/wumn
uMr3WtpvdnraWREjyJyaRoiYJJWmVS8DM/P2qzG0q8HPkXZzz30JAjScIm4frGxEEnvep2h6moQM
4EBHw0YgQ6EUuELEXVU4NRp/AtNwqLZU2GOUgKw+79CwMw0Jl5ojJKFHefDrXAoEvE++j13eLCW1
UnxXyxIg5iX6Z5EDTbPSL7kwlIZOHIbzzuXb73+/3jtpqXlZCS20XhQ5fN4MaFLObxvImdampKVu
WSrmUSbogZ68qjJ58HiVwlhp+yxqaNaom2z1LK+NP+JEEuddLDj3L2Qx1SMn8DGed+WpcetmSU9F
ZDlC+2HZvzmKHURh07uOyMT1Hs5dEBW2tbp6KFop2tp3OO0SjYpXzTLblidslTbdYSid0KRQmWxd
AxgmuwcdOZ1ktJ6bOOzucTbbBPfdVw0zSi3hiDdH0n5JfrytUewpKSQuTQ34mavUFp4BTKvrlbDS
iWlGvMh2Xai9MGQl9jAIgDYLMySnCdwPGEuicSYdPZqo9UamkO5JeoSw1jL5HzGdmXr6KyFmhcBZ
GgjIztMxX1zeMqHspSAOZ2+GK6xRLdOuybUKJky6uo6WEpNjLUbQCRDLvc8l+olMDlg5UxCnbl45
4KsTsM9jnJ5zaiSqrKXmTfj3SCn7Qeu0W7YFWLCDmQ8LFxE8VWktGnOnOMAoVNsVH3Rzo65igntV
CTl0jtJFT61fdE2touKGlW/aSk5UxGlKjCDcFUP3J3V2kCxBW5PrMCaF9FOtnRzhSnNBOODRQVJ6
1wFbjWsfdMvdxXB6s/xca1TrFgmYWgUoWQE5QhYY3C/sD6GT/AODSP4u5IpwoSAQQ1j6


--===============1801620793==--