From: marko.makela Date: September 9 2010 10:50am Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3176) List-Archive: http://lists.mysql.com/commits/117833 Message-Id: <201009091050.o899NwEn008131@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1930240487==" --===============1930240487== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDkwOTEwNDgwMC1ycjI3 cHpzNnJucXZ3YzI5CgogMzE3NiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA5LTA5CiAgICAgIEludm9r ZSBtYWtlIHdpdGggLWokKG5wcm9jKSBmb3IgYmV0dGVyIHBhcmFsbGVsaXNtLgoKICAgIG1vZGlm aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2NvbXBpbGUtaW5ub2RiCj09PSBtb2RpZmllZCBm aWxlICdzdG9yYWdlL2lubm9iYXNlL2NvbXBpbGUtaW5ub2RiJwotLS0gYS9zdG9yYWdlL2lubm9i YXNlL2NvbXBpbGUtaW5ub2RiCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwOTA5 MTA0ODAwLXJyMjdwenM2cm5xdndjMjkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9jb21waWxlLWlu bm9kYglyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDkwOTEwNTAwNi1memloZ2tk N2dqeDdhYzlzCkBAIC0yMiw0ICsyMiw0IEBAIE1ZU1FMX1JPT1Q9IiQoZGlybmFtZSAkezB9KS8u Li8uLiIKIGNkICR7TVlTUUxfUk9PVH0KIAogY21ha2UgLURXSVRIX0lOTk9CQVNFX1NUT1JBR0Vf RU5HSU5FOkJPT0w9T04KLW1ha2UgLWo0CittYWtlIC1qJChucHJvYykKCg== --===============1930240487== 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.5-innodb/ # testament_sha1: 40b5db8353a1e7b7b667a933b48cf99c132237d2 # timestamp: 2010-09-09 13:50:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # rr27pzs6rnqvwc29 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcjLiRAAAXVflEAQVmP/91Mi AAC////wBAAIAFADet3dLtvd7nVqb3hKIpk9GU2gmAqPNFPU/UamnoIaHpAkpNQ9Jp4onpmqbRoC AyGjIyGBoSntNEMUAGUDQ0aBoNA0CSQmST0yaj9U0xlGJtTQYgABhJJpKDyeqeU0emjU/SRiPU00 AADUaeoem33C5Ci2VCKOZFzvdBx7t9d2ozPh4l8YmwRETlm4wfZ69/OSSUVBk9+Bu3Nt1Riiex+h pw4l/1X2Piv3EJIm00NGCz21rXE01rKye7eSOUNAiqh9DmoswKaKbgEwh2CRlH4F9L0ERwoNPfRS QQQQSwcSiyYlCpbrG8PCzBO6WIhbIgLNugXuNFEoJSYnxLgKv0nfs4HodtcbyCjsNd90bcEQ88aS BCrlnPiyKSFaM2yl1Q2BQUDzAzB8YNE0TJr2FQVFNKlOzO62cL1fAYzhVHm/FM3IbyMQEZCaWW4M Cg8SvlUGhbIBSFBprHeXD9naYCo3Fm0etMYo0lIUfHNNLSh2I2qsZmmUYp4qHNE5YWSJK9YQpV2p rpRH44d080cUSktmQPGAgbjFTc2nRdEZIDGbBpAkdlQXGDUUkxrlAk4MxFcshMG1yt7F3hZnOvRo y3TV53yEJYKin4ZSHEi8q4BPucYNJlMq6BG7gzi29iRVdXKIZgXbCymCroFycI72LHspWs0klKrO f7rMpikrV7kDooER/gbNpCoUSwjka69iLmSNyRb9GrWVz15zkqUFuFofBOpLw6jSqpTQrdtf0UVE SfLDqtffXm6nPVWNlD6eUH+RlYxq540wqWj3YbxClep4oqWXXMfj63GWJXOHjMmx5aWtM0OaMC4x kUDmMCs+9lmDLE2CyI6xZhW8piGjmm4SCdNHGRGjui7MjgJRdwRTjKS26BGcP7hvjkCRUGvdroek w79oryEBab2SPzOF6ROYSCUBJ4VJDdbQhim3CiijGIxNLR4CMy9TgM661WPrM1UIxHTsFMU4O1zB qCZxqxEWTL91dKRQcIMac6SkGqBL5SNgOWDlknSNzE2ZOIMo32FHanKOWZYmHpJ/UmRK/GR00JEl sVZbti+5UyDeOYYW5OU3KT+S0kyvovBkyeDZiUOa9nXqvoZRY8uKoOsxtEQLAHGU4YqYJzxixSiA nItHSVL3AlAoWdbpVFAuBPmXUq/Owu5IpwoSGRlxIgA= --===============1930240487==--