From: marko.makela
Date: November 7 2011 12:10pm
Subject: bzr push into mysql-5.1 branch (marko.makela:3636 to 3637) Bug#13345378
List-Archive: http://lists.mysql.com/commits/141763
X-Bug: 13345378
Message-Id: <201111071211.pA7CB58m025873@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MzcgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wNwogICAgICBBZGQgZGVidWcgYXNzZXJ0aW9u
cyB0byBjYXRjaCBCdWcjMTMzNDUzNzggZWFybGllci4KICAgICAgCiAgICAgIEluIGFsbCBjYWxs
ZXJzIG9mIHJvd19zZWxfY29udmVydF9teXNxbF9rZXlfdG9faW5ub2Jhc2UoKSwgYXNzZXJ0CiAg
ICAgIHRoYXQgdGhlIGNvbnZlcnRlZCBrZXkgaXMgZW1wdHkgb3Igbm9uZW1wdHkgd2hlbiBpdCBz
aG91bGQgYmUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFfaW5ub2Ri
LmNjCiAzNjM2IFRvciBEaWRyaWtzZW4JMjAxMS0xMS0wMQogICAgICBCdWcjMTI0MDYwNTUgcG9z
dC1wdXNoIGZpeDogdW51c2VkIHZhcmlhYmxlICdudW1fY2hhcnMnIGluIG9wdGltaXplZCBidWls
ZC4KICAgICAgQWxzbyBmaXhlZCBwb3NzaWJseSB1bmluaXRpYWxpemVkIHVzZSBvZiBuZWVkX2Nv
cHlfdGFibGVfcmVzLgoKICAgIG1vZGlmaWVkOgogICAgICBjbGllbnQvc3FsX3N0cmluZy5jYwog
ICAgICBzcWwvc3FsX3RhYmxlLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFf
aW5ub2RiLmNjCXJldmlkOnRvci5kaWRyaWtzZW5Ab3JhY2xlLmNvbS0yMDExMTEwMTA2NTA1NC04
YjFzaWdrYXpyYjYwcGFmCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMDcxMTM3MTktZ2VhZTllYTJ0
cHkxbGk1MgpAQCAtNDcxMyw2ICs0NzEzLDcgQEAgaGFfaW5ub2Jhc2U6OmluZGV4X3JlYWQoCiAJ
CQkJCWluZGV4LAogCQkJCQkoYnl0ZSopIGtleV9wdHIsCiAJCQkJCSh1bGludCkga2V5X2xlbiwg
cHJlYnVpbHQtPnRyeCk7CisJCURCVUdfQVNTRVJUKHByZWJ1aWx0LT5zZWFyY2hfdHVwbGUtPm5f
ZmllbGRzID4gMCk7CiAJfSBlbHNlIHsKIAkJLyogV2UgcG9zaXRpb24gdGhlIGN1cnNvciB0byB0
aGUgbGFzdCBvciB0aGUgZmlyc3QgZW50cnkKIAkJaW4gdGhlIGluZGV4ICovCkBAIC02MTY4LDYg
KzYxNjksNyBAQCBoYV9pbm5vYmFzZTo6cmVjb3Jkc19pbl9yYW5nZSgKIAl2b2lkKgkJaGVhcDI7
CiAKIAlEQlVHX0VOVEVSKCJyZWNvcmRzX2luX3JhbmdlIik7CisJREJVR19BU1NFUlQobWluX2tl
eSB8fCBtYXhfa2V5KTsKIAogCXV0X2EocHJlYnVpbHQtPnRyeCA9PSB0aGRfdG9fdHJ4KGhhX3Ro
ZCgpKSk7CiAKQEAgLTYxOTgsNiArNjIwMCw5IEBAIGhhX2lubm9iYXNlOjpyZWNvcmRzX2luX3Jh
bmdlKAogCQkJCQkgKGNvbnN0IHVjaGFyKikgMCksCiAJCQkJKHVsaW50KSAobWluX2tleSA/IG1p
bl9rZXktPmxlbmd0aCA6IDApLAogCQkJCXByZWJ1aWx0LT50cngpOworCURCVUdfQVNTRVJUKG1p
bl9rZXkKKwkJICAgID8gcmFuZ2Vfc3RhcnQtPm5fZmllbGRzID4gMAorCQkgICAgOiByYW5nZV9z
dGFydC0+bl9maWVsZHMgPT0gMCk7CiAKIAlyb3dfc2VsX2NvbnZlcnRfbXlzcWxfa2V5X3RvX2lu
bm9iYXNlKAogCQkJCXJhbmdlX2VuZCwgKGJ5dGUqKSBrZXlfdmFsX2J1ZmYyLApAQCAtNjIwNiw2
ICs2MjExLDkgQEAgaGFfaW5ub2Jhc2U6OnJlY29yZHNfaW5fcmFuZ2UoCiAJCQkJCSAoY29uc3Qg
dWNoYXIqKSAwKSwKIAkJCQkodWxpbnQpIChtYXhfa2V5ID8gbWF4X2tleS0+bGVuZ3RoIDogMCks
CiAJCQkJcHJlYnVpbHQtPnRyeCk7CisJREJVR19BU1NFUlQobWF4X2tleQorCQkgICAgPyByYW5n
ZV9lbmQtPm5fZmllbGRzID4gMAorCQkgICAgOiByYW5nZV9lbmQtPm5fZmllbGRzID09IDApOwog
CiAJbW9kZTEgPSBjb252ZXJ0X3NlYXJjaF9tb2RlX3RvX2lubm9iYXNlKG1pbl9rZXkgPyBtaW5f
a2V5LT5mbGFnIDoKIAkJCQkJCUhBX1JFQURfS0VZX0VYQUNUKTsKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDp0b3IuZGlkcmlrc2Vu
QG9yYWNsZS5jb20tMjAxMTExMDEwNjUwNTQtOGIxc2lna2F6cmI2MHBhZgorKysgYi9zdG9yYWdl
L2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTExMDcxMTM3MTktZ2VhZTllYTJ0cHkxbGk1MgpAQCAtNTQyOCw2ICs1NDI4
LDcgQEAgaGFfaW5ub2Jhc2U6OmluZGV4X3JlYWQoCiAJCQkoYnl0ZSopIGtleV9wdHIsCiAJCQko
dWxpbnQpIGtleV9sZW4sCiAJCQlwcmVidWlsdC0+dHJ4KTsKKwkJREJVR19BU1NFUlQocHJlYnVp
bHQtPnNlYXJjaF90dXBsZS0+bl9maWVsZHMgPiAwKTsKIAl9IGVsc2UgewogCQkvKiBXZSBwb3Np
dGlvbiB0aGUgY3Vyc29yIHRvIHRoZSBsYXN0IG9yIHRoZSBmaXJzdCBlbnRyeQogCQlpbiB0aGUg
aW5kZXggKi8KQEAgLTcyMjYsNiArNzIyNyw3IEBAIGhhX2lubm9iYXNlOjpyZWNvcmRzX2luX3Jh
bmdlKAogCW1lbV9oZWFwX3QqCWhlYXA7CiAKIAlEQlVHX0VOVEVSKCJyZWNvcmRzX2luX3Jhbmdl
Iik7CisJREJVR19BU1NFUlQobWluX2tleSB8fCBtYXhfa2V5KTsKIAogCXV0X2EocHJlYnVpbHQt
PnRyeCA9PSB0aGRfdG9fdHJ4KGhhX3RoZCgpKSk7CiAKQEAgLTcyNzEsNiArNzI3Myw5IEBAIGhh
X2lubm9iYXNlOjpyZWNvcmRzX2luX3JhbmdlKAogCQkJCQkgKGNvbnN0IHVjaGFyKikgMCksCiAJ
CQkJKHVsaW50KSAobWluX2tleSA/IG1pbl9rZXktPmxlbmd0aCA6IDApLAogCQkJCXByZWJ1aWx0
LT50cngpOworCURCVUdfQVNTRVJUKG1pbl9rZXkKKwkJICAgID8gcmFuZ2Vfc3RhcnQtPm5fZmll
bGRzID4gMAorCQkgICAgOiByYW5nZV9zdGFydC0+bl9maWVsZHMgPT0gMCk7CiAKIAlyb3dfc2Vs
X2NvbnZlcnRfbXlzcWxfa2V5X3RvX2lubm9iYXNlKAogCQkJCXJhbmdlX2VuZCwgKGJ5dGUqKSBr
ZXlfdmFsX2J1ZmYyLApAQCAtNzI3OSw2ICs3Mjg0LDkgQEAgaGFfaW5ub2Jhc2U6OnJlY29yZHNf
aW5fcmFuZ2UoCiAJCQkJCSAoY29uc3QgdWNoYXIqKSAwKSwKIAkJCQkodWxpbnQpIChtYXhfa2V5
ID8gbWF4X2tleS0+bGVuZ3RoIDogMCksCiAJCQkJcHJlYnVpbHQtPnRyeCk7CisJREJVR19BU1NF
UlQobWF4X2tleQorCQkgICAgPyByYW5nZV9lbmQtPm5fZmllbGRzID4gMAorCQkgICAgOiByYW5n
ZV9lbmQtPm5fZmllbGRzID09IDApOwogCiAJbW9kZTEgPSBjb252ZXJ0X3NlYXJjaF9tb2RlX3Rv
X2lubm9iYXNlKG1pbl9rZXkgPyBtaW5fa2V5LT5mbGFnIDoKIAkJCQkJCUhBX1JFQURfS0VZX0VY
QUNUKTsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku