From: marko.makela Date: June 1 2010 12:05pm Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3489) Bug#53812 List-Archive: http://lists.mysql.com/commits/109718 X-Bug: 53812 Message-Id: <201006011205.o51BFJ5W014442@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0976861241==" --===============0976861241== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEwMzczOC11cG04 YXdhaGVzbWVoOWRyCgogMzQ4OSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAxCiAgICAgIERvY3Vt ZW50IHRoZSBCdWcgIzUzODEyIGZpeC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v ZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1 Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZp ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEwMzczOC11cG04YXdhaGVzbWVoOWRy CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxh QG9yYWNsZS5jb20tMjAxMDA2MDExMjA1MjEtcTQ4aGswNW5lNGoxczJvMApAQCAtMSwzICsxLDkg QEAKKzIwMTAtMDYtMDEJVGhlIElubm9EQiBUZWFtCisKKwkqIHJvdy9yb3cwdW1vZC5jOgorCUZp eCBCdWcjNTM4MTIgYXNzZXJ0IHJvdy9yb3cwdW1vZC5jIGxpbmUgNjYwIGluIHR4biByb2xsYmFj aworCWFmdGVyIGNyYXNoIHJlY292ZXJ5CisKIDIwMTAtMDUtMjUJVGhlIElubm9EQiBUZWFtCiAK IAkqIGhhbmRsZXIvaGFfaW5ub2RiLmNjLCBpbmNsdWRlL3JvdzBteXNxbC5oLCByb3cvcm93MG15 c3FsLmM6Cgo= --===============0976861241== 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/mysql2a/5.1-innodb/ # testament_sha1: eeabe85c38e19092debbfd44dc16d30029eccad8 # timestamp: 2010-06-01 15:05:34 +0300 # base_revision_id: marko.makela@stripped\ # upm8awahesmeh9dr # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRaBg7wAAZfflAAwWnP/918m BAC////wBAAIAFADjUUNe4UtbOEklPQJhExiTYp6p+iPVPJPRqek0HoamgaSj1PU8p6TMo9NQaaA AeoAAABKEEyGlPaTTQmkybUaaPSZBtQNDIOYBMAJgABMAATAAEkSR6p+qeo00eUep6nqenqRiAAB 6g0Bidirlz6vtPXlqLWtsmLdUGVJ8LiHY50kGjiRt6+h0fDGz1+j2PR3muXbw8ntu28rcayX7qZZ cHDO3azVacuIMoPw6HuOu3Wx/w4/PgI6HgSGjToq83JWQqWd9h3JGGAiOOdHR9CJaRM1VVueK5mR C/vXgCRQOsg4VKMIr4HASx6BUzvaaKqoqOw6YRhSR24kMS5Uh4YiQXgwJ3XJ79pl/BnRTsUSL4OP XoQEm/PPXgeikoJ8Dsvc8/A2amqnP4sSsXbCO4pkri6iY8rUi3Y8XaK+wtM6njOu/Ettu9T4mjw+ oKSO4Ro6Mc5JNxklHIqUVRclLJkWKKdD6DO5yeq3zEyiKbClrhIbIvrlvqiS8RtXVMZkwnWJtjzB QuccSIm/mzZ1o9kCTGjaRgaGBjijVSDKUp1YFqKl8oYD3XXJWj2VSCXu2DilD6QQ44cFRrXFApcs 1AFBKg8zbBjhllLaogTxUShyXLW82OlBYwoGbyLIsliTCU16zdlLSpxY6OG6p4WiMJbbJj3yHwU3 zjWeLEYKhyiG7U4c18DkzNALC68Rz28d6RNFRO8OStEcYuzshX3zq2dHxlEQ0uW1b6zQYvqdieeP C5bl9pVWSdxNcssVF5kIvmy1jtHMkc5EjPRXu4ZHHeatrh+uadQpnKLs8jSOzzF5xUccmBcheWHG ezJEK6mC7fur1Ys6ZUMGb+4Gbbpov2wNqzLVkouaXo49EiMjQmTVx33sOPFWXMpEginkcOi5zUZi ogDXmv6UHvu8DYxPC12LDQPZMFd9iZwfCqwywES7xTqSI7SXH5TP2FaccNJgH1mj616H0huNoYc8 0EuIqsus0ia0RrsC1I4gpClxJp7CQxZKqc8ceuUcYjnReIhVPseIrb6pKqYQqbrmeRgQf5LENUUc h2iPaAT/IaioTsmV/KkeAqMWGQfe2f1PcCpDTA1pHQFCtctHpJEEhPTWzJxFrWVn5hadNTKJJTqf xJmhRPreS4QRCaVg/BjpLCKqineJZ0uxvdczlu1AtiYSCxYh7Fdr5yxzdReu2FSa2YztJhaDlRsI WU5F+vaKxKjkiJC2gGAYUYQcsTCmNjd0UoQCvwk6/xdyRThQkBaBg7w= --===============0976861241==--