From: marko.makela Date: May 5 2010 12:06pm Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3452 to 3453) List-Archive: http://lists.mysql.com/commits/107553 Message-Id: <201005051206.o45AbdxL031208@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0574525772==" --===============0574525772== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDM0NTMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBSZS1lbmFibGUgcHNfM2lubm9k Yi4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC90L2Rpc2FibGVkLmRlZgogMzQ1MiBN YXJrbyBNw6RrZWzDpAkyMDEwLTA1LTA1CiAgICAgIERvY3VtZW50IEJ1ZyAjNTMyNTYKCiAgICBt b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZp ZWQgZmlsZSAnbXlzcWwtdGVzdC90L2Rpc2FibGVkLmRlZicKLS0tIGEvbXlzcWwtdGVzdC90L2Rp c2FibGVkLmRlZgkyMDEwLTA0LTMwIDEwOjAyOjM2ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9k aXNhYmxlZC5kZWYJMjAxMC0wNS0wNSAxMjowNTo1NSArMDAwMApAQCAtMTIsNCArMTIsMyBAQAog a2lsbCAgICAgICAgICAgICAgICAgICAgIDogQnVnIzM3NzgwIDIwMDgtMTItMDMgSEh1bmdlciBu ZWVkIHNvbWUgY2hhbmdlcyB0byBiZSByb2J1c3QgZW5vdWdoIGZvciBwdXNoYnVpbGQuCiBxdWVy eV9jYWNoZV8yODI0OSAgICAgICAgOiBCdWcjNDM4NjEgMjAwOS0wMy0yNSBtYWluLnF1ZXJ5X2Nh Y2hlXzI4MjQ5IGZhaWxzIHNwb3JhZGljYWxseQogcGFydGl0aW9uX2lubm9kYl9wbHVnaW4gIDog QnVnIzUzMzA3IDIwMTAtMDQtMzAgVmFzaWxEaW1vdiB2YWxncmluZCB3YXJuaW5ncwotcHNfM2lu bm9kYiAgICAgICAgICAgICAgIDogQnVnIzUzMzA5IDIwMTAtMDQtMzAgVmFzaWxEaW1vdiB2YWxn cmluZCB3YXJuaW5ncwoK --===============0574525772== 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: edd8954b6d2718249bd0c638c6bb58798f81c561 # timestamp: 2010-05-05 15:06:16 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # f7zr3tgzf8vpkqhd # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU/Vq1QAAW5fgEAQWWP//1IC EAC////wUAOaT3Sza6oNd3CSSGpPU9D1JtNTxJ+kGUaaNGj0gASUQ009Sn6U9TaT9U09E8o9QAAD QCU0ggk9MpsppmoMI0ZADQAwAAAAA0GgDQDQCSmkyDSNMp6aaANEQ9TBPUD1PUyYWaT07/gjFkJq VhangzX4PzPnxq5TdckvXxOMZqt07S/95e1B6NK3y0zc2FO+FWWzJTfLbQ2HATsuiRI3GPLpeT2w JREXLNrVL3ZyrHSlI2PUkTKERECMX8kV0PYvfYQeChayEwaTGAxc15NxMMmCA0ZkR3kLVQOVMJuF G5DEjXh52SZNjY401mpXYWe5WW2qodaaJEx5wdQfqscv2K+490KgVZpPYhcQgOF4NZMi2bqcHMMV jPIE/rv1q6VbbSkHscvGbKpk77TYRF7OnUkipyDs86QE0wqSY2sXqRnNxSGo+jQmq7nIst0RJyk+ tRnJ949XEk8gv9nxHgzGPZ5cRTGNlyhwWveQCLyLmOEwLE+mxScONTxjLSEiicxFbRoMgTdXpa/Y wQ3SjT1zMsNSdYb0xjxOG+E3JweGzWmByxCPpbaLqamtpGeHlHkQ4Q7RjfF63F96Q+pwwe4j1nJT SupF8UCL3LLV14HmPXMzLQt2YqsyInaYTYYrP2qfXYQopekP0SM6G5NHqz0KUydSL5IkjSWlTh2Z V+XrpJn2mUxWxV3YE1ac1hoviepbXvdOShTxqlXlhnWf4SI1TYJkP7IeFYXFtoryLo0gPT7w3rRz LFmTFxYYFh25ZFGxlyk8s3idtNArX9HFS47C0G4LNcJ5uNI6SJCrEUxYYZsQ4ECGOIZrT5wX92wn qKwKlqAyMpunOOosP5yEacAkLWkdRUKuWtkwiT+jJDPcPUtpRrFoKRcuL6TdXZzSOoi/rzPwMnaV cNwrNlTQoMsMoRAx4nSntEIuT58R5tPNioHOQ5NtSJi6Y1AnAcXogLukbAoXFln34ZwyGvNevWro DikOAvGY6J1BozDrYi978FfpPbiPTopLLqqFLslc5URhBIipUWhAmcWiZeQnxHQbTuXi4xncSK4g N1pURfB6GZaIhWxW9WOi+R0Xlwsss4tzZjPsJD0hU21NJNNxtwFfkoJ6Z1Ic9QHur7u/ZAT02pma t7TFdJItbZrNVy/xdyRThQkE/Vq1QA== --===============0574525772==--