From: marko.makela Date: June 9 2011 11:03am Subject: bzr push into mysql-trunk branch (marko.makela:3171 to 3172) List-Archive: http://lists.mysql.com/commits/138942 Message-Id: <201106091104.p59B4UeF014990@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1670373536==" --===============1670373536== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDMxNzIgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0wOSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz ZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgK ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMKICAgICAgc3RvcmFnZS9p bm5vYmFzZS9yb3cvcm93MHJvdy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJz LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCiAzMTcxIEFsZXhhbmRlciBO b3pkcmluCTIwMTEtMDYtMDkKICAgICAgUHJlLXJlcXVpc2l0ZSBwYXRjaCBmb3IgQnVnIzExNzYz MTYyICg1NTg0MyAtIEhhbmRsZWQgY29uZGl0aW9uCiAgICAgIGFwcGVhcnMgYXMgbm90IGhhbmRs ZWQpLgogICAgICAKICAgICAgVGhlIHBhdGNoIG1vdmVzIERpYWdub3N0aWNzX2FyZWEncyBkZWNs YXJhdGlvbiBhZnRlcgogICAgICBXYXJuaW5nX2luZm8ncyBvbmUuIEl0J3Mgc2ltcGx5IGN1dCAm IHBhc3RlIG9wZXJhdGlvbiwgbm8gcmVhbAogICAgICBjaGFuZ2VzLgogICAgICAKICAgICAgVGhp cyBpcyBhIHByZS1yZXF1aXNpdGUgZm9yIG1vdmluZyBXYXJuaW5nX2luZm8gZnJvbSBUSEQgaW50 bwogICAgICBEaWFnbm9zdGljc19hcmVhLiBEaWFnbm9zdGljc19hcmVhIHdpbGwgYWdncmVnYXRl IFdhcm5pbmdfaW5mbyBpbnN0YW5jZSwgc28KICAgICAgdGhlIGRlY2xhcmF0aW9uIG9mIHRoZSBX YXJuaW5nX2luZm8gY2xhc3Mgc2hvdWxkIGJlIHBsYWNlZCBiZWZvcmUgdGhlCiAgICAgIG9uZSBv ZiB0aGUgRGlhZ25vc3RpY3NfYXJlYSBjbGFzcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3FsL3Nx bF9lcnJvci5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwlyZXZpZDphbGV4YW5kZXIu bm96ZHJpbkBvcmFjbGUuY29tLTIwMTEwNjA5MDkwMzE4LTA2bHJ1cGszZjh3bno5cHMKKysrIGIv c3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu Y29tLTIwMTEwNjA5MTEwMDM4LWN2d3hlbzA1cTB4NG5zZGsKQEAgLTE5ODcsNiArMTk4Nyw5IEBA IGJ0cl9jdXJfb3B0aW1pc3RpY191cGRhdGUoCiAKIAloZWFwID0gbWVtX2hlYXBfY3JlYXRlKDEw MjQpOwogCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCwgTlVMTCwgVUxJTlRf VU5ERUZJTkVELCAmaGVhcCk7CisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5J Vl9CTE9CX0xJR0hUX0RFQlVHCisJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywg b2Zmc2V0cykpOworI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVH ICovCiAKICNpZmRlZiBVTklWX0RFQlVHCiAJaWYgKGJ0cl9jdXJfcHJpbnRfcmVjb3JkX29wcyAm JiB0aHIpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVt MHJlYy5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJldmlkOmFs ZXhhbmRlci5ub3pkcmluQG9yYWNsZS5jb20tMjAxMTA2MDkwOTAzMTgtMDZscnVwazNmOHduejlw cworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJldmlkOm1hcmtvLm1h a2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTEwMDM4LWN2d3hlbzA1cTB4NG5zZGsKQEAgLTEsNiAr MSw2IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioKIAotQ29weXJpZ2h0IChjKSAxOTk0LCAyMDA5 LCBJbm5vYmFzZSBPeS4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KK0NvcHlyaWdodCAoYykgMTk5NCwg MjAxMSwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4K IAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVi bGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlCkBAIC00ODAsNiAr NDgwLDE4IEBAIHVsaW50CiByZWNfb2Zmc19hbnlfZXh0ZXJuKAogLyo9PT09PT09PT09PT09PT09 Ki8KIAljb25zdCB1bGludCoJb2Zmc2V0cyk7LyohPCBpbjogYXJyYXkgcmV0dXJuZWQgYnkgcmVj X2dldF9vZmZzZXRzKCkgKi8KKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklW X0JMT0JfTElHSFRfREVCVUcKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKiovLyoqCitEZXRlcm1pbmUgaWYgdGhlIG9mZnNldHMgYXJlIGZvciBh IHJlY29yZCBjb250YWluaW5nIG51bGwgQkxPQiBwb2ludGVycy4KK0ByZXR1cm4JZmlyc3QgZmll bGQgY29udGFpbmluZyBhIG51bGwgQkxPQiBwb2ludGVyLCBvciBOVUxMIGlmIG5vbmUgZm91bmQg Ki8KK1VOSVZfSU5MSU5FCitjb25zdCBieXRlKgorcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAor Lyo9PT09PT09PT09PT09PT09PT09PT0qLworCWNvbnN0IHJlY190KglyZWMsCQkvKiE8IGluOiBy ZWNvcmQgKi8KKwljb25zdCB1bGludCoJb2Zmc2V0cykJLyohPCBpbjogcmVjX2dldF9vZmZzZXRz KHJlYykgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsK KyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLwogLyoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJl dHVybnMgbm9uemVybyBpZiB0aGUgZXh0ZXJuIGJpdCBpcyBzZXQgaW4gbnRoIGZpZWxkIG9mIHJl Yy4KIEByZXR1cm4Jbm9uemVybyBpZiBleHRlcm5hbGx5IHN0b3JlZCAqLwoKPT09IG1vZGlmaWVk IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljJwotLS0gYS9zdG9yYWdl L2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5pYwlyZXZpZDphbGV4YW5kZXIubm96ZHJpbkBvcmFj bGUuY29tLTIwMTEwNjA5MDkwMzE4LTA2bHJ1cGszZjh3bno5cHMKKysrIGIvc3RvcmFnZS9pbm5v YmFzZS9pbmNsdWRlL3JlbTByZWMuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx MTA2MDkxMTAwMzgtY3Z3eGVvMDVxMHg0bnNkawpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTQsIDIwMDksIElubm9iYXNlIE95LiBBbGwg UmlnaHRzIFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAxOTk0LCAyMDExLCBPcmFjbGUgYW5kL29y IGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogCiBUaGlzIHByb2dyYW0gaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1 bmRlcgogdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJs aXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTI2LDYgKzI2LDcgQEAgQ3JlYXRlZCA1LzMw LzE5OTQgSGVpa2tpIFR1dXJpCiAjaW5jbHVkZSAibWFjaDBkYXRhLmgiCiAjaW5jbHVkZSAidXQw Ynl0ZS5oIgogI2luY2x1ZGUgImRpY3QwZGljdC5oIgorI2luY2x1ZGUgImJ0cjB0eXBlcy5oIgog CiAvKiBDb21wYWN0IGZsYWcgT1JlZCB0byB0aGUgZXh0cmEgc2l6ZSByZXR1cm5lZCBieSByZWNf Z2V0X29mZnNldHMoKSAqLwogI2RlZmluZSBSRUNfT0ZGU19DT01QQUNUCSgodWxpbnQpIDEgPDwg MzEpCkBAIC0xMDg3LDYgKzEwODgsNDQgQEAgcmVjX29mZnNfYW55X2V4dGVybigKIAlyZXR1cm4o VU5JVl9VTkxJS0VMWSgqcmVjX29mZnNfYmFzZShvZmZzZXRzKSAmIFJFQ19PRkZTX0VYVEVSTkFM KSk7CiB9CiAKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElH SFRfREVCVUcKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiovLyoqCitEZXRlcm1pbmUgaWYgdGhlIG9mZnNldHMgYXJlIGZvciBhIHJlY29yZCBj b250YWluaW5nIG51bGwgQkxPQiBwb2ludGVycy4KK0ByZXR1cm4JZmlyc3QgZmllbGQgY29udGFp bmluZyBhIG51bGwgQkxPQiBwb2ludGVyLCBvciBOVUxMIGlmIG5vbmUgZm91bmQgKi8KK1VOSVZf SU5MSU5FCitjb25zdCBieXRlKgorcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAorLyo9PT09PT09 PT09PT09PT09PT09PT0qLworCWNvbnN0IHJlY190KglyZWMsCQkvKiE8IGluOiByZWNvcmQgKi8K Kwljb25zdCB1bGludCoJb2Zmc2V0cykJLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYykgKi8K K3sKKwl1bGludAlpOworCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgTlVMTCwgb2Zmc2V0 cykpOworCisJaWYgKCFyZWNfb2Zmc19hbnlfZXh0ZXJuKG9mZnNldHMpKSB7CisJCXJldHVybihO VUxMKTsKKwl9CisKKwlmb3IgKGkgPSAwOyBpIDwgcmVjX29mZnNfbl9maWVsZHMob2Zmc2V0cyk7 IGkrKykgeworCQlpZiAocmVjX29mZnNfbnRoX2V4dGVybihvZmZzZXRzLCBpKSkgeworCQkJdWxp bnQJCWxlbjsKKwkJCWNvbnN0IGJ5dGUqCWZpZWxkCisJCQkJPSByZWNfZ2V0X250aF9maWVsZChy ZWMsIG9mZnNldHMsIGksICZsZW4pOworCisJCQl1dF9hKGxlbiA+PSBCVFJfRVhURVJOX0ZJRUxE X1JFRl9TSVpFKTsKKwkJCWlmICghbWVtY21wKGZpZWxkICsgbGVuCisJCQkJICAgIC0gQlRSX0VY VEVSTl9GSUVMRF9SRUZfU0laRSwKKwkJCQkgICAgZmllbGRfcmVmX3plcm8sCisJCQkJICAgIEJU Ul9FWFRFUk5fRklFTERfUkVGX1NJWkUpKSB7CisJCQkJcmV0dXJuKGZpZWxkKTsKKwkJCX0KKwkJ fQorCX0KKworCXJldHVybihOVUxMKTsKK30KKyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZf QkxPQl9MSUdIVF9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyBub256ZXJvIGlmIHRoZSBleHRlcm4g Yml0IGlzIHNldCBpbiBudGggZmllbGQgb2YgcmVjLgogQHJldHVybglub256ZXJvIGlmIGV4dGVy bmFsbHkgc3RvcmVkICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cv cm93MHJvdy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJcmV2aWQ6YWxl eGFuZGVyLm5vemRyaW5Ab3JhY2xlLmNvbS0yMDExMDYwOTA5MDMxOC0wNmxydXBrM2Y4d256OXBz CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDptYXJrby5tYWtlbGFA b3JhY2xlLmNvbS0yMDExMDYwOTExMDAzOC1jdnd4ZW8wNXEweDRuc2RrCkBAIC0xLDYgKzEsNiBA QAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNvcHlyaWdodCAoYykgMTk5NiwgMjAxMCwgSW5u b2Jhc2UgT3kuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTYsIDIwMTEs IE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRo aXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQv b3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtMjAwLDYgKzIwMCwx MCBAQCByb3dfYnVpbGQoCiAJCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9m ZnNldHMpKTsKIAl9CiAKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JM T0JfTElHSFRfREVCVUcKKwl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZz ZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8K KwogCWlmICh0eXBlICE9IFJPV19DT1BZX1BPSU5URVJTKSB7CiAJCS8qIFRha2UgYSBjb3B5IG9m IHJlYyB0byBoZWFwICovCiAJCWJ1ZiA9IG1lbV9oZWFwX2FsbG9jKGhlYXAsIHJlY19vZmZzX3Np emUob2Zmc2V0cykpOwpAQCAtMzgzLDYgKzM4NywxMCBAQCByb3dfcmVjX3RvX2luZGV4X2VudHJ5 KAogCQlyZWMgPSByZWNfY29weShidWYsIHJlYywgb2Zmc2V0cyk7CiAJCS8qIEF2b2lkIGEgZGVi dWcgYXNzZXJ0aW9uIGluIHJlY19vZmZzX3ZhbGlkYXRlKCkuICovCiAJCXJlY19vZmZzX21ha2Vf dmFsaWQocmVjLCBpbmRleCwgb2Zmc2V0cyk7CisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRl ZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJfSBlbHNlIHsKKwkJdXRfYSghcmVjX29mZnNf YW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOworI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwg VU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCiAJfQogCiAJZW50cnkgPSByb3dfcmVjX3RvX2luZGV4 X2VudHJ5X2xvdyhyZWMsIGluZGV4LCBvZmZzZXRzLCBuX2V4dCwgaGVhcCk7Cgo9PT0gbW9kaWZp ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYycKLS0tIGEvc3RvcmFnZS9p bm5vYmFzZS9yb3cvcm93MHZlcnMuYwlyZXZpZDphbGV4YW5kZXIubm96ZHJpbkBvcmFjbGUuY29t LTIwMTEwNjA5MDkwMzE4LTA2bHJ1cGszZjh3bno5cHMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9y b3cvcm93MHZlcnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYwOTExMDAz OC1jdnd4ZW8wNXEweDRuc2RrCkBAIC01NTcsNiArNTU3LDExIEBAIHJvd192ZXJzX2J1aWxkX2Zv cl9jb25zaXN0ZW50X3JlYWQoCiAJCQkJLyogVGhlIHZpZXcgYWxyZWFkeSBzZWVzIHRoaXMgdmVy c2lvbjogd2UgY2FuCiAJCQkJY29weSBpdCB0byBpbl9oZWFwIGFuZCByZXR1cm4gKi8KIAorI2lm IGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworCQkJ CXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybigKKwkJCQkJICAgICB2ZXJzaW9uLCAqb2Zm c2V0cykpOworI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICov CisKIAkJCQlidWYgPSBtZW1faGVhcF9hbGxvYyhpbl9oZWFwLAogCQkJCQkJICAgICByZWNfb2Zm c19zaXplKCpvZmZzZXRzKSk7CiAJCQkJKm9sZF92ZXJzID0gcmVjX2NvcHkoYnVmLCB2ZXJzaW9u LCAqb2Zmc2V0cyk7CkBAIC01OTAsNiArNTk1LDEwIEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25z aXN0ZW50X3JlYWQoCiAJCSpvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHByZXZfdmVyc2lvbiwg aW5kZXgsICpvZmZzZXRzLAogCQkJCQkgICBVTElOVF9VTkRFRklORUQsIG9mZnNldF9oZWFwKTsK IAorI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJV RworCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocHJldl92ZXJzaW9uLCAqb2Zmc2V0 cykpOworI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisK IAkJdHJ4X2lkID0gcm93X2dldF9yZWNfdHJ4X2lkKHByZXZfdmVyc2lvbiwgaW5kZXgsICpvZmZz ZXRzKTsKIAogCQlpZiAocmVhZF92aWV3X3NlZXNfdHJ4X2lkKHZpZXcsIHRyeF9pZCkpIHsKQEAg LTY4NCw2ICs2OTMsMTAgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFk KAogCQkJLyogV2UgZm91bmQgYSB2ZXJzaW9uIHRoYXQgYmVsb25ncyB0byBhCiAJCQljb21taXR0 ZWQgdHJhbnNhY3Rpb246IHJldHVybiBpdC4gKi8KIAorI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8 fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworCQkJdXRfYSghcmVjX29mZnNfYW55X251 bGxfZXh0ZXJuKHZlcnNpb24sICpvZmZzZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBV TklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwogCQkJaWYgKHJlYyA9PSB2ZXJzaW9uKSB7CiAJCQkJ Km9sZF92ZXJzID0gcmVjOwogCQkJCWVyciA9IERCX1NVQ0NFU1M7CkBAIC03NDEsNiArNzU0LDkg QEAgcm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAogCQl2ZXJzaW9uID0g cHJldl92ZXJzaW9uOwogCQkqb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyh2ZXJzaW9uLCBpbmRl eCwgKm9mZnNldHMsCiAJCQkJCSAgIFVMSU5UX1VOREVGSU5FRCwgb2Zmc2V0X2hlYXApOworI2lm IGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworCQl1 dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4odmVyc2lvbiwgKm9mZnNldHMpKTsKKyNlbmRp ZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLwogCX0vKiBmb3IgKDs7 KSAqLwogCiAJaWYgKGhlYXApIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl L3RyeC90cngwcmVjLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwlyZXZp ZDphbGV4YW5kZXIubm96ZHJpbkBvcmFjbGUuY29tLTIwMTEwNjA5MDkwMzE4LTA2bHJ1cGszZjh3 bno5cHMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJldmlkOm1hcmtvLm1h a2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTEwMDM4LWN2d3hlbzA1cTB4NG5zZGsKQEAgLTEsNiAr MSw2IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioKIAotQ29weXJpZ2h0IChjKSAxOTk2LCAyMDEw LCBJbm5vYmFzZSBPeS4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KK0NvcHlyaWdodCAoYykgMTk5Niwg MjAxMSwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4K IAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVi bGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlCkBAIC0xNTQ2LDYg KzE1NDYsMTAgQEAgdHJ4X3VuZG9fcHJldl92ZXJzaW9uX2J1aWxkKAogCXV0X2EodGFibGVfaWQg PT0gaW5kZXgtPnRhYmxlLT5pZCk7CiAJdXRfYShwdHIpOwogCisjIGlmIGRlZmluZWQgVU5JVl9E RUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworCXV0X2EoIXJlY19vZmZzX2Fu eV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsKKyMgZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBV TklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwogCWlmIChyb3dfdXBkX2NoYW5nZXNfZmllbGRfc2l6 ZV9vcl9leHRlcm5hbChpbmRleCwgb2Zmc2V0cywgdXBkYXRlKSkgewogCQl1bGludAluX2V4dDsK IAoK --===============1670373536== 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/mysql2a/mysql-trunk/ # testament_sha1: d0b2a480c0dab75a614c7b4d97fae870b9d73615 # timestamp: 2011-06-09 14:04:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: alexander.nozdrin@stripped\ # 06lrupk3f8wnz9ps # # Begin bundle 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 --===============1670373536==--