From: marko.makela
Date: June 12 2012 7:05pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3966 to 3968)
List-Archive: http://lists.mysql.com/commits/144218
Message-Id: <20120612190509.8847.70120.3968@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NjggTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xMgogICAgICByb3dfbG9nX3RhYmxlX2FwcGx5
X2NvbnZlcnRfbXJlYygpOiBUaGUgY2x1c3RlcmVkIGluZGV4IHRyZWUgb2YgdGhlCiAgICAgIHNv
dXJjZSB0YWJsZSBzaG91bGQgYWxyZWFkeSBiZSBYLWxhdGNoZWQgaW4gcm93X2xvZ190YWJsZV9h
cHBseSgpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9n
LmNjCiAzOTY3IE1hcmtvIE3DpGtlbMOkCTIwMTItMDYtMTIKICAgICAgaW5ub2Jhc2VfY3JlYXRl
X2luZGV4X2ZpZWxkX2RlZigpOiBSZW1vdmUgdW51c2VkIHBhcmFtZXRlciBoZWFwLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwog
Mzk2NiBNYXJrbyBNw6RrZWzDpAkyMDEyLTA2LTEyCiAgICAgIFdMIzYyNTUgUG9ydGFiaWxpdHkg
Zml4LiBVc2UgdXRfc25wcmludGYgaW5zdGVhZCBvZiBteV9zbnByaW50ZigpLAogICAgICBzbyB0
aGF0IFVJTlQ2NFBGIHdpbGwgd29yayBhcyBkZXNpcmVkIG9uIFdpbmRvd3MgcGxhdGZvcm1zLgoK
ICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRl
ci5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIw
YWx0ZXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNj
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjEyMDk0OTQ4LWh5cGZmM2RiMWZ6
OHJqOXYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTIxOTAxNDgtNnp3aTRyNWphZWhidzUw
bgpAQCAtMTIzMSw3ICsxMjMxLDcgQEAgbmFtZV9vazoKIAogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBDcmVh
dGUgaW5kZXggZmllbGQgZGVmaW5pdGlvbiBmb3Iga2V5IHBhcnQgKi8KLXN0YXRpYyBfX2F0dHJp
YnV0ZV9fKChub25udWxsKDIsMyw0KSkpCitzdGF0aWMgX19hdHRyaWJ1dGVfXygobm9ubnVsbCgy
LDMpKSkKIHZvaWQKIGlubm9iYXNlX2NyZWF0ZV9pbmRleF9maWVsZF9kZWYoCiAvKj09PT09PT09
PT09PT09PT09PT09PT09PT09PT0qLwpAQCAtMTI0MCw3ICsxMjQwLDYgQEAgaW5ub2Jhc2VfY3Jl
YXRlX2luZGV4X2ZpZWxkX2RlZigKIAkJCQkJCWlmIGEgbmV3IGNsdXN0ZXJlZCBpbmRleCBpcwog
CQkJCQkJbm90IGJlaW5nIGNyZWF0ZWQgKi8KIAljb25zdCBLRVlfUEFSVF9JTkZPKglrZXlfcGFy
dCwJLyohPCBpbjogTXlTUUwga2V5IGRlZmluaXRpb24gKi8KLQltZW1faGVhcF90KgkJaGVhcCwJ
CS8qITwgaW46IG1lbW9yeSBoZWFwICovCiAJbWVyZ2VfaW5kZXhfZmllbGRfdCoJaW5kZXhfZmll
bGQpCS8qITwgb3V0OiBpbmRleCBmaWVsZAogCQkJCQkJZGVmaW5pdGlvbiBmb3Iga2V5X3BhcnQg
Ki8KIHsKQEAgLTEzNDQsOCArMTM0Myw3IEBAIGlubm9iYXNlX2NyZWF0ZV9pbmRleF9kZWYoCiAK
IAlmb3IgKGkgPSAwOyBpIDwgbl9maWVsZHM7IGkrKykgewogCQlpbm5vYmFzZV9jcmVhdGVfaW5k
ZXhfZmllbGRfZGVmKAotCQkJYWx0ZXJlZF90YWJsZSwgJmtleS0+a2V5X3BhcnRbaV0sCi0JCQlo
ZWFwLCAmaW5kZXgtPmZpZWxkc1tpXSk7CisJCQlhbHRlcmVkX3RhYmxlLCAma2V5LT5rZXlfcGFy
dFtpXSwgJmluZGV4LT5maWVsZHNbaV0pOwogCX0KIAogCURCVUdfVk9JRF9SRVRVUk47Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYycKLS0tIGEvc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEyMDYxMjA5NDk0OC1oeXBmZjNkYjFmejhyajl2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBsb2cuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTIxOTAx
NDgtNnp3aTRyNWphZWhidzUwbgpAQCAtMTAzOSw2ICsxMDM5LDEyIEBAIHJvd19sb2dfdGFibGVf
YXBwbHlfY29udmVydF9tcmVjKAogewogCWR0dXBsZV90Kglyb3c7CiAKKyNpZmRlZiBVTklWX1NZ
TkNfREVCVUcKKwkvKiBUaGlzIHByZXZlbnRzIEJMT0JzIGZyb20gYmVpbmcgZnJlZWQsIGluIGNh
c2UgYW4gaW5zZXJ0CisJdHJhbnNhY3Rpb24gcm9sbGJhY2sgc3RhcnRzIGFmdGVyIHJvd19sb2df
dGFibGVfaXNfcm9sbGJhY2soKS4gKi8KKwl1dF9hZChyd19sb2NrX293bihkaWN0X2luZGV4X2dl
dF9sb2NrKGluZGV4KSwgUldfTE9DS19FWCkpOworI2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAq
LworCiAJaWYgKHJvd19sb2dfdGFibGVfaXNfcm9sbGJhY2soaW5kZXgsIHRyeF9pZCkpIHsKIAkJ
cm93ID0gTlVMTDsKIAkJZ290byBmdW5jX2V4aXQ7CkBAIC0xMDU4LDE1ICsxMDY0LDYgQEAgcm93
X2xvZ190YWJsZV9hcHBseV9jb252ZXJ0X21yZWMoCiAJCWRpY3RfdGFibGVfY29weV90eXBlcyhy
b3csIGxvZy0+dGFibGUpOwogCX0KIAotCWlmIChyZWNfb2Zmc19hbnlfZXh0ZXJuKG9mZnNldHMp
KSB7Ci0JCXJ3X2xvY2tfc19sb2NrKCZpbmRleC0+bG9jayk7Ci0JfQotCi0JaWYgKHJvd19sb2df
dGFibGVfaXNfcm9sbGJhY2soaW5kZXgsIHRyeF9pZCkpIHsKLQkJcm93ID0gTlVMTDsKLQkJZ290
byBza2lwX3JvdzsKLQl9Ci0KIAlmb3IgKHVsaW50IGkgPSAwOyBpIDwgcmVjX29mZnNfbl9maWVs
ZHMob2Zmc2V0cyk7IGkrKykgewogCQljb25zdCBkaWN0X2ZpZWxkX3QqCWluZF9maWVsZAogCQkJ
PSBkaWN0X2luZGV4X2dldF9udGhfZmllbGQoaW5kZXgsIGkpOwpAQCAtMTEzNywxMSArMTEzNCw2
IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfY29udmVydF9tcmVjKAogCQkJCQkJIGRmaWVsZF9nZXRf
dHlwZShkZmllbGQpKSk7CiAJfQogCi1za2lwX3JvdzoKLQlpZiAocmVjX29mZnNfYW55X2V4dGVy
bihvZmZzZXRzKSkgewotCQlyd19sb2NrX3NfdW5sb2NrKCZpbmRleC0+bG9jayk7Ci0JfQotCiBm
dW5jX2V4aXQ6CiAJKmVycm9yID0gREJfU1VDQ0VTUzsKIAlyZXR1cm4ocm93KTsKCk5vIGJ1bmRs
ZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku