From: marko.makela Date: May 5 2010 11:45am Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3450 to 3451) List-Archive: http://lists.mysql.com/commits/107560 Message-Id: <201005051145.o45BRbnx027721@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0393809560==" --===============0393809560== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDM0NTEgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBOb3RlIHRoZSAxLjAuNyByZWxl YXNlCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cK IDM0NTAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICByb3dfbWVyZ2VfZHJvcF90ZW1w X2luZGV4ZXMoKTogTG9hZCB0aGUgdGFibGUgdmlhIHRoZSBkaWN0aW9uYXJ5IGNhY2hlLgogICAg ICBBbGxvdyBtdWx0aXBsZSBpbmRleGVzIHRvIGJlIGRyb3BwZWQuIChCdWcgIzUzMjU2KQoKICAg IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCj09 PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9z dG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIwMTAtMDUtMDUgMTA6MDI6MTkgKzAwMDAK KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwkyMDEwLTA1LTA1IDExOjQ1OjEz ICswMDAwCkBAIC03Nyw2ICs3NywxMCBAQAogCSogbXlzcWwtdGVzdC9pbm5vZGJfYnVnMzgyMzEu dGVzdDoKIAlSZW1vdmUgbm9uLWRldGVybWluaXNtIGluIHRoZSB0ZXN0IGNhc2UuCiAKKzIwMTAt MDMtMjkJVGhlIElubm9EQiBUZWFtCisKKwlJbm5vREIgUGx1Z2luIDEuMC43IHJlbGVhc2VkCisK IDIwMTAtMDMtMTgJVGhlIElubm9EQiBUZWFtCiAKIAkqIENNYWtlTGlzdHMudHh0OgoK --===============0393809560== 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.1-innodb/ # testament_sha1: c2870bbe0b6eafbaf9ffd8d0835a17bd06814413 # timestamp: 2010-05-05 14:45:38 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # qgnn6butka20dn7p # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWCXM08AAatfgEAwW2P//18n RAC////wUAO56qAoGr1cwkqaNU9T9KPU9T1PSNknmqaP0pkZGgAGmR6HMAmmATIYAAmCYAAAJIgI mTSmxpqeqbU8k0AA0NPU02oAMkJqaAAGh6Q0AyAAAACSRT0GppianhCegSbEm0mjTajQNBpfDFu7 3xN5Hl25m3KacZTbPZZCIEqPdnnZvprPjoYZuX1OcZ/SVt1JPNNPX6CsP797zcxDm+wbkwUYy8Nj 45nRxfHBr+8B19j0HuMx6n66b+05xvKtvtKIr/JuJZx2F/NgoJjRcoeNI6xHky8RxhL5IqX20FDQ /wIRwffPUMChDIC1lJLwHni8SlESlkYsNORXGcpFPGksZS02qURp0dI7PPYrpoK30OZBVlp1a2P5 EV/RYdxEVfmZizJ76XYj5x5/RcM4/DmyRIn5czHyHrzvppNJKPJGMDLpMgfMOscpsIT5EnGkZPNZ irBirpiTWxriwzlnQ04wqS8sIn9qpHeUdhQI9mEZ6BQPBRiQkVhIFNpoxFrFJntJSu2JcS6VwUw8 kMh7TkN44OoxLIDqPpipDKOPMVCiFVSplqKXazLl5meiSo79A44M60askueJ18hvIZ9ROMbCYvLX NA02umHGZQmKAlPFmjxLmF2MP2X1SmRzXNk62DdwOfyhNycHhsMuLIO8jgwzN+PAs4EcQ7/LVNPF yMcE21gdX5WQN48PRaDYd4jpWSmOKRTmHB0EeeSsqgq6w1RF9IiJxly7iQ39pNq8TktYNMTDlyLL h5y5HvKTx7iBNp8HFD2SG9vgkcJtBYxMqB6dMLllMCicwLVJ1nZtYFDeNRv0FIs5pNBCTs2nMlzS j1mGCn/PI7FQWdvEXJIcvqmQ2OeqNwUlpX1KEQJU/qiZlWXWm4sO4eWlR6bdxdqcuG82KAobhkwN 29F9nkOUtD9TLYURlKkeT4sBPE0eVWBGdlfTeE+TZbHJcBlMAPc/jxwwK167RF4aUjCKYRomSGTi Ta+d4sIOJepI0iKO/kPcYoqVKMyUnNMxu+amyDSCgVAuGqWWgSPKWRFhPwMmHI4BaEIVYyQthq/T AApQL5EbUiATK9iwpe4v1CsrLrrlU0cTB7cWZzgjN9w13WhGk0kxGOoGgzpFz0K32tJD5gXSAeDE CJlEZsTTQ2yYqbgGovNJSRN+v1wOn9F1726ijR4DnSqBUUWWDnsFUXpbjTJfm2Vq7H4awH49uisl uwqlYyLTCvHFCzGMtFJ9k9G4XckU4UJBglzNPA== --===============0393809560==--