From: marko.makela Date: May 14 2010 10:52am Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3463 to 3464) List-Archive: http://lists.mysql.com/commits/108360 Message-Id: <201005141452.o4EE2nJ7006386@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1952628870==" --===============1952628870== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDM0NjQgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xNAogICAgICBSZW1vdmUgdW51c2VkIGNvZGUu CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jCiAz NDYzIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgRG9jdW1lbnQgdGhlIEJ1ZyAjNTM1 OTEgZml4IGluIHRoZSBDaGFuZ2VMb2cuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u b2RiX3BsdWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv c3J2L3NydjBzdGFydC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYwly ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEwNDYwMy12ZndrZ3kyZmdqcXRv aGl2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jCXJldmlkOm1hcmtvLm1h a2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTA1MTI2LWYxNDVobDE5eTljYXk3angKQEAgLTEwMiwy MCArMTAyLDYgQEAgc3RhdGljIGNoYXIqCXNydl9tb25pdG9yX2ZpbGVfbmFtZTsKICNkZWZpbmUg U1JWX01BWF9OX1BFTkRJTkdfU1lOQ19JT1MJMTAwCiAKIAotLyogQXZvaWQgd2FybmluZ3Mgd2hl biB1c2luZyBwdXJpZnkgKi8KLQotI2lmZGVmIEhBVkVfcHVyaWZ5Ci1zdGF0aWMgaW50IGlubm9f YmNtcChyZWdpc3RlciBjb25zdCBjaGFyICpzMSwgcmVnaXN0ZXIgY29uc3QgY2hhciAqczIsCi0J cmVnaXN0ZXIgdWludCBsZW4pCi17Ci0Jd2hpbGUgKChsZW4tLSAhPSAwKSAmJiAoKnMxKysgPT0g KnMyKyspKQotCQk7Ci0KLQlyZXR1cm4obGVuICsgMSk7Ci19Ci0jZGVmaW5lIG1lbWNtcChBLEIs QykgaW5ub19iY21wKChBKSwoQiksKEMpKQotI2VuZGlmCi0KIHN0YXRpYwogY2hhcioKIHNydl9w YXJzZV9tZWdhYnl0ZXMoCgo= --===============1952628870== 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: 09932040993e6213e47a5f364e868c26286526be # timestamp: 2010-05-14 13:52:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # vfwkgy2fgjqtohiv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa1nqIwAAaPfgEAQW2P//1MC EAC////wUAOZ6qokGqNUJKpkAaNBpozSeo9IAAaAAwGgAAGgAAAAACSTIip+CjZNT1RsaUyHqYjR 6QaNGMBoAABoAAAAAAkkE0CYEaZJpgSB6JoGgxLss+s5+hy2wtoysbTGbwaMiwamnt3WYl3SzMeX iecUbg2DqWXhX9P95Xk2dvNj7sKmfpjhnkRzfczY9wEstjoOg5Tnp5/vqaWh0DuigrC4Mu8Ur/Tf xWyhpaVphGojT+4lmtPFFsxNgEpbW+MCGQUL1hBmFPAHpyYTCiOxG67lWFTMeMwc6EESKgLp4Qzt DrBhTY3Yo/Q4udBWEsgyMtl/LCOwTzpcXjH8qzqEUmqCcV+Q8HsLWM0WMi6NRMGv7N5ozJwkcFbC 3hkpaGMHeNgYBWFRNkOMDCc6rX9wajcDxSVJiDyobHM3sbyJSYE7H+wdkR+ub67UH4mcLYHE1jzO Ao2C1PWRVTTkOiRK3YJkUHtVoG0PxwVxKBQpiBQbxUzGE+rB0KWcidzmuLAiSJnRVxCZgF4oPYWJ XNpD3vmMb1Ey8KVUUu5m15lrC3Ma9uwqHs+EpRyZPrxNvzeJFHk+xdoi9wY9GgjjK62VKZDU+MK2 cFZsLSszOojie+WQi2wcH1Edry6BddQLznETJlyF054A1wcTkXmzgat3y58AYnNk4uoVi95/4uBL dJ2b2ENzrENeWaiScm+Z8CcXM+/zDI1j2LMh/Xysckdw+4Mxih93hxPYmx5tUQDrw7/h1Redvj+U j1dgmRG+2jaGreW4qNAFZP4JWA4UhPENGEpCTKh05HleWSVQuFUtLu1VTZebgaluqgKw3dxXj7Cg cjG4HmNwU4+ux8cAMQG5k/pcphYiJe2CKFGGNIzwCgTwiSyIpKvvbDHvEdhFn05H5HJrVUO01GVN s1B4zRzZLQ8JEQgzu/Wn6cqweyIOT+KRHZhyTkiYDnBHkIiE67OVmve2Bt27VbEkFF8pDff3V2Wx UCWhygKjwuqZPnmmSK1i+AQpk2JrETpxxmc6MYYrOoBqLf/0NMvspCqfovj0gaepaDV4k19A8/qk E4VpiLK9x24SVdVKQLsschOre/YBXxwuWopq7pbJZC+woiCLTk+VH/F3JFOFCQrWeojA --===============1952628870==--