From: marko.makela Date: April 21 2010 8:28am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3408) Bug#52745 List-Archive: http://lists.mysql.com/commits/106197 X-Bug: 52745 Message-Id: <201004210828.o3L85TcD014641@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0963879366==" --===============0963879366== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjEwNjM5MTYtaDNnd2pl YTdqemppbHl3dwoKIDM0MDggTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICBkdHVwbGVf Y29udmVydF9iaWdfcmVjKCk6IFJlZnVzZSBleHRlcm5hbCBzdG9yYWdlIGZvciBjb2x1bW5zCiAg ICAgIHdob3NlIG1heGltdW0gbGVuZ3RoIGlzIGJlbG93IDI1NiBieXRlcy4gKEJ1ZyAjNTI3NDUp CgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9k Yl9idWc1Mjc0NS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3Qv aW5ub2RiX2J1ZzUyNzQ1LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9w bHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kYXRhL2RhdGEwZGF0 YS5jCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5v ZGJfYnVnNTI3NDUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4v ci9pbm5vZGJfYnVnNTI3NDUucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIv bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUyNzQ1LnJlc3VsdAky MDEwLTA0LTIxIDA4OjI4OjM1ICswMDAwCkBAIC0wLDAgKzEsMTMwIEBACitTRVQgR0xPQkFMIGlu bm9kYl9maWxlX2Zvcm1hdD0nQmFycmFjdWRhJzsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVy X3RhYmxlPW9uOworQ1JFQVRFIFRBQkxFIGJ1ZzUyNzQ1ICgKK2EyIGludCgxMCkgdW5zaWduZWQg REVGQVVMVCBOVUxMLAorY29sMzcgdGltZSBERUZBVUxUIE5VTEwsCitjb2wzOCBjaGFyKDIyOSkg Q0hBUkFDVEVSIFNFVCB1dGY4IERFRkFVTFQgTlVMTCwKK2NvbDM5IHRleHQgQ0hBUkFDVEVSIFNF VCB1Y3MyIENPTExBVEUgdWNzMl9zcGFuaXNoMl9jaSwKK2NvbDQwIHRpbWVzdGFtcCBOT1QgTlVM TCBERUZBVUxUIENVUlJFTlRfVElNRVNUQU1QIE9OIFVQREFURSBDVVJSRU5UX1RJTUVTVEFNUCwK K2NvbDQxIGludCgxMCkgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorY29sNDIgdmFyY2hhcigyNDgp IENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCitjb2w0MyBzbWFsbGludCg1KSB1bnNp Z25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCitjb2w0NCB2YXJjaGFyKDE1MCkgQ0hBUkFDVEVS IFNFVCB1dGY4IERFRkFVTFQgTlVMTCwKK2NvbDQ1IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERF RkFVTFQgTlVMTCwKK2NvbDQ2IGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCitjb2w0NyB0aW55aW50 KDQpIERFRkFVTFQgTlVMTCwKK2NvbDQ4IHRpbnlpbnQoMSkgREVGQVVMVCBOVUxMLAorY29sNDkg dGltZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgJzAwMDAtMDAtMDAgMDA6MDA6MDAnLAorY29sNTAg YmluYXJ5KDEpIERFRkFVTFQgTlVMTCwKK2NvbDUxIGRvdWJsZSB1bnNpZ25lZCB6ZXJvZmlsbCBE RUZBVUxUIE5VTEwsCitjb2w1MiBpbnQoMTApIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKK2NvbDUz IHRpbWUgREVGQVVMVCBOVUxMLAorY29sNTQgZG91YmxlIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwK K2NvbDU1IHRpbWUgREVGQVVMVCBOVUxMLAorY29sNTYgbWVkaXVtdGV4dCBDSEFSQUNURVIgU0VU IGxhdGluMiwKK2NvbDU3IGJsb2IsCitjb2w1OCBkZWNpbWFsKDUyLDE2KSB1bnNpZ25lZCB6ZXJv ZmlsbCBOT1QgTlVMTCBERUZBVUxUICcwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuMDAwMDAwMDAwMDAwMDAwMCcsCitjb2w1OSBiaW5hcnkoMSkgREVGQVVMVCBOVUxMLAorY29s NjAgbG9uZ2Jsb2IsCitjb2w2MSB0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDYyIGxvbmd0ZXh0IENI QVJBQ1RFUiBTRVQgdXRmOCBDT0xMQVRFIHV0ZjhfcGVyc2lhbl9jaSwKK2NvbDYzIHRpbWVzdGFt cCBOT1QgTlVMTCBERUZBVUxUICcwMDAwLTAwLTAwIDAwOjAwOjAwJywKK2NvbDY0IGludCgxMCkg dW5zaWduZWQgREVGQVVMVCBOVUxMLAorY29sNjUgZGF0ZSBERUZBVUxUIE5VTEwsCitjb2w2NiB0 aW1lc3RhbXAgTk9UIE5VTEwgREVGQVVMVCAnMDAwMC0wMC0wMCAwMDowMDowMCcsCitjb2w2NyBi aW5hcnkoMSkgREVGQVVMVCBOVUxMLAorY29sNjggdGlueWJsb2IsCitjb2w2OSBkYXRlIERFRkFV TFQgTlVMTCwKK2NvbDcwIHRpbnlpbnQoMykgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxM LAorY29sNzEgdmFyY2hhcig0NCkgQ0hBUkFDVEVSIFNFVCB1dGY4IERFRkFVTFQgTlVMTCwKK2Nv bDcyIGRhdGV0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDczIHNtYWxsaW50KDUpIHVuc2lnbmVkIHpl cm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDc0IGxvbmdibG9iLAorY29sNzUgYml0KDM0KSBERUZB VUxUIE5VTEwsCitjb2w3NiBmbG9hdCB1bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCitj b2w3NyB5ZWFyKDIpIERFRkFVTFQgTlVMTCwKK2NvbDc4IHRpbnlpbnQoMykgdW5zaWduZWQgREVG QVVMVCBOVUxMLAorY29sNzkgc2V0KCdtc2ZoZW93aCcsJ3RicHhiZ2YnLCdieScsJ3dhaG5yancn LCdteXFmYXN4eicsJ3Jzb2t5dW1ydCcpIENIQVJBQ1RFUiBTRVQgbGF0aW4yIERFRkFVTFQgTlVM TCwKK2NvbDgwIGRhdGV0aW1lIERFRkFVTFQgTlVMTCwKK2NvbDgxIHNtYWxsaW50KDYpIERFRkFV TFQgTlVMTCwKK2NvbDgyIGVudW0oJ3h0YXVybnFmcXonLCdyaWZyc2UnLCdrdXp3cGJ2YicsJ25p aXNhYmsnLCd6eGF2cm8nLCdyYnZhc3YnLCcnLCd1dWxyZmFvdmUnLCcnLCcnKSBDSEFSQUNURVIg U0VUIHVjczIgQ09MTEFURSB1Y3MyX2JpbiBERUZBVUxUIE5VTEwsCitjb2w4MyBiaWdpbnQoMjAp IHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDg0IGZsb2F0IHVuc2lnbmVkIHpl cm9maWxsIERFRkFVTFQgTlVMTCwKK2NvbDg1IGRvdWJsZSBERUZBVUxUIE5VTEwsCitjb2w4NiBl bnVtKCd5bGFubnYnLCcnLCd2bGtoeWNxYycsJ3Nua2UnLCdjeGlmdXN0cCcsJ3hpYXhhc3d6cCcs J294bCcpIENIQVJBQ1RFUiBTRVQgbGF0aW4xIENPTExBVEUgbGF0aW4xX2dlcm1hbjJfY2kgREVG QVVMVCBOVUxMLAorY29sODcgdmFyYmluYXJ5KDIyMSkgREVGQVVMVCBOVUxMLAorY29sODggZG91 YmxlIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKK2NvbDg5IGZsb2F0IHVuc2lnbmVkIHplcm9maWxs IERFRkFVTFQgTlVMTCwKK2NvbDkwIHRpbnlibG9iCispIEVOR0lORT1Jbm5vREIgREVGQVVMVCBD SEFSU0VUPWxhdGluMSBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZX0JMT0NLX1NJWkU9MTsKK1dh cm5pbmdzOgorTm90ZQkxMjkxCUNvbHVtbiAnY29sODInIGhhcyBkdXBsaWNhdGVkIHZhbHVlICcn IGluIEVOVU0KK05vdGUJMTI5MQlDb2x1bW4gJ2NvbDgyJyBoYXMgZHVwbGljYXRlZCB2YWx1ZSAn JyBpbiBFTlVNCitJTlNFUlQgSU5UTyBidWc1Mjc0NSBTRVQKK2NvbDQwPScwMDAwLTAwLTAwIDAw OjAwOjAwJywKK2NvbDUxPTE2NTQ3LAorY29sNTM9Jzc3MTE0ODQnLAorY29sNTQ9LTI4NjA0LAor Y29sNTU9JzcxMTI2MTInLAorY29sNTY9J3dha2VmdWxuZXNzXCcnLAorY29sNTc9cmVwZWF0KCdh YnNvcmJlZmFjaWVudFwnJywxMDYpLAorY29sNTg9MTEwMjcsCitjb2w1OT0nQU0wOWdXNycsCitj b2w2MD1yZXBlYXQoJ05vZWxhbmlcJycsMTYpLAorY29sNjE9JzI1MjA1NzYnLAorY29sNjI9J3N1 YnN0aXR1dGl2JywKK2NvbDYzPScxOTk1MDEwNjE1NTExMicsCitjb2w2ND0tMTIwMzgsCitjb2w2 NT0nODYyMzg4MDYnLAorY29sNjY9JzE5NjAwNzE5MDgwMjU2JywKK2NvbDY4PXJlcGVhdCgnU2Fn aXR0YXJpdXNcJycsNTQpLAorY29sNjk9JzM4OTQzOTAyJywKK2NvbDcwPTEyMzIsCitjb2w3MT0n RWxvcmFcJycsCitjb2w3ND1yZXBlYXQoJ3ppcHAnLDExKSwKK2NvbDc1PScwJywKK2NvbDc2PTIz MjU0LAorY29sNzg9MTMyNDcsCitjb2w3OT0nNTYyMTknLAorY29sODA9JzIwNTAwNjA5MDM1NzI0 JywKK2NvbDgxPTExNjMyLAorY29sODI9NywKK2NvbDg0PS0yMzg2MywKK2NvbDg1PTYzNDEsCitj b2w4Nz0nSFpka2YuNCBzN3QsNVJtcQk4c28gZm1yLHJ1R0xVRzI1VHJ0SS55UQkyU3VIcTBNTDdy dzcuNCBiMnlmMkU1VEp4T3RCQlpJbWV6RG56cGosdVBZZnpubkVVRE4xZTlhUW9PIDJEc3BsQjdU Rld5CW9RSiBiciAgSExGIDpGLGVRIHA0aTFvV3NyIGxMM1BHLGhqQ3o2aFlxTiBoMVFUakxDanJ2 OlFDZFN6cFlCaWJKQXRaQ3hMT2szbDZCbHNoLlcnLAorY29sODg9MTY4OTQsCitjb2w4OT02MTYx LAorY29sOTA9cmVwZWF0KCdnYWxlJyw0OCk7CitXYXJuaW5nczoKK1dhcm5pbmcJMTI2NQlEYXRh IHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w1MycgYXQgcm93IDEKK1dhcm5pbmcJMTI2NAlPdXQg b2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNTQnIGF0IHJvdyAxCitXYXJuaW5nCTEyNjUJ RGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNTknIGF0IHJvdyAxCitXYXJuaW5nCTEyNjUJ RGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNjEnIGF0IHJvdyAxCitXYXJuaW5nCTEyNjQJ T3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDY0JyBhdCByb3cgMQorV2FybmluZwkx MjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY1JyBhdCByb3cgMQorV2FybmluZwkx MjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w2NicgYXQgcm93IDEKK1dhcm5p bmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2OCcgYXQgcm93IDEKK1dhcm5p bmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2OScgYXQgcm93IDEKK1dhcm5p bmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNzAnIGF0IHJvdyAxCitX YXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDc4JyBhdCByb3cg MQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDc5JyBhdCByb3cg MQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w4NCcgYXQg cm93IDEKK1NIT1cgV0FSTklOR1M7CitMZXZlbAlDb2RlCU1lc3NhZ2UKK1dhcm5pbmcJMTI2NQlE YXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w1MycgYXQgcm93IDEKK1dhcm5pbmcJMTI2NAlP dXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNTQnIGF0IHJvdyAxCitXYXJuaW5nCTEy NjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNTknIGF0IHJvdyAxCitXYXJuaW5nCTEy NjUJRGF0YSB0cnVuY2F0ZWQgZm9yIGNvbHVtbiAnY29sNjEnIGF0IHJvdyAxCitXYXJuaW5nCTEy NjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDY0JyBhdCByb3cgMQorV2Fybmlu ZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDY1JyBhdCByb3cgMQorV2Fybmlu ZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w2NicgYXQgcm93IDEKK1dh cm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2OCcgYXQgcm93IDEKK1dh cm5pbmcJMTI2NQlEYXRhIHRydW5jYXRlZCBmb3IgY29sdW1uICdjb2w2OScgYXQgcm93IDEKK1dh cm5pbmcJMTI2NAlPdXQgb2YgcmFuZ2UgdmFsdWUgZm9yIGNvbHVtbiAnY29sNzAnIGF0IHJvdyAx CitXYXJuaW5nCTEyNjQJT3V0IG9mIHJhbmdlIHZhbHVlIGZvciBjb2x1bW4gJ2NvbDc4JyBhdCBy b3cgMQorV2FybmluZwkxMjY1CURhdGEgdHJ1bmNhdGVkIGZvciBjb2x1bW4gJ2NvbDc5JyBhdCBy b3cgMQorV2FybmluZwkxMjY0CU91dCBvZiByYW5nZSB2YWx1ZSBmb3IgY29sdW1uICdjb2w4NCcg YXQgcm93IDEKK0RST1AgVEFCTEUgYnVnNTI3NDU7CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zv cm1hdD1BbnRlbG9wZTsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0X2NoZWNrPUFudGVs b3BlOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9MDsKCj09PSBhZGRlZCBmaWxl ICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTI3NDUudGVzdCcK LS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzUyNzQ1LnRl c3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9k Yl9wbHVnaW4vdC9pbm5vZGJfYnVnNTI3NDUudGVzdAkyMDEwLTA0LTIxIDA4OjI4OjM1ICswMDAw CkBAIC0wLDAgKzEsMTA5IEBACistLSBzb3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYl9wbHVnaW4u aW5jCisKK2xldCAkZmlsZV9mb3JtYXQ9YHNlbGVjdCBAQGlubm9kYl9maWxlX2Zvcm1hdGA7Cits ZXQgJGZpbGVfZm9ybWF0X2NoZWNrPWBzZWxlY3QgQEBpbm5vZGJfZmlsZV9mb3JtYXRfY2hlY2tg OworbGV0ICRmaWxlX3Blcl90YWJsZT1gc2VsZWN0IEBAaW5ub2RiX2ZpbGVfcGVyX3RhYmxlYDsK K1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSdCYXJyYWN1ZGEnOworU0VUIEdMT0JBTCBp bm5vZGJfZmlsZV9wZXJfdGFibGU9b247CisKK0NSRUFURSBUQUJMRSBidWc1Mjc0NSAoCisgIGEy IGludCgxMCkgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorICBjb2wzNyB0aW1lIERFRkFVTFQgTlVM TCwKKyAgY29sMzggY2hhcigyMjkpIENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCisg IGNvbDM5IHRleHQgQ0hBUkFDVEVSIFNFVCB1Y3MyIENPTExBVEUgdWNzMl9zcGFuaXNoMl9jaSwK KyAgY29sNDAgdGltZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgQ1VSUkVOVF9USU1FU1RBTVAgT04g VVBEQVRFIENVUlJFTlRfVElNRVNUQU1QLAorICBjb2w0MSBpbnQoMTApIHVuc2lnbmVkIERFRkFV TFQgTlVMTCwKKyAgY29sNDIgdmFyY2hhcigyNDgpIENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxU IE5VTEwsCisgIGNvbDQzIHNtYWxsaW50KDUpIHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVM TCwKKyAgY29sNDQgdmFyY2hhcigxNTApIENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEws CisgIGNvbDQ1IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKKyAgY29sNDYg YmluYXJ5KDEpIERFRkFVTFQgTlVMTCwKKyAgY29sNDcgdGlueWludCg0KSBERUZBVUxUIE5VTEws CisgIGNvbDQ4IHRpbnlpbnQoMSkgREVGQVVMVCBOVUxMLAorICBjb2w0OSB0aW1lc3RhbXAgTk9U IE5VTEwgREVGQVVMVCAnMDAwMC0wMC0wMCAwMDowMDowMCcsCisgIGNvbDUwIGJpbmFyeSgxKSBE RUZBVUxUIE5VTEwsCisgIGNvbDUxIGRvdWJsZSB1bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5V TEwsCisgIGNvbDUyIGludCgxMCkgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorICBjb2w1MyB0aW1l IERFRkFVTFQgTlVMTCwKKyAgY29sNTQgZG91YmxlIHVuc2lnbmVkIERFRkFVTFQgTlVMTCwKKyAg Y29sNTUgdGltZSBERUZBVUxUIE5VTEwsCisgIGNvbDU2IG1lZGl1bXRleHQgQ0hBUkFDVEVSIFNF VCBsYXRpbjIsCisgIGNvbDU3IGJsb2IsCisgIGNvbDU4IGRlY2ltYWwoNTIsMTYpIHVuc2lnbmVk IHplcm9maWxsIE5PVCBOVUxMIERFRkFVTFQgJzAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4wMDAwMDAwMDAwMDAwMDAwJywKKyAgY29sNTkgYmluYXJ5KDEpIERFRkFVTFQgTlVM TCwKKyAgY29sNjAgbG9uZ2Jsb2IsCisgIGNvbDYxIHRpbWUgREVGQVVMVCBOVUxMLAorICBjb2w2 MiBsb25ndGV4dCBDSEFSQUNURVIgU0VUIHV0ZjggQ09MTEFURSB1dGY4X3BlcnNpYW5fY2ksCisg IGNvbDYzIHRpbWVzdGFtcCBOT1QgTlVMTCBERUZBVUxUICcwMDAwLTAwLTAwIDAwOjAwOjAwJywK KyAgY29sNjQgaW50KDEwKSB1bnNpZ25lZCBERUZBVUxUIE5VTEwsCisgIGNvbDY1IGRhdGUgREVG QVVMVCBOVUxMLAorICBjb2w2NiB0aW1lc3RhbXAgTk9UIE5VTEwgREVGQVVMVCAnMDAwMC0wMC0w MCAwMDowMDowMCcsCisgIGNvbDY3IGJpbmFyeSgxKSBERUZBVUxUIE5VTEwsCisgIGNvbDY4IHRp bnlibG9iLAorICBjb2w2OSBkYXRlIERFRkFVTFQgTlVMTCwKKyAgY29sNzAgdGlueWludCgzKSB1 bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDcxIHZhcmNoYXIoNDQpIENIQVJB Q1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwsCisgIGNvbDcyIGRhdGV0aW1lIERFRkFVTFQgTlVM TCwKKyAgY29sNzMgc21hbGxpbnQoNSkgdW5zaWduZWQgemVyb2ZpbGwgREVGQVVMVCBOVUxMLAor ICBjb2w3NCBsb25nYmxvYiwKKyAgY29sNzUgYml0KDM0KSBERUZBVUxUIE5VTEwsCisgIGNvbDc2 IGZsb2F0IHVuc2lnbmVkIHplcm9maWxsIERFRkFVTFQgTlVMTCwKKyAgY29sNzcgeWVhcigyKSBE RUZBVUxUIE5VTEwsCisgIGNvbDc4IHRpbnlpbnQoMykgdW5zaWduZWQgREVGQVVMVCBOVUxMLAor ICBjb2w3OSBzZXQoJ21zZmhlb3doJywndGJweGJnZicsJ2J5Jywnd2FobnJqdycsJ215cWZhc3h6 JywncnNva3l1bXJ0JykgQ0hBUkFDVEVSIFNFVCBsYXRpbjIgREVGQVVMVCBOVUxMLAorICBjb2w4 MCBkYXRldGltZSBERUZBVUxUIE5VTEwsCisgIGNvbDgxIHNtYWxsaW50KDYpIERFRkFVTFQgTlVM TCwKKyAgY29sODIgZW51bSgneHRhdXJucWZxeicsJ3JpZnJzZScsJ2t1endwYnZiJywnbmlpc2Fi aycsJ3p4YXZybycsJ3JidmFzdicsJycsJ3V1bHJmYW92ZScsJycsJycpIENIQVJBQ1RFUiBTRVQg dWNzMiBDT0xMQVRFIHVjczJfYmluIERFRkFVTFQgTlVMTCwKKyAgY29sODMgYmlnaW50KDIwKSB1 bnNpZ25lZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDg0IGZsb2F0IHVuc2lnbmVkIHpl cm9maWxsIERFRkFVTFQgTlVMTCwKKyAgY29sODUgZG91YmxlIERFRkFVTFQgTlVMTCwKKyAgY29s ODYgZW51bSgneWxhbm52JywnJywndmxraHljcWMnLCdzbmtlJywnY3hpZnVzdHAnLCd4aWF4YXN3 enAnLCdveGwnKSBDSEFSQUNURVIgU0VUIGxhdGluMSBDT0xMQVRFIGxhdGluMV9nZXJtYW4yX2Np IERFRkFVTFQgTlVMTCwKKyAgY29sODcgdmFyYmluYXJ5KDIyMSkgREVGQVVMVCBOVUxMLAorICBj b2w4OCBkb3VibGUgdW5zaWduZWQgREVGQVVMVCBOVUxMLAorICBjb2w4OSBmbG9hdCB1bnNpZ25l ZCB6ZXJvZmlsbCBERUZBVUxUIE5VTEwsCisgIGNvbDkwIHRpbnlibG9iCispIEVOR0lORT1Jbm5v REIgREVGQVVMVCBDSEFSU0VUPWxhdGluMSBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZX0JMT0NL X1NJWkU9MTsKKworSU5TRVJUIElOVE8gYnVnNTI3NDUgU0VUCitjb2w0MD0nMDAwMC0wMC0wMCAw MDowMDowMCcsCitjb2w1MT0xNjU0NywKK2NvbDUzPSc3NzExNDg0JywKK2NvbDU0PS0yODYwNCwK K2NvbDU1PSc3MTEyNjEyJywKK2NvbDU2PSd3YWtlZnVsbmVzc1wnJywKK2NvbDU3PXJlcGVhdCgn YWJzb3JiZWZhY2llbnRcJycsMTA2KSwKK2NvbDU4PTExMDI3LAorY29sNTk9J0FNMDlnVzcnLAor Y29sNjA9cmVwZWF0KCdOb2VsYW5pXCcnLDE2KSwKK2NvbDYxPScyNTIwNTc2JywKK2NvbDYyPSdz dWJzdGl0dXRpdicsCitjb2w2Mz0nMTk5NTAxMDYxNTUxMTInLAorY29sNjQ9LTEyMDM4LAorY29s NjU9Jzg2MjM4ODA2JywKK2NvbDY2PScxOTYwMDcxOTA4MDI1NicsCitjb2w2OD1yZXBlYXQoJ1Nh Z2l0dGFyaXVzXCcnLDU0KSwKK2NvbDY5PSczODk0MzkwMicsCitjb2w3MD0xMjMyLAorY29sNzE9 J0Vsb3JhXCcnLAorY29sNzQ9cmVwZWF0KCd6aXBwJywxMSksCitjb2w3NT0nMCcsCitjb2w3Nj0y MzI1NCwKK2NvbDc4PTEzMjQ3LAorY29sNzk9JzU2MjE5JywKK2NvbDgwPScyMDUwMDYwOTAzNTcy NCcsCitjb2w4MT0xMTYzMiwKK2NvbDgyPTcsCitjb2w4ND0tMjM4NjMsCitjb2w4NT02MzQxLAor Y29sODc9J0haZGtmLjQgczd0LDVSbXEJOHNvIGZtcixydUdMVUcyNVRydEkueVEJMlN1SHEwTUw3 cnc3LjQgYjJ5ZjJFNVRKeE90QkJaSW1lekRuenBqLHVQWWZ6bm5FVUROMWU5YVFvTyAyRHNwbEI3 VEZXeQlvUUogYnIgIEhMRiA6RixlUSBwNGkxb1dzciBsTDNQRyxoakN6NmhZcU4gaDFRVGpMQ2py djpRQ2RTenBZQmliSkF0WkN4TE9rM2w2QmxzaC5XJywKK2NvbDg4PTE2ODk0LAorY29sODk9NjE2 MSwKK2NvbDkwPXJlcGVhdCgnZ2FsZScsNDgpOworCitTSE9XIFdBUk5JTkdTOworCitEUk9QIFRB QkxFIGJ1ZzUyNzQ1OworCitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSRmaWxl X2Zvcm1hdDsKK0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXRfY2hlY2s9JGZpbGVf Zm9ybWF0X2NoZWNrOworRVZBTCBTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT0kZmls ZV9wZXJfdGFibGU7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0No YW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwkyMDEwLTA0LTIw IDExOjQyOjIyICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAx MC0wNC0yMSAwODoyODozNSArMDAwMApAQCAtMSwzICsxLDggQEAKKzIwMTAtMDQtMjEJVGhlIElu bm9EQiBUZWFtCisKKwkqIGRhdGEvZGF0YTBkYXRhLmM6CisJRml4IEJ1ZyM1Mjc0NSBGYWlsaW5n IGFzc2VydGlvbjogYmxvYl9ubyA8IHBhZ2VfemlwLT5uX2Jsb2JzCisKIDIwMTAtMDQtMjAJVGhl IElubm9EQiBUZWFtCiAKIAkqIGRpY3QvZGljdDBjcmVhLmMsIGhhbmRsZXIvaGFfaW5ub2RiLmNj LCBpbmNsdWRlL3RyeDB0cnguaDoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w bHVnaW4vZGF0YS9kYXRhMGRhdGEuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RhdGEv ZGF0YTBkYXRhLmMJMjAwOS0wNS0yNSAxMjowOToyNCArMDAwMAorKysgYi9zdG9yYWdlL2lubm9k Yl9wbHVnaW4vZGF0YS9kYXRhMGRhdGEuYwkyMDEwLTA0LTIxIDA4OjI4OjM1ICswMDAwCkBAIC02 NjYsNiArNjY2LDEzIEBAIGR0dXBsZV9jb252ZXJ0X2JpZ19yZWMoCiAJCQkJZ290byBza2lwX2Zp ZWxkOwogCQkJfQogCisJCQkvKiBjZi4gdGhlIFJFQ19PRkZTX0VYVEVSTkFMIGhhbmRsaW5nIGlu CisJCQlyZWNfaW5pdF9vZmZzZXRzX2NvbXBfb3JkaW5hcnkoKSAqLworCQkJaWYgKGlmaWVsZC0+ Y29sLT5tdHlwZSAhPSBEQVRBX0JMT0IKKwkJCSAgICAmJiBpZmllbGQtPmNvbC0+bGVuIDwgMjU2 KSB7CisJCQkJZ290byBza2lwX2ZpZWxkOworCQkJfQorCiAJCQlsb25nZXN0X2kgPSBpOwogCQkJ bG9uZ2VzdCA9IHNhdmluZ3M7CiAKCg== --===============0963879366== 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: 0fee9a133fbccc13e822041d46d8fecedde9fc07 # timestamp: 2010-04-21 11:28:43 +0300 # base_revision_id: marko.makela@stripped\ # h3gwjea7jzjilyww # # Begin bundle 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 --===============0963879366==--