From: marko.makela Date: May 4 2010 1:15pm Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3443) Bug#53306 List-Archive: http://lists.mysql.com/commits/107323 X-Bug: 53306 Message-Id: <201005041315.o44Cm7I1022461@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0040467603==" --===============0040467603== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMzEzNTgtbmtkcXlj NmpqdDFjcTJregoKIDM0NDMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBEb2N1bWVu dCBCdWcgIzUzMzA2IGluIHRoZSBJbm5vREIgUGx1Z2luIENoYW5nZUxvZy4KCiAgICBtb2RpZmll ZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZpZWQgZmls ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJf cGx1Z2luL0NoYW5nZUxvZwkyMDEwLTA1LTA0IDEwOjU1OjQ2ICswMDAwCisrKyBiL3N0b3JhZ2Uv aW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNS0wNCAxMzoxNToxNyArMDAwMApAQCAtMSwz ICsxLDggQEAKKzIwMTAtMDUtMDQJVGhlIElubm9EQiBUZWFtCisKKwkqIGZzcC9mc3AwZnNwLmM6 CisJRml4IEJ1ZyM1MzMwNiB2YWxncmluZDogd2FybmluZ3MgaW4gaW5ub2RiLmlubm9kYgorCiAy MDEwLTA1LTAzCVRoZSBJbm5vREIgVGVhbQogCiAJKiBidWYwYnVmLmM6Cgo= --===============0040467603== 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: e75253d10d534c2fc8ad3d69df9e0e5eeef2d461 # timestamp: 2010-05-04 16:15:25 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # nkdqyc6jjt1cq2kz # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSpsuYMAAavfgEAwW3P//18m RAC////wUAPNbylGgLx13uEpGo1TaZPVAeE9U/VPKD1BpoaekA9TTQBJU0ap5R7Saemin6TSNNGg A0HqANABqaNKek0NNNPUaBoAGgAaaDTQBFKAp5TaEAeoxDTTJoNAANGjQSSE1MNTNKnmkwk/Sn6T TRlA00GgA0epwMs9NMJLT2wwLIxcijE3GUVPWREjFpkWae6ek1E7JegmOhSfWZqSv4yQNjClfe7w ySztcWGTpF0gDILwRfrXFXnK8Voazu1ANhSqBoOvLtKjb8djjDTvZnjeenIIdpmgK8opIx+ZUx1V FtvCkVakh0BujTPiil04MqYzJJ0gCoUHgu8+ESgQ5wiMToaXsNA1HTMThJD/F5rZIq5d+zpntgZi M+Rh/rEFKwP4KJIpKBS+g8Vdj29e6xQIkziY3hhWalftirv7ZEis0mXEy+eFV49xhFPD5h/U6JcU PQOiPTjOVfCK0hcQhQUAY56TJ5AYRAcdRJYWG8uMCwiPH34UtMzw+VtpjQIsyEwpolxW0n7E55KS JqpNqchTdQQuIWi0PqaFpI4KBI84qx6UvUOqL/LYtpeZjdogXKgtnAufnmi52gpKwqrouJnNz5DX MXEDQ1hoKiwzBq5CszzKMxnrvTFajYSCJwZurI1MLFi/hOZSQOxoc2C280eKuaOVq0kEQxFHsGHz zGwmbccLqzWwlJgbMxB9qbQwOu8IXtu2jQDrOs2DuB3JGR444pE9xMeHikeHbHSaIq9FVYvjWkc2 XfxmN3GByPWOGIajWSx9pkrDTEkWGKxtOe8mTPOzd7HG0WyDJDVJHZauXTfhsLE5MVCipFmKKhtp 5KLzihcXttDj254ZHzNmhu14WDBL/ZendeCsd3JkNjbK/SEjWW1qisDTSoVnoZG5tBgcOs2mkoPe TPpjvNXW5Ut4csvV2MM1pSDAz8neW87OBiH7B0xenjdAx4W4LNrFkT2eYpS4fEFIdDDpDLRP1Sx+ +V0lgGYgBeJVrltziXpiyF9041LQ3QfJz7LCmCpSGkxZLuvqpozKYFL2TvgzkjG00lkuG8arblNZ 3UE0ELiNFDMk0SJGOyH+JXjTNaksJDJ0AyzHxDsdesLQagMs6alOoHLFifOcQRuMMMye0oDcz0io oJMq8uOzWs96ck4Wwcs43Ozcuwy1UaKQa2L81YUE8ENEjORG8cm/Bik6gGita4RUUS2P5qXfQUcS 1rPQRaeI4iGZTCCQZISkQ9Q5JBFRN11BqjgAGEp2PZTRC/ARExFhpZ8cWFJLaJusdd/i7kinChIF TZcwYA== --===============0040467603==--