From: marko.makela Date: April 26 2010 11:26am Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3419 to 3420) List-Archive: http://lists.mysql.com/commits/106510 Message-Id: <201004261126.o3QAa5Bl024112@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1540866982==" --===============1540866982== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDM0MjAgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNgogICAgICByZWN2X3N5c19pbml0KCk6IFNr aXAgdGhlIHJlZC1ibGFjayB0cmVlIGluIEhvdCBCYWNrdXAuCgogICAgbW9kaWZpZWQ6CiAgICAg IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2cvbG9nMHJlY3YuYwogMzQxOSBNYXJrbyBNw6RrZWzD pAkyMDEwLTA0LTI2CiAgICAgIEFkZCBhIHRlc3QgY2FzZSBmb3IgQnVnICM1Mjc0NS4KCiAgICBh ZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUy NzQ1LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJf YnVnNTI3NDUudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2xv Zy9sb2cwcmVjdi5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vbG9nL2xvZzByZWN2LmMJ MjAxMC0wMy0yMyAxNjoyMDozNiArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vbG9n L2xvZzByZWN2LmMJMjAxMC0wNC0yNiAxMToyNjowOSArMDAwMApAQCAtMzAwLDExICszMDAsMTEg QEAgcmVjdl9zeXNfaW5pdCgKIAlmbHVzaF9saXN0IGR1cmluZyByZWNvdmVyeSBwcm9jZXNzLgog CUFzIHRoaXMgaW5pdGlhbGl6YXRpb24gaXMgZG9uZSB3aGlsZSBob2xkaW5nIHRoZSBidWZmZXIg cG9vbAogCW11dGV4IHdlIHBlcmZvcm0gaXQgYmVmb3JlIGFjcXVpcmluZyByZWN2X3N5cy0+bXV0 ZXguICovCisjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAJYnVmX2ZsdXNoX2luaXRfZmx1c2hfcmJ0 KCk7CiAKIAltdXRleF9lbnRlcigmKHJlY3Zfc3lzLT5tdXRleCkpOwogCi0jaWZuZGVmIFVOSVZf SE9UQkFDS1VQCiAJcmVjdl9zeXMtPmhlYXAgPSBtZW1faGVhcF9jcmVhdGVfaW5fYnVmZmVyKDI1 Nik7CiAjZWxzZSAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KIAlyZWN2X3N5cy0+aGVhcCA9IG1lbV9o ZWFwX2NyZWF0ZSgyNTYpOwoK --===============1540866982== 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:29 +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 --===============1540866982==--