From: marko.makela
Date: May 18 2010 1:10pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3099 to 3100)
List-Archive: http://lists.mysql.com/commits/108512
Message-Id: <201005181311.o4IBLTsV008656@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0001132465=="

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

IDMxMDAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOAogICAgICBNZXJnZSBhIGNoYW5nZSBmcm9t
IG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDY4
CiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE4MTMw
NjU4LXJkMDBxbDdoMDJvb2FraDEKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNTE0MTMxMDUwLW1raGx2bHVpMXU1Mmlyb2IKICAgICAgICBjb21taXR0ZXI6IE1h
cmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmlj
azogNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogVHVlIDIwMTAtMDUtMTggMTY6MDY6NTgg
KzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgV29yayBhcm91bmQgQnVnICM1Mzc1MCBp
biBpbm5vZGJfYnVnNDgwMjQudGVzdAoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1
aXRlL2lubm9kYi90L2lubm9kYl9idWc0ODAyNC50ZXN0CiAzMDk5IEppbW15IFlhbmcJMjAxMC0w
NS0xNwogICAgICBGaXggYnVnICM1MjU0NiwgY3Jhc2ggb24gc2h1dGRvd24gb2YgcGx1Z2luIHdp
dGggaW5ub2RiX3VzZV9zeXNfbWFsbG9jPTAuCiAgICAgIAogICAgICByYjovLzMzOSwgYXBwcm92
ZWQgYnkgU3VubnkgQmFpbnMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9tZW0wcG9vbC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbWVtL21lbTBtZW0uYwog
ICAgICBzdG9yYWdlL2lubm9iYXNlL21lbS9tZW0wcG9vbC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2Uvc3J2L3NydjBzdGFydC5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi90L2lubm9kYl9idWc0ODAyNC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYl9idWc0ODAyNC50ZXN0CXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEw
MDUxNzA4NTc0Mi1reDNucXhyamJ5eGs1dGtrCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTgxMzEwMzYtZmR1NXFwbXZjNzVpemVxcwpAQCAtMTAsNiArMTAsOCBAQCBBREQgQ09OU1RS
QUlOVCBGT1JFSUdOIEtFWShiKSBSRUZFUkVOQ0VTCiAKIERST1AgVEFCTEUgYnVnNDgwMjQsYnVn
NDgwMjRfYjsKIAorIyBXb3JrIGFyb3VuZCBCdWcgIzUzNzUwIChmYWlsdXJlIGluIG15c3FsLXRl
c3QtcnVuIC0tcHMtcHJvdG9jb2wpCistLSBkaXNhYmxlX3BzX3Byb3RvY29sCiBkZWxpbWl0ZXIg
fDsKIENSRUFURSBUQUJMRSBidWc0ODAyNChhIGludCBQUklNQVJZIEtFWSxiIGludCBOT1QgTlVM
TCxLRVkoYikpIEVOR0lORT1Jbm5vREI7CiBDUkVBVEUgVEFCTEUgYnVnNDgwMjRfYihiIGludCBQ
UklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKCg==

--===============0001132465==
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: 209e9bee978499eb39df412373f51e42d2b453e0
# timestamp: 2010-05-18 16:10:59 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   kx3nqxrjbyxk5tkk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTPcQwMAAehfgEAQWWv//1IC
BIC////wUARYvbrB16A2rbd1wkoSNR+k9TTSNin5KPQj1PUHqAaAYaSnkjCabU09T1NDBB6IMjRk
GQMk0I1PImk2JpkTJkGg9I00aAEiiGUyT9U9QyaZBpoaHlAAACSRGiYEwhPFMaKbTUxkTRoabUkt
tdl+Ke3wLNE8sO+i6QWeuRcEM6PbgrQBfJk+EG9RcQPMUil9D+Vo8XoiBeI+WzoKYOxse/OqVYi4
NGqfkM3FKtzv19YWNLJmxEObYO9+j1ROaBiBEGui/Pr03rW3sROvITdj3JG3tCkwPUsHA7c26drR
j4SKg5QV/MUaNkQrzLMnlVGWqawqplJGorEs0ioNqtKNL4dUTGSYFGZmKurKzqeSU2oSWNAz+Sgv
7RYqgmIxgI73zFkaCghZxqYkfBpchUHjFWEJMCLKkiYuw7YcDSgx/KS6KTOEJgEhsDmmvRUpAh4O
TIJD0GYdLYygGUiJcRMJVEZkeYPKLQ1kJqjEHhoIjupLtDrHSAZSTj7hrAoJBNMH0pFCm2mWUI0q
A7hxS/oGD1GRkZeSnzOVWW5EkmV8vrORwM2cJVm/IzKWwgd60k0LyDE9ApxdVHkZ1peVSqwvf34u
4rSVlIw8pPrgbzQvd0qbbstOAojAoUxKY0UY7b4RF7r3A4eg1xKp1GhukJGM81t7jQOYfpvhol43
345a7NTKShtxW02rNYawkmYZhl1LGFyYtrjKn6Wc2k6MGPwY+r4OIPhHYGKaUNxjb+ecg1K+B174
SuT3mGVxh31Uc5EQaiXA1nJI7ZFEDDASc9ODw80jh63FpAuVhvxpS9ydI1jLxp3yEpuNg6IWZqIU
T7foOazD7EhQa+wqB57dSMxp6SmiIYSa86CUCQ399b1OOTpUpUqSaUuJtwoV93Bqph6Sh6TEjuQ8
1Giv7bh5og3GciBndxw17jkUmd1iExkmRpFCR05x8MAyLL1BDEcwh6ffbw9fQqLS+8bK4+eKWJcf
HHgYbnBplzFEqzY7ik37GNxquOee9+4GKorFurqKC+zmKBkatgXzLFWLSGl66fNmaUs7tiC6mKDc
TSFhEtUIjR1TOCcD6OEFdpDQpoWw0LDaP1OrgUKkjXuiTWNOjaV255/CCS4ZJFZ1RZvLkyxaiZ26
CkWwHKceYi2Tq0zymxgRMMhWVhW4omWyqSzdqXZ7LUitoajwQo57sx6TsRmAJEHl4xI/wlIHYnVj
1PAOOs1qMYqrMcgWbxRIRe8ZhIZ7NpMO4VwuipNpYOYXiDWZKZZJUzYu9qLtLMFcTQmuXTqszisJ
kmUYdBDkbOEVkLDpcgyBpARx3XB4IeRKdXMNvqOAfAisHjc5zmrWvNF28eu9PJgnFGyuHFR7dEu2
38jYBTqhQKG7t4PAVFvLAgMR215m6ypcY6ZixqsuNjjUm3WAPc/X8cRdyRThQkDPcQwM


--===============0001132465==--