From: marko.makela
Date: May 20 2010 1:16pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3109)
List-Archive: http://lists.mysql.com/commits/108790
Message-Id: <201005201316.o4KDGmKW025905@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1820378320=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMTQzMDYtb3o4bWNl
N3k4bTd5NnAxZwoKIDMxMDkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yMAogICAgICBNZXJnZSBh
IGNoYW5nZSBmcm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAtLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2
bm86IDM0NzUKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTIwMTMwNzM0LXVlb3c5bW42MGN6cDdvNG0KICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDUyMDEwNDA0Mi1tYTJuc3NjcWR2d29waDhrCiAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmlj
azogNS4xLWlubm9kYgogICAgICB0aW1lc3RhbXA6IFRodSAyMDEwLTA1LTIwIDE2OjA3OjM0ICsw
MzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAgYnVmX0xSVV9mcmVlX2Jsb2NrKCk6IENvcnJlY3Qg
YW4gZXJyb3IgaW4gdGhlIGNvbW1lbnQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvYnVmL2J1ZjBscnUuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGxy
dS5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDUyMDExNDMwNi1vejhtY2U3eThtN3k2cDFnCisrKyBiL3N0b3JhZ2UvaW5u
b2Jhc2UvYnVmL2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUy
MDEzMTYzMi1xdndyemV1bjVqYmh2MjRkCkBAIC0xNDQyLDExICsxNDQyLDExIEBAIGJ1Zl9MUlVf
bWFrZV9ibG9ja19vbGQoCiBUcnkgdG8gZnJlZSBhIGJsb2NrLiAgSWYgYnBhZ2UgaXMgYSBkZXNj
cmlwdG9yIG9mIGEgY29tcHJlc3NlZC1vbmx5CiBwYWdlLCB0aGUgZGVzY3JpcHRvciBvYmplY3Qg
d2lsbCBiZSBmcmVlZCBhcyB3ZWxsLgogCi1OT1RFOiBJZiB0aGlzIGZ1bmN0aW9uIHJldHVybnMg
QlVGX0xSVV9GUkVFRCwgaXQgd2lsbCBub3QgdGVtcG9yYXJpbHkKLXJlbGVhc2UgYnVmX3Bvb2wt
Pm11dGV4LiAgRnVydGhlcm1vcmUsIHRoZSBwYWdlIGZyYW1lIHdpbGwgbm8gbG9uZ2VyIGJlCitO
T1RFOiBJZiB0aGlzIGZ1bmN0aW9uIHJldHVybnMgQlVGX0xSVV9GUkVFRCwgaXQgd2lsbCB0ZW1w
b3JhcmlseQorcmVsZWFzZSBidWZfcG9vbF9tdXRleC4gIEZ1cnRoZXJtb3JlLCB0aGUgcGFnZSBm
cmFtZSB3aWxsIG5vIGxvbmdlciBiZQogYWNjZXNzaWJsZSB2aWEgYnBhZ2UuCiAKLVRoZSBjYWxs
ZXIgbXVzdCBob2xkIGJ1Zl9wb29sLT5tdXRleCBhbmQgYnVmX3BhZ2VfZ2V0X211dGV4KGJwYWdl
KSBhbmQKK1RoZSBjYWxsZXIgbXVzdCBob2xkIGJ1Zl9wb29sX211dGV4IGFuZCBidWZfcGFnZV9n
ZXRfbXV0ZXgoYnBhZ2UpIGFuZAogcmVsZWFzZSB0aGVzZSB0d28gbXV0ZXhlcyBhZnRlciB0aGUg
Y2FsbC4gIE5vIG90aGVyCiBidWZfcGFnZV9nZXRfbXV0ZXgoKSBtYXkgYmUgaGVsZCB3aGVuIGNh
bGxpbmcgdGhpcyBmdW5jdGlvbi4KIEByZXR1cm4gQlVGX0xSVV9GUkVFRCBpZiBmcmVlZCwgQlVG
X0xSVV9DQU5OT1RfUkVMT0NBVEUgb3IKQEAgLTE0NjAsNyArMTQ2MCw3IEBAIGJ1Zl9MUlVfZnJl
ZV9ibG9jaygKIAkJCQljb21wcmVzc2VkIHBhZ2Ugb2YgYW4gdW5jb21wcmVzc2VkIHBhZ2UgKi8K
IAlpYm9vbCoJCWJ1Zl9wb29sX211dGV4X3JlbGVhc2VkKQogCQkJCS8qITwgaW46IHBvaW50ZXIg
dG8gYSB2YXJpYWJsZSB0aGF0IHdpbGwKLQkJCQliZSBhc3NpZ25lZCBUUlVFIGlmIGJ1Zl9wb29s
LT5tdXRleAorCQkJCWJlIGFzc2lnbmVkIFRSVUUgaWYgYnVmX3Bvb2xfbXV0ZXgKIAkJCQl3YXMg
dGVtcG9yYXJpbHkgcmVsZWFzZWQsIG9yIE5VTEwgKi8KIHsKIAlidWZfcGFnZV90KgliID0gTlVM
TDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGxydS5o
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGxydS5oCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBscnUuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUyMDEzMTYzMi1xdndyemV1bjVqYmh2MjRkCkBAIC05Nyw3ICs5Nyw3IEBAIGJ1
Zl9MUlVfaW5zZXJ0X3ppcF9jbGVhbigKIFRyeSB0byBmcmVlIGEgYmxvY2suICBJZiBicGFnZSBp
cyBhIGRlc2NyaXB0b3Igb2YgYSBjb21wcmVzc2VkLW9ubHkKIHBhZ2UsIHRoZSBkZXNjcmlwdG9y
IG9iamVjdCB3aWxsIGJlIGZyZWVkIGFzIHdlbGwuCiAKLU5PVEU6IElmIHRoaXMgZnVuY3Rpb24g
cmV0dXJucyBCVUZfTFJVX0ZSRUVELCBpdCB3aWxsIG5vdCB0ZW1wb3JhcmlseQorTk9URTogSWYg
dGhpcyBmdW5jdGlvbiByZXR1cm5zIEJVRl9MUlVfRlJFRUQsIGl0IHdpbGwgdGVtcG9yYXJpbHkK
IHJlbGVhc2UgYnVmX3Bvb2wtPm11dGV4LiAgRnVydGhlcm1vcmUsIHRoZSBwYWdlIGZyYW1lIHdp
bGwgbm8gbG9uZ2VyIGJlCiBhY2Nlc3NpYmxlIHZpYSBicGFnZS4KIAoK

--===============1820378320==
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/mysql/5.5-innodb/
# testament_sha1: 607c7ba22f39f2530ad0278ca6d0848352de89d6
# timestamp: 2010-05-20 16:16:41 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   oz8mce7y8m7y6p1g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWGMIg8AArtfgEAwW2///18n
lgC////wUAWs2eYlRu6g3bQdOhwkkSbVM1PUyPTE9ITQNGIB6gGgAAkoRpNpoyEYpmqAeoD1MgHq
ZGgGgJTUJooeSeRPSNNPU2k0aAaeoABoNAcwCYCZGAEYmJhMJghpiaYCSQmQCYmgAjIaBPTVHoCD
QaempfcD8EY1Ry/ttv7IevbIeGxNPBTpk5nFc735W4JUGtkWyrKn4JoSSV+1cM1PjmnvGzPvNhKB
CTC9/Ub7fKjAi85xfUYO1LcHyp7RWokyosFYslFmR+qaXSoGlYBFluY4kW/GuL+RfeUeKLzj+qba
CQwvYUjAdZQOKbjLh8Zs3FvX2a7NnuUkBs9oJ2bG9I5g5Hq8TDlUayw3iTfdPDof4D9PWYJ0qMc4
lgSwQsShtJU7ugmxdlmlPAhDPIvmdf5LEAZcgDcaV4VcpHyRWREzBW4czDYOd2vMU+ZPSTAjikyB
5lPjnHxzaniVCVIeNNW/Ym8iPTYlqKYW0tR1DmkGpL1aMapMSbrdJmVb0FklPmMVKTyuiwCjDmLM
v6sJQjRampceJefsLiMJARzGFI0StQrqqPkHcBsy1NTSRg8eD0rSCNX2YZvskbS8KjRjPB0B1j1C
pgJgNmU2TYzk+SpLAYqegsJywkYVu21QahPg57IkP3D0OHkRxhKtw83QWiUAeZAce5szKVxPflH5
4bHiW07xLGosd5qSTyym1SSymgx5AatIVK4hq0kwXAbJOKkr8S+JAruDAeOS4G4/vnT6Aml9MaFk
r1Wloim0HRMicyPjn5F0J9OsYcEpjqErzwcMzGZWWGMawxJHTov8n4ZjdUmE4uGGMCKVNxW2d1Iw
N5nRdw269ZpydUdmrJhrahqscK0ygFzYVKJZICmeMwxntK0zZ0YSqoKphQvuc0M4mz8zW3Pi4i9z
741gBQPGYZn7zWzHt7EXnsfkmJCJJ6ZVYznsfgq9l+SaKn4BNQTHTS9YkltMhrh6kCFfRJtpp4kB
tGNmynwOw4HcWgHPs7ADqKDLOTGCaKLAD6WPxWUyvTGBxoQQPuUgFlE71r7itLoFx5Hb6xHkSJ5p
U+sR57geOG/+u623tQ5hq0c5kDGRL0M51Gi4gYpZkpjtKmSiYpXmlfzUdU/zfvh8mcAPTsACOVuO
WJybIPdyc8Us5eVkggDVoLAgWpXlyf6pbVHvr+mo4ygkHV7afx3BA6w1J0uQqV8cSU6iVPI5TSzX
RTESbuJQt1ccxAywi1daYLojZtnsOWU/DwBvfKbURdYUgMkUoJo4+5kVqW9wtZzNhs3EyGPgRSyq
dexwmJVU7rw5W1MZ6I8EGeMgcQ2fk3ynRxMNwa4THz6y9nsXw0gYpQwLjJlvAmKNyszaEv4VRJSO
a70W1/ux02wlZQMg7zWIgciB47QPTWaRMf8dYBqRmSCdeJzqD0TwBtxSAMh8aHpu/qv5C7iVATnl
0rQHDFbu8AzHK39HDuA8GNCnWPFlt648MFAuXlTOWLWW7g1upokw5uttoFbkorNonU6kOHMR0Oe9
RliNIDta0MVJdSzSoZNDCRQBjqfYwUZF2O3pBSC8JeamR4t/YB4Igarl7vgrMNC7+itpNJju4vOP
HgGqdWonTi7fPON9Nd14F2FbdbA5CMsU1aOntqQbSThpJic6A95JgggqJmVlWAW1Skw5jWKcT1rA
zmwiTDNmCzTBzlYoREOIh3XTqiix5Sk/TVUTSOJkJDyH4CQ2ctKwcE7GDGDjM8tKEVBkExFgyFg8
6mF0rW3YJapAMRFVedN6KgKLFVxqEUNZzAobHKuSCKCgyZGqE50ZLzrqjhUoFly9XT/i7kinChIM
MYRB4A==


--===============1820378320==--