From: marko.makela Date: April 21 2010 10:00am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3411) List-Archive: http://lists.mysql.com/commits/106223 Message-Id: <201004211000.o3LA0k7r017599@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2008612596==" --===============2008612596== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjEwOTUwMzMtMGFjdnp4 Yjh1bThjbXMwYQoKIDM0MTEgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICBoYV9pbm5v YmFzZTo6YWRkX2luZGV4KCk6IE9ubHkgY2hlY2sgZm9yIGR1cGxpY2F0ZSBpbmRleGVzCiAgICAg IHdoZW4gdGhlIGRhdGEgZGljdGlvbmFyeSBpcyBsb2NrZWQuCiAgICAgIFRoaXMgZml4ZXMgYSBV TklWX0RFQlVHIGFzc2VydGlvbiBmYWlsdXJlIGluIGlubm9kYi1pbmRleC50ZXN0LgoKICAgIG1v ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYW5kbGVyMGFsdGVy LmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYW5k bGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYW5kbGVy MGFsdGVyLmNjCTIwMTAtMDQtMDYgMTI6MTE6NDYgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJf cGx1Z2luL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwkyMDEwLTA0LTIxIDEwOjAwOjI5ICswMDAw CkBAIC05MjAsOSArOTIwLDggQEAgY29udmVydF9lcnJvcjoKIAkJdHJ4X2NvbW1pdF9mb3JfbXlz cWwocHJlYnVpbHQtPnRyeCk7CiAJfQogCi0JdXRfZChkaWN0X3RhYmxlX2NoZWNrX2Zvcl9kdXBf aW5kZXhlcyhpbm5vZGJfdGFibGUsIEZBTFNFKSk7Ci0KIAlpZiAoZGljdF9sb2NrZWQpIHsKKwkJ dXRfZChkaWN0X3RhYmxlX2NoZWNrX2Zvcl9kdXBfaW5kZXhlcyhpbm5vZGJfdGFibGUsIEZBTFNF KSk7CiAJCXJvd19teXNxbF91bmxvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CiAJfQogCgo= --===============2008612596== 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: a24efddd0226c7a5b619cbf5b56f7c9737fb0205 # timestamp: 2010-04-21 13:00:38 +0300 # base_revision_id: marko.makela@stripped\ # 0acvzxb8um8cms0a # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZkjcj4AAbrfgEAwW2f//3en jwC////wUAQZPAChUgEJRCJPQj1NqM9T0IZJtIAAAyHqaGg5piZMmjCYJiaYBMAhgjAjARNNTEge UHqNHqaGgAAAAaAA5piZMmjCYJiaYBMAhgjAjAJJCYhpDTRkTFT9J6FNgT1Tankh6mgND1FkTGvQ g7pGGqkgz4CaSLqDigQZQmCF9ZKcXdiWgucICIR8jTPCFRRHOQEs4V4LO2bj+s4o8kTyewNDmgEk lInUIa1CJTHdxzTYyShtT1xc4DGcDUDjGbCQ4D68tnLtnjbm8erly6UyhovoFoQB10KHQiE2V4Ka Ir70lELBDFkxFvVH8UbaaJJdT3NqbtqE4TCHIOQPFjgnCIRCNRkOThrPNMYKo74BRKPiyWVEHbct ub6PE6X3SCBK+qvXzO8tNZ6nk12iXrdjc22g8M53dGkyEM5BiajL0L7CBsGdImbEtIQC/1SebiZO xQpKtbC3CKwDAgZigV7IFdl0SROCC4foWkHR/3cTNYUJkT4W6atB6RV9hgcIGB5GFAiEjUYDwyjn slfZQjQGLtaoH/dIrRPzGEwrPy6FIqNheGBcrnlNIatgMayCmdO4shQ8FMvKjwVdkAklN96LiAYG faUTzZ4CkPKeLRpyxfukraWDHQo2GYI2zo/xZsvoa2FxY0X5DrZnY55DwZcvieHe+LiL3PyMOIj2 hnZKdh9263VyImy34dK5ltyxtv3LPPqa16Mnpe0HQ5LlC5l3l7Kg4hsPmIf7xOk29/aadYiihpcX kA8PIR51LWXRDOljQX1rESxxetnPgwO9kx+usKFMcVPpQwpkTNuPmHoQLwy2B8lWHv5ki2Xpl5QX GMXYvEP81QRN5BRm2DEjiWKCbAmLPZRdZmC4mHIOAv2nuIhJMDqrM/EwEv0LUaL1kptMtC3ryODd SvkjKd9qIRM9kyJqtMui5+fEZj7ysZt5nvJNK0CwIKF7w36jMcJoYMIYQxEZKfFcaYYMpVNNeQSL 5mEyGfBrEWcPTzQ53U7zDUqbeFIv4SqxZoTDxLgwx0A9xA0hcna7Mzn9xvqhsmyTWrshvA680sHi xWDH20iLw1pHZWmEY85iHOYyF3V8/iLT1wV87NHiIrXyEaeXI+o5NqVoqD+FxlxFdGwzrXKobHoe lqG7awiAwnudZh7wDWG+0Hshk7kkQwZatCRERxeiR9hHwBy4OWiRxbLRqNu3atESsJWtKQ3cL1gL pFpntyBOSW8I8qhW9d9zJ9cYpFa1PzhUoMQdUw8wGC9NUM2ojqdBxWSAaK41EmIic6XPdAvy/A3w oTdCSp1YD2v4DhrKwtDOxBle47OHNPeS6xU9+uxP/rICTxJUhnyxlSLMoXd8eqrdIRmdvUVyPwp/ i7kinChITJG5HwA= --===============2008612596==--