From: marko.makela
Date: June 1 2010 11:40am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3128)
List-Archive: http://lists.mysql.com/commits/109706
Message-Id: <201006011140.o51BJYPP004729@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0715623440=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTMxMTUyMzQxLXgyZDRo
bWE2NDRpY2FtaDEKCiAzMTI4IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMDEKICAgICAgTWVyZ2Ug
ZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAKICAgICAgICAtLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgICByZXZubzog
MzQ3OC4xLjQKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MjUxMjUzNTItaGdhZnBtcWhycmo3cHY1aQogICAgICAgIHBhcmVudDogbWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA1MjUxMjM3NDgtcG1wZWhiZzI5b3loYzFucwogICAgICAgIGNvbW1p
dHRlcjogTWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICAgIGJy
YW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0wNS0yNSAx
NTo1Mzo1MiArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICByb3dfc2VhcmNoX2Zvcl9t
eXNxbCgpOiBBZGQgYXNzZXJ0aW9ucyB0byB0cmFjayBkb3duIEJ1ZyAjNTM2MjcuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUzMTE1
MjM0MS14MmQ0aG1hNjQ0aWNhbWgxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwu
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTExNDAxNS1uMzB1b2ZwaGhi
aTcxejF2CkBAIC0zNjExLDYgKzM2MTEsMTMgQEAgc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM6
CiAJCXRyeC0+aGFzX3NlYXJjaF9sYXRjaCA9IEZBTFNFOwogCX0KIAorCXV0X2FkKHByZWJ1aWx0
LT5zcWxfc3RhdF9zdGFydCB8fCB0cngtPmNvbmNfc3RhdGUgPT0gVFJYX0FDVElWRSk7CisJdXRf
YWQodHJ4LT5jb25jX3N0YXRlID09IFRSWF9OT1RfU1RBUlRFRAorCSAgICAgIHx8IHRyeC0+Y29u
Y19zdGF0ZSA9PSBUUlhfQUNUSVZFKTsKKwl1dF9hZChwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQK
KwkgICAgICB8fCBwcmVidWlsdC0+c2VsZWN0X2xvY2tfdHlwZSAhPSBMT0NLX05PTkUKKwkgICAg
ICB8fCB0cngtPnJlYWRfdmlldyk7CisKIAl0cnhfc3RhcnRfaWZfbm90X3N0YXJ0ZWQodHJ4KTsK
IAogCWlmICh0cngtPmlzb2xhdGlvbl9sZXZlbCA8PSBUUlhfSVNPX1JFQURfQ09NTUlUVEVECgo=

--===============0715623440==
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: a5a93c49544ad0ee3a6660cc717c1bb8e9f6be05
# timestamp: 2010-06-01 14:40:21 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   x2d4hma644icamh1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRvwUnIAAfdflFAwemv//38v
nUC////0BAAIAFAEb3oADQoAENEp+qHpqmTTCYnpkZHqATARiaMEYJtA5pkZDJghowmCNNGjEDTJ
kYAAhzTIyGTBDRhMEaaNGIGmTIwABCJlT0mgMhkyAZDJoNAAaBk0AyaCSQIAJggE0GjRFPSeTTJP
0p6TCep6NT2qEAQFwsNfdMPvQLPdyGdbq5MnimuDy01g16OwAV7ClNbGTYCdvTAfL51zS5aYMzH8
YnGE7WVbNkDU6eaMfQmUqfU60BGLpSDsiMRHQBDwpD7PK/EQCIDdonMsdZcIlWl1TAQmmyUj+X4r
n+HiSie0r+q1gr/FVy8V9wyVq7uQ/MpS4S5dIqJC97yxdYky7eKRvztrm8aoq9lWN3uBd10UK8XJ
Re1AvxhJa6sWQ9ScKxp3pmi5TGHKULdtS4J4tSOXvLE3OlCyu6W7ih8hUvuFWnSipyimaDSw0HYk
Yib+V5n2rsiLCZXXea55eqRYy2O7DRqtQegt4n2Gd28Ez1X3qDx/fJynXVs9mEQ4ebeaMjWVqmzs
wpNzd4org3NZ6PZNPYpyWR2yJ12k+EdfVTqYRpcrNUDZCdQrYfcqJyckXLfqhuVR2rBejZVNdhQL
OnJ8Z2nL44SUTBlfN8oTdwXzK6jEdMvHGSVgNkrTTu1vVdtqcET0w0rzH28xQAc9lDZVUr7JemW2
/RVaUXqStuy69Kd2qzC0eU4Kq9PVbSrdWVX1EieWmv1+Xx5er2Y7Ka3LHRxpduxaaRi8mcmmaJQE
07UKCtXwNx8/er89Rb4OfMvD1e7rTMGC4rvTAeh/2jVUmZvyf/X7j/6+5NPWhj6UH4DFNY6MEpZJ
FEwOE4f+ELsIjceL8Oa8YCr37H+kAxjMWKvIB09Z3r3c1DtKUiB+nvv/FhLisT9MiAVpH+NMlmRL
qKhehQkSPJdTx6G/PZUFOPvIfHyNgP3pV+WpefsBixdVBvH/kU/ErPzUNS3LeqFIJvnE4S0Nrjze
JahLLP6rSxpLXrblzHKu5RTfIeE1qzXwXuhxXcYrCiiGma6WTIidn+gRUD8a232WGKZIAfgqKJIZ
dDzUcM6o4VmW01wqHikSYtUyZdueJ0msbfrCcTpJ867thiXuHJ7h5tJz78+Wnk48OwXc9/bw68pC
5GSY0DhIX+6fDcLyX+umSo4l4r5k2ZSZppdfUalwWiioLX2BdQvpvzhUiitHHcQ8MN5imDgkfUzC
KFuNq5JgpClwQGSIUCTDqLtdO2SomOSS5LokZ7j/J8xn7TFXvlWnrQqHp5E7C+aPtmXETEGU5EHN
CGKet+5c5shRZMuzrOTJE2xljUJt4BOhl4ueUfQSpByycrNFIVbd3rgY7GGTjo09QtGr1T95R7fC
nvDftCzFhB0If2tThVWeDKg69JIVKqwjT6I5/fpQVFNKTLrHYEKvYsMI7XEaVyQ6g4twKComYklO
jKDdStH8U7s/4QL0Fzk+02lEMaq4s51AVJzQTjk0YKotxx+Hw6lxoWwVv2XRHLBYJ96u2iimYVIe
7UoJ6hr7SgWvMm+wehsb/wbx8jwLuSKcKEgN+Ck5AA==


--===============0715623440==--