From: marko.makela
Date: April 30 2012 1:41pm
Subject: bzr push into mysql-trunk branch (marko.makela:3756 to 3758)
List-Archive: http://lists.mysql.com/commits/143692
Message-Id: <201204301341.q3UDfGIS006816@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3NTggTWFya28gTcOka2Vsw6QJMjAxMi0wNC0zMAogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2VzIChmb3JtYXR0aW5nIGFuZCBkYXRhIHR5cGUgY2xlYW51cCkKCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9hcGkvYXBpMGFwaS5jYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L2RpY3QvZGljdDBsb2FkLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5v
ZGIuY2MKIDM3NTcgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0zMAogICAgICBCdWcjMTQwMTc3OTUg
RFJPUCwgQUREIElOREVYIE9OIFZBUkNIQVIgRkFJTFMKICAgICAgCiAgICAgIGlubm9iYXNlX2Zp
bmRfZXF1aXZfaW5kZXgoKTogU3VidHJhY3QgdGhlIGxlbmd0aF9ieXRlcwogICAgICBmcm9tIHRo
ZSBwYWNrX2xlbmd0aCgpIG9mIE1ZU1FMX1RZUEVfVkFSQ0hBUi4KCiAgICBtb2RpZmllZDoKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnMTM4Njc4NzEucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzEzODY3ODcxLnRlc3QKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKIDM3NTYgVG9yIERp
ZHJpa3NlbgkyMDEyLTA0LTMwCiAgICAgIEJ1ZyMxMzk4ODQxMyBDUkFTSC9BU1NFUlRJT04gQUZU
RVIgSU5WQUxJRCBNRU1PUlkgUkVBRCBJTiBNWV9VU0VDT05EU19UT19TVFIKICAgICAgCiAgICAg
IEl0ZW1fZnVuY19pZjo6Zml4X2xlbmd0aF9hbmRfZGVjKCkgZmFpbGVkIHRvIGNhbGN1bGF0ZSBu
dW1iZXIgb2YgZGVjaW1hbHMKICAgICAgZm9yIHRpbWUgYXJndW1lbnRzLgogICAgIEAgc3FsLWNv
bW1vbi9teV90aW1lLmMKICAgICAgICBUaGUgJyonIGZpZWxkIHdpZHRoIHNwZWNpZmllciB0byBw
cmludGYgdGFrZXMgYW4gaW50IGFyZ3VtZW50LgogICAgIEAgc3FsL2l0ZW1fY21wZnVuYy5jYwog
ICAgICAgIEluIEl0ZW1fZnVuY19pZjo6Zml4X2xlbmd0aF9hbmRfZGVjKCkgY2FsbCBjb3VudF9z
dHJpbmdfcmVzdWx0X2xlbmd0aCgpCiAgICAgICAgdG8gY2FsY3VsYXRlIGxlbmd0aCBhbmQgbnVt
YmVyIG9mIGRlY2ltYWxzLgogICAgIEAgc3FsL3NxbF90ZXN0LmNjCiAgICAgICAgUmUtYmFsYW5j
ZSBnY292IGNvbW1lbnQuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9mdW5jX3Rp
bWUucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9mdW5jX3RpbWUudGVzdAogICAgICBzcWwtY29t
bW9uL215X3RpbWUuYwogICAgICBzcWwvaXRlbV9jbXBmdW5jLmNjCiAgICAgIHNxbC9zcWxfdGVz
dC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJf
YnVnMTM4Njc4NzEucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9k
Yl9idWcxMzg2Nzg3MS5yZXN1bHQJcmV2aWQ6dG9yLmRpZHJpa3NlbkBvcmFjbGUuY29tLTIwMTIw
NDMwMTI0MjU2LXdvendwOXA5dDk5Z2dlZ2YKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
ci9pbm5vZGJfYnVnMTM4Njc4NzEucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTIwNDMwMTMzOTUyLXptMTR5dDF2ZjZuZnB0eHoKQEAgLTIwLDkgKzIwLDYgQEAgSU5TRVJU
IElOVE8gaWJ0ZXN0MTFjIFZBTFVFUyAoMSwgNSwgJ2toRAogU0VUIERFQlVHX1NZTkM9J2ZvcmVp
Z25fY29uc3RyYWludF9jaGVja19mb3JfdXBkYXRlIFdBSVRfRk9SIGRyb3BfZG9uZSc7CiBVUERB
VEUgaWJ0ZXN0MTFhIFNFVCBBPTI7CiBBTFRFUiBUQUJMRSBpYnRlc3QxMWMgQUREIElOREVYIGlk
eF8yKEIsIEMpLCBEUk9QIElOREVYIGlkeCwgQUxHT1JJVEhNPUlOUExBQ0U7Ci1FUlJPUiBIWTAw
MDogQ2Fubm90IGRyb3AgaW5kZXggJ2lkeCc6IG5lZWRlZCBpbiBhIGZvcmVpZ24ga2V5IGNvbnN0
cmFpbnQKLUNSRUFURSBJTkRFWCBpZHhfMiBPTiBpYnRlc3QxMWMoQiwgQyk7Ci1EUk9QIElOREVY
IGlkeCBPTiBpYnRlc3QxMWM7CiBTRVQgREVCVUdfU1lOQz0nbm93IFNJR05BTCBkcm9wX2RvbmUn
OwogU0VMRUNUICogRlJPTSBpYnRlc3QxMWM7CiBBCUQJQglDCgo9PT0gbW9kaWZpZWQgZmlsZSAn
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnMTM4Njc4NzEudGVzdCcKLS0tIGEv
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnMTM4Njc4NzEudGVzdAlyZXZpZDp0
b3IuZGlkcmlrc2VuQG9yYWNsZS5jb20tMjAxMjA0MzAxMjQyNTYtd296d3A5cDl0OTlnZ2VnZgor
KysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWcxMzg2Nzg3MS50ZXN0CXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDMwMTMzOTUyLXptMTR5dDF2ZjZuZnB0
eHoKQEAgLTU4LDE0ICs1OCwxMSBAQCBTRVQgREVCVUdfU1lOQz0nZm9yZWlnbl9jb25zdHJhaW50
X2NoZWNrCiBVUERBVEUgaWJ0ZXN0MTFhIFNFVCBBPTI7CiAKICMgZHJvcCB0aGUgb3JpZ2luYWwg
RksgaW5kZXggImlkeCIgb24gdGFibGUgaWJ0ZXN0MTFhIHdoaWxlIGFib3ZlCi0jIGluc2VydCBi
bGNva2VkIGluIGRpY3RfZm9yZWlnbl9yZXBsYWNlX2luZGV4KCkKKyMgaW5zZXJ0IGJsb2NrZWQg
aW4gZGljdF9mb3JlaWduX3JlcGxhY2VfaW5kZXgoKQogY29ubmVjdGlvbiBkZWZhdWx0OwogCi0t
LWVycm9yIEVSX0RST1BfSU5ERVhfRksKIEFMVEVSIFRBQkxFIGlidGVzdDExYyBBREQgSU5ERVgg
aWR4XzIoQiwgQyksIERST1AgSU5ERVggaWR4LCBBTEdPUklUSE09SU5QTEFDRTsKIAotQ1JFQVRF
IElOREVYIGlkeF8yIE9OIGlidGVzdDExYyhCLCBDKTsKLURST1AgSU5ERVggaWR4IE9OIGlidGVz
dDExYzsKIFNFVCBERUJVR19TWU5DPSdub3cgU0lHTkFMIGRyb3BfZG9uZSc7CiAKIGNvbm5lY3Rp
b24gY29uMTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2FwaS9hcGkwYXBp
LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2FwaS9hcGkwYXBpLmNjCXJldmlkOnRvci5kaWRy
aWtzZW5Ab3JhY2xlLmNvbS0yMDEyMDQzMDEyNDI1Ni13b3p3cDlwOXQ5OWdnZWdmCisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvYXBpL2FwaTBhcGkuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMjA0MzAxMzM5NTItem0xNHl0MXZmNm5mcHR4egpAQCAtMTE0NCw3ICsxMTQ0LDcgQEAg
aWJfY3Vyc29yX29wZW5faW5kZXhfdXNpbmdfbmFtZSgKIHsKIAlkaWN0X3RhYmxlX3QqCXRhYmxl
OwogCWRpY3RfaW5kZXhfdCoJaW5kZXg7Ci0JaWJfaWRfdTY0X3QJaW5kZXhfaWQgPSAwOworCWlu
ZGV4X2lkX3QJaW5kZXhfaWQgPSAwOwogCWliX2Vycl90CWVyciA9IERCX1RBQkxFX05PVF9GT1VO
RDsKIAlpYl9jdXJzb3JfdCoJY3Vyc29yID0gKGliX2N1cnNvcl90KikgaWJfb3Blbl9jcnNyOwog
CkBAIC0yMDAwLDcgKzIwMDAsNyBAQCBpYl9jdXJzb3JfZGVsZXRlX3JvdygKIAogCQlpZiAocmVj
ICYmICFyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhyZWMsIHBhZ2VfZm9ybWF0KSkgewogCQkJZXJyID0g
aWJfZGVsZXRlX3JvdyhjdXJzb3IsIHBjdXIsIHJlYyk7Ci0JCX0gZWxzZXsKKwkJfSBlbHNlIHsK
IAkJCWVyciA9IERCX1JFQ09SRF9OT1RfRk9VTkQ7CiAJCX0KIAl9IGVsc2UgewoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuY2MnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuY2MJcmV2aWQ6dG9yLmRpZHJpa3NlbkBvcmFjbGUu
Y29tLTIwMTIwNDMwMTI0MjU2LXdvendwOXA5dDk5Z2dlZ2YKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9kaWN0L2RpY3QwbG9hZC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQz
MDEzMzk1Mi16bTE0eXQxdmY2bmZwdHh6CkBAIC0yMDI5LDYgKzIwMjksNyBAQCBkaWN0X2xvYWRf
dGFibGVfb25faWQoCiAJc3lzX3RhYmxlX2lkcyA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgo
CiAJCWRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KHN5c190YWJsZXMpKTsKIAl1dF9hZCghZGlj
dF90YWJsZV9pc19jb21wKHN5c190YWJsZXMpKTsKKwl1dF9hZCghZGljdF9pbmRleF9pc19jbHVz
dChzeXNfdGFibGVfaWRzKSk7CiAJaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgyNTYpOwogCiAJdHVw
bGUgID0gZHR1cGxlX2NyZWF0ZShoZWFwLCAxKTsKQEAgLTI0MjQsNiArMjQyNSw3IEBAIGRpY3Rf
bG9hZF9mb3JlaWducygKIAogCXNlY19pbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgo
CiAJCWRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KHN5c19mb3JlaWduKSk7CisJdXRfYWQoIWRp
Y3RfaW5kZXhfaXNfY2x1c3Qoc2VjX2luZGV4KSk7CiBzdGFydF9sb2FkOgogCiAJdHVwbGUgPSBk
dHVwbGVfY3JlYXRlX2Zyb21fbWVtKHR1cGxlX2J1Ziwgc2l6ZW9mKHR1cGxlX2J1ZiksIDEpOwoK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2Mn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6dG9yLmRp
ZHJpa3NlbkBvcmFjbGUuY29tLTIwMTIwNDMwMTI0MjU2LXdvendwOXA5dDk5Z2dlZ2YKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEyMDQzMDEzMzk1Mi16bTE0eXQxdmY2bmZwdHh6CkBAIC01ODgzLDYgKzU4
ODMsMTAgQEAgaGFfaW5ub2Jhc2U6OmJ1aWxkX3RlbXBsYXRlKAogCiAJcHJlYnVpbHQtPm5lZWRf
dG9fYWNjZXNzX2NsdXN0ZXJlZCA9IChpbmRleCA9PSBjbHVzdF9pbmRleCk7CiAKKwkvKiBFaXRo
ZXIgcHJlYnVpbHQtPmluZGV4IHNob3VsZCBiZSBhIHNlY29uZGFyeSBpbmRleCwgb3IgaXQKKwlz
aG91bGQgYmUgdGhlIGNsdXN0ZXJlZCBpbmRleC4gKi8KKwl1dF9hZChkaWN0X2luZGV4X2lzX2Ns
dXN0KGluZGV4KSA9PSAoaW5kZXggPT0gY2x1c3RfaW5kZXgpKTsKKwogCS8qIEJlbG93IHdlIGNo
ZWNrIGNvbHVtbiBieSBjb2x1bW4gaWYgd2UgbmVlZCB0byBhY2Nlc3MKIAl0aGUgY2x1c3RlcmVk
IGluZGV4LiAqLwogCkBAIC05ODE1LDEwICs5ODE5LDEwIEBAIGhhX3Jvd3MKIGhhX2lubm9iYXNl
Ojplc3RpbWF0ZV9yb3dzX3VwcGVyX2JvdW5kKCkKIC8qPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ki8KIHsKLQlkaWN0X2luZGV4X3QqCWluZGV4OwotCXVsb25nbG9uZwllc3Rp
bWF0ZTsKLQl1bG9uZ2xvbmcJbG9jYWxfZGF0YV9maWxlX2xlbmd0aDsKLQl1bGludAkJc3RhdF9u
X2xlYWZfcGFnZXM7CisJY29uc3QgZGljdF9pbmRleF90KglpbmRleDsKKwl1bG9uZ2xvbmcJCWVz
dGltYXRlOworCXVsb25nbG9uZwkJbG9jYWxfZGF0YV9maWxlX2xlbmd0aDsKKwl1bGludAkJCXN0
YXRfbl9sZWFmX3BhZ2VzOwogCiAJREJVR19FTlRFUigiZXN0aW1hdGVfcm93c191cHBlcl9ib3Vu
ZCIpOwogCkBAIC05ODI4LDggKzk4MzIsNyBAQCBoYV9pbm5vYmFzZTo6ZXN0aW1hdGVfcm93c191
cHBlcl9ib3VuZCgpCiAKIAl1cGRhdGVfdGhkKGhhX3RoZCgpKTsKIAotCXByZWJ1aWx0LT50cngt
Pm9wX2luZm8gPSAoY2hhciopCi0JCQkJICJjYWxjdWxhdGluZyB1cHBlciBib3VuZCBmb3IgdGFi
bGUgcm93cyI7CisJcHJlYnVpbHQtPnRyeC0+b3BfaW5mbyA9ICJjYWxjdWxhdGluZyB1cHBlciBi
b3VuZCBmb3IgdGFibGUgcm93cyI7CiAKIAkvKiBJbiBjYXNlIE15U1FMIGNhbGxzIHRoaXMgaW4g
dGhlIG1pZGRsZSBvZiBhIFNFTEVDVCBxdWVyeSwgcmVsZWFzZQogCXBvc3NpYmxlIGFkYXB0aXZl
IGhhc2ggbGF0Y2ggdG8gYXZvaWQgZGVhZGxvY2tzIG9mIHRocmVhZHMgKi8KQEAgLTk4NDUsMTYg
Kzk4NDgsMTUgQEAgaGFfaW5ub2Jhc2U6OmVzdGltYXRlX3Jvd3NfdXBwZXJfYm91bmQoKQogCWxv
Y2FsX2RhdGFfZmlsZV9sZW5ndGggPQogCQkoKHVsb25nbG9uZykgc3RhdF9uX2xlYWZfcGFnZXMp
ICogVU5JVl9QQUdFX1NJWkU7CiAKLQogCS8qIENhbGN1bGF0ZSBhIG1pbmltdW0gbGVuZ3RoIGZv
ciBhIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQgYW5kIGZyb20KIAl0aGF0IGFuIHVwcGVyIGJvdW5k
IGZvciB0aGUgbnVtYmVyIG9mIHJvd3MuIFNpbmNlIHdlIG9ubHkgY2FsY3VsYXRlCiAJbmV3IHN0
YXRpc3RpY3MgaW4gcm93MG15c3FsLmNjIHdoZW4gYSB0YWJsZSBoYXMgZ3Jvd24gYnkgYSB0aHJl
c2hvbGQKIAlmYWN0b3IsIHdlIG11c3QgYWRkIGEgc2FmZXR5IGZhY3RvciAyIGluIGZyb250IG9m
IHRoZSBmb3JtdWxhIGJlbG93LiAqLwogCi0JZXN0aW1hdGUgPSAyICogbG9jYWxfZGF0YV9maWxl
X2xlbmd0aCAvCi0JCQkJCSBkaWN0X2luZGV4X2NhbGNfbWluX3JlY19sZW4oaW5kZXgpOworCWVz
dGltYXRlID0gMiAqIGxvY2FsX2RhdGFfZmlsZV9sZW5ndGgKKwkJLyBkaWN0X2luZGV4X2NhbGNf
bWluX3JlY19sZW4oaW5kZXgpOwogCi0JcHJlYnVpbHQtPnRyeC0+b3BfaW5mbyA9IChjaGFyKiki
IjsKKwlwcmVidWlsdC0+dHJ4LT5vcF9pbmZvID0gIiI7CiAKIAlEQlVHX1JFVFVSTigoaGFfcm93
cykgZXN0aW1hdGUpOwogfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFu
ZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFu
ZGxlcjBhbHRlci5jYwlyZXZpZDp0b3IuZGlkcmlrc2VuQG9yYWNsZS5jb20tMjAxMjA0MzAxMjQy
NTYtd296d3A5cDl0OTlnZ2VnZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxl
cjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQzMDEzMzk1Mi16
bTE0eXQxdmY2bmZwdHh6CkBAIC0xMjE1LDcgKzEyMTUsMTggQEAgbm9fbWF0Y2g6CiAKIAkJZm9y
ICh1aW50IGogPSAwOyBqIDwgbl9jb2xzOyBqKyspIHsKIAkJCWNvbnN0IEtFWV9QQVJUX0lORk8m
CWtleV9wYXJ0ID0ga2V5LT5rZXlfcGFydFtqXTsKLQkJCWlmIChrZXlfcGFydC5sZW5ndGggPCBr
ZXlfcGFydC5maWVsZC0+cGFja19sZW5ndGgoKSkgeworCQkJdWludDMyCQkJY29sX2xlbgorCQkJ
CT0ga2V5X3BhcnQuZmllbGQtPnBhY2tfbGVuZ3RoKCk7CisKKwkJCS8qIFRoZSBNeVNRTCBwYWNr
IGxlbmd0aCBjb250YWlucyAxIG9yIDIgYnl0ZXMKKwkJCWxlbmd0aCBmaWVsZCBmb3IgYSB0cnVl
IFZBUkNIQVIuICovCisKKwkJCWlmIChrZXlfcGFydC5maWVsZC0+dHlwZSgpID09IE1ZU1FMX1RZ
UEVfVkFSQ0hBUikgeworCQkJCWNvbF9sZW4gLT0gc3RhdGljX2Nhc3Q8Y29uc3QgRmllbGRfdmFy
c3RyaW5nKj4oCisJCQkJCWtleV9wYXJ0LmZpZWxkKS0+bGVuZ3RoX2J5dGVzOworCQkJfQorCisJ
CQlpZiAoa2V5X3BhcnQubGVuZ3RoIDwgY29sX2xlbikgewogCiAJCQkJLyogQ29sdW1uIHByZWZp
eCBpbmRleGVzIGNhbm5vdCBiZQogCQkJCXVzZWQgZm9yIEZPUkVJR04gS0VZIGNvbnN0cmFpbnRz
LiAqLwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=