From: marko.makela Date: May 14 2010 10:51am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3464) List-Archive: http://lists.mysql.com/commits/108307 Message-Id: <201005141051.o4EABlLB030439@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0234379438==" --===============0234379438== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5 MmZnanF0b2hpdgoKIDM0NjQgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xNAogICAgICBSZW1vdmUg dW51c2VkIGNvZGUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny djBzdGFydC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3Rh cnQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMJcmV2aWQ6bWFya28u bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2MDMtdmZ3a2d5MmZnanF0b2hpdgorKysgYi9z dG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl LmNvbS0yMDEwMDUxNDEwNTEyNi1mMTQ1aGwxOXk5Y2F5N2p4CkBAIC0xMDIsMjAgKzEwMiw2IEBA IHN0YXRpYyBjaGFyKglzcnZfbW9uaXRvcl9maWxlX25hbWU7CiAjZGVmaW5lIFNSVl9NQVhfTl9Q RU5ESU5HX1NZTkNfSU9TCTEwMAogCiAKLS8qIEF2b2lkIHdhcm5pbmdzIHdoZW4gdXNpbmcgcHVy aWZ5ICovCi0KLSNpZmRlZiBIQVZFX3B1cmlmeQotc3RhdGljIGludCBpbm5vX2JjbXAocmVnaXN0 ZXIgY29uc3QgY2hhciAqczEsIHJlZ2lzdGVyIGNvbnN0IGNoYXIgKnMyLAotCXJlZ2lzdGVyIHVp bnQgbGVuKQotewotCXdoaWxlICgobGVuLS0gIT0gMCkgJiYgKCpzMSsrID09ICpzMisrKSkKLQkJ OwotCi0JcmV0dXJuKGxlbiArIDEpOwotfQotI2RlZmluZSBtZW1jbXAoQSxCLEMpIGlubm9fYmNt cCgoQSksKEIpLChDKSkKLSNlbmRpZgotCiBzdGF0aWMKIGNoYXIqCiBzcnZfcGFyc2VfbWVnYWJ5 dGVzKAoK --===============0234379438== 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:51:42 +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 --===============0234379438==--