From: marko.makela Date: April 26 2010 10:52am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3418) List-Archive: http://lists.mysql.com/commits/106499 Message-Id: <201004261052.o3QAqua4002188@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0889052507==" --===============0889052507== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjYxMDI3MjUtYXMydmM0 NGRkeWtnMTc4NgoKIDM0MTggTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNiBbbWVyZ2VdCiAgICAg IE1lcmdlIFZhc2lsIERpbW92IDIwMTAtMDQtMjYgQnVtcCBJbm5vREIgUGx1Z2luIHZlcnNpb24g bnVtYmVyIGFmdGVyIDEuMC43CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs dWdpbi9pbmNsdWRlL3VuaXYuaQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1 Z2luL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91 bml2LmkJMjAxMC0wNC0yMCAwODoyOTowOCArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVn aW4vaW5jbHVkZS91bml2LmkJMjAxMC0wNC0yNiAwODozNTo1NyArMDAwMApAQCAtNDYsNyArNDYs NyBAQCBDcmVhdGVkIDEvMjAvMTk5NCBIZWlra2kgVHV1cmkKIAogI2RlZmluZSBJTk5PREJfVkVS U0lPTl9NQUpPUgkxCiAjZGVmaW5lIElOTk9EQl9WRVJTSU9OX01JTk9SCTAKLSNkZWZpbmUgSU5O T0RCX1ZFUlNJT05fQlVHRklYCTcKKyNkZWZpbmUgSU5OT0RCX1ZFUlNJT05fQlVHRklYCTgKIAog LyogVGhlIGZvbGxvd2luZyBpcyB0aGUgSW5ub0RCIHZlcnNpb24gYXMgc2hvd24gaW4KIFNFTEVD VCBwbHVnaW5fdmVyc2lvbiBGUk9NIGluZm9ybWF0aW9uX3NjaGVtYS5wbHVnaW5zOwoK --===============0889052507== 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: 1d0ee02b0db0874fc79cf52a41595e1632ff3a0d # timestamp: 2010-04-26 13:52:52 +0300 # base_revision_id: marko.makela@stripped\ # as2vc44ddykg1786 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdiS5HkAAsFfgEAwW2P//1en +0C////wUAVs8AoC2AAAMNEk0bUxNAbUaeoAAAABoNBoHNGTEwATEYEaYEGIwTJgEYJQSaCmnoja h5Q9T1PUAAAADIaaBzRkxMAExGBGmBBiMEyYBGCSQQDRqMhNophNlPIU8KeqeEGmjKeofqjozKnB Ypn14xD6EyVPrSCYIwTwMnDWo0SCDKUAoJa3PBpJCa78nrDxlUVUy1BmgRkXMVz1VSqvRKQdqZXd /k9vs2cXMQpLYD2n1qBhsYgLEmZlyCiqAxyUfs8yBvNxh/j9rVzbCz3eaFCG0yIAHedb1Iz+f5O9 cLNq4EQRrxDUrNSeqStUHWa0H+yFK2RKlJnOKZiRaI4LsBdGkPdt9RDnVWHCTqQGJO7h5HQOHERI YSOSZy6XnpESMSIUrIerXQIwQVEDLWqHlh+Dadkl7BoDBhYaBw07RgRNLictJBVkCuVWnIdNczUD PKvkvyp0nfQbDF8E9Yl4x2HgZnwQdvvQaqegyy3Fc3AhqQhsPUmOWdNSQVxILIftGM5FapFn8m+K Lg4KRO/cxYYlxInmYPQWD0i0qRS8uJ2KEoRxgQYU1YJo4xiZ6WGJKRR1koGhTMFf/0doyCYYKr9Z abuhvo2QV6guGKKUGo7kVIMq04mMhhxQVLqOtBooqZ2yT9ZBIMDYTtGKiua1aatgnveris9ja8a7 IRe5kYr5mpbBZJjAmXrSVqCGHHgg2IJn0t0VzT1uUoj8RkFA5bR5eQvJjiJQX7wxLCGlOV5ZkMWF BIiRLqFRUVqnbrzNysCqhbC25DKSIXq8VEk8d5DMegsRkjpGRI+A2soDA5DQICZvFjrOC8TgPIjB CJByA2knDWgqAqJ5kmFFQUzv6347zK5LnyOkI2Y4kD4c9xHr26aGA09HUxUW5TSWa78ABgyMEZQb mxE949cxkx1piXr3HeC/fxOZ3nd3CRp1mkHi+oKP86lkRMS9c6RH9Vgo+qlyPARFG7zyQ1pBBuIH kHmnlB99dJMyW88UrUbzMiTUiRFfM3qo9R60moxXYPPaR07SDhhIenHxEjWVmN57UhaEEOKkj/RQ WrFSWZ9cPgs1oEYrsV2Sw+0HpkkdPGQ52jIsMxj4hacuxSDOg5M16gLi6Zf1aJ8lMo+yE+TdomQS KSibzndSdAHUGgxFEtQFQPLlatZ/RMqQRNCgonA1qS/zt4qvIzejrPAeHEzWqIiBwPuZhwOkqbWJ i67hMGN15IxPRIgG5YlwLWiAcv4KBF8uo/ZaRVw6D/24eVEkg2IDsMU/j+ncGairkH56gXqrNoty FDyDee/7OETRQoAs1FRvEhghV2naYlC9hjzEjtBaeHqwzH9jiaOaC4konSTDWNcMCoKCxeZ9YlAY uHJLqXuXIrIiIjeIPOkuF+xE6w4lyT2QXDheQQ5IXkgakNm4BUpB4j0H5EjyFWj9XCx2iXEYwg28 3m9GBQqgK9VJSDFiDYuZMH+5ONgRYLASgc1hERYeA+0ZJ6qKKELmq0aYYAUCgwQThPKGQygQBhpB AhpieiByqUAWw2DJJ9aO0xEViqSqceZzHh0dpgMZlpkUmmYPCkVQuxpJgiyNBBPDKtFpQfQ9DGlW yLVyQOEc8ykGwPkrhaDArNaA6zxNIb+LH4DoVIfA1Dxwwx3sWJaToGBjrDasLiBgKgxH+LuSKcKE hsSXI8g= --===============0889052507==--