From: marko.makela Date: April 26 2010 11:26am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3420) List-Archive: http://lists.mysql.com/commits/106508 Message-Id: <201004261126.o3QB99MG004559@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2083944721==" --===============2083944721== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjYxMTA4NTYtMTR0Yzhy ZTFmNWtwNWozZwoKIDM0MjAgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNgogICAgICByZWN2X3N5 c19pbml0KCk6IFNraXAgdGhlIHJlZC1ibGFjayB0cmVlIGluIEhvdCBCYWNrdXAuCgogICAgbW9k aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2cvbG9nMHJlY3YuYwo9PT0gbW9k aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2xvZy9sb2cwcmVjdi5jJwotLS0gYS9z dG9yYWdlL2lubm9kYl9wbHVnaW4vbG9nL2xvZzByZWN2LmMJMjAxMC0wMy0yMyAxNjoyMDozNiAr MDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vbG9nL2xvZzByZWN2LmMJMjAxMC0wNC0y NiAxMToyNjowOSArMDAwMApAQCAtMzAwLDExICszMDAsMTEgQEAgcmVjdl9zeXNfaW5pdCgKIAlm bHVzaF9saXN0IGR1cmluZyByZWNvdmVyeSBwcm9jZXNzLgogCUFzIHRoaXMgaW5pdGlhbGl6YXRp b24gaXMgZG9uZSB3aGlsZSBob2xkaW5nIHRoZSBidWZmZXIgcG9vbAogCW11dGV4IHdlIHBlcmZv cm0gaXQgYmVmb3JlIGFjcXVpcmluZyByZWN2X3N5cy0+bXV0ZXguICovCisjaWZuZGVmIFVOSVZf SE9UQkFDS1VQCiAJYnVmX2ZsdXNoX2luaXRfZmx1c2hfcmJ0KCk7CiAKIAltdXRleF9lbnRlcigm KHJlY3Zfc3lzLT5tdXRleCkpOwogCi0jaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAJcmVjdl9zeXMt PmhlYXAgPSBtZW1faGVhcF9jcmVhdGVfaW5fYnVmZmVyKDI1Nik7CiAjZWxzZSAvKiAhVU5JVl9I T1RCQUNLVVAgKi8KIAlyZWN2X3N5cy0+aGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgyNTYpOwoK --===============2083944721== 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: 7cdfe7a6c6713e59a06f8c647616f14a0d1e3ef0 # timestamp: 2010-04-26 14:26:18 +0300 # base_revision_id: marko.makela@stripped\ # 14tc8re1f5kp5j3g # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWevDmoQAAaVfgEAQW2P//3tr zwC////wUAO929oF3cAauQ0RGpoADTR6jQeoNGgAADRpoHMAmAmRgBGJiYTCYIaYmmAlCmERiRsk 9J6g8oHqAADQBoAMU0mkR4jKPJqeQgNNDagDJo0AAJKJoaANTBT0anomp6pmFGaZTBo1P1T0Takm CazOtmsdscIigjfVU9jPOJENiToS149qgSypI7NZ0ugKULtGNxI+NV2iTR+2ZDxczl0rIsVD4Ujn 9MzWaw55KjOvkIkVjQCDAtJODzuiwLOGB0CkTaiA8AMAtKcCIWG//NcsZN36XSI6hGV5Nwj96PzR XKk1jLWauEMQXBvo7XFQIBIVkQeIwzYYHOF6NOhMq9GfPQg9tK0qQPskCMUj5GX/6eJanEvb4Kzu dBtE44MiBvrWRAvtETGHeUClQSPCKhSA0L/BngjKarYh+LdxSWA4rBpyPRS4PnwIDUhhXyqKikwD 8/sT1+xQrwKfHfvikIu0mPgcVAzvBhcSjQxMTNb0xVVvRqKliCKptk4W29VSkLBwYRECMmioD56L IJS16vIG4vFVXKD9wNK4lQ8oljKy4yMBNWOsIgnEnxLDEEZit1se+DW04zNPlFMiOlKQhNKjdKrb 2C1A5ENzBUIw2ZbYT7kd3MLtDQcIM5pzjBFkzykvd/r0acISN+u6J/yI0xnHHIum6RumAhHZp49q QIRbAYID3DDuEevuOUXDkI+Bs7DYODzEeWBe4u9tQub0KrAO4sLDttF8Z+P9+/sQwoDcX7jcGhko A4gFoPGGB6z57GuImJDKxHseLAUIB8SZTDk2YXOgJSsjleGJLrRo1I89VccCY8Y9NHBXx4EhVDRl Y4LOktC9hZBvNIZyTERV08sQozKoKOYCVRQJws6DHHqctomlwojEsOempATsNrlTTp0iYWik0F6b jXUrBmdLbVFtJ4d4nGZzvxBxgcAofj6dDpIASz3AWax44KUvGJkib+ugRaHrcLJImU3CldQmiOvb GIYusVPX6o/jhe/iI7BF8nE8hqZcqRuthtnjeQjH2onINEYiA3onNwupKywrAZEIuykh89QNRIgA b3I/4R7AmXc1fK19fCtRZXmeeaujJwqollGd+zLFPBNg6jcfTDTnvgy80UyLSQgSJDebCBEHoPNo LFhILqNYZnbYjExYAsEvgjxHT4ovwueW/JRQjUZSK47xiISoy0oo5UoY5r2S6WtN1ZUn4qgISibn 1UI8voSVMapnFbW3qP8XckU4UJDrw5qE --===============2083944721==--