From: marko.makela
Date: November 7 2011 12:10pm
Subject: bzr push into mysql-5.5 branch (marko.makela:3595 to 3596)
List-Archive: http://lists.mysql.com/commits/141762
Message-Id: <201111071210.pA7CAZdg023684@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1OTYgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aGFuZGxlci9oYV9pbm5vZGIuY2MKIDM1OTUgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wNwogICAg
ICBCdWcjMTMzNDAwNDcgTEFUQ0hJTkcgT1JERVIgVklPTEFUSU9OIElOIElCVUZfU0VUX0VOVFJZ
X0NPVU5URVIoKQogICAgICAKICAgICAgaWJ1Zl9pbnNlcnRfbG93KCksIHRoZSBvbmx5IGNhbGxl
ciBvZiBpYnVmX3NldF9lbnRyeV9jb3VudGVyKCksIHdpbGwKICAgICAgaGF2ZSBsYXRjaGVkIGFu
IGluc2VydCBidWZmZXIgYml0bWFwIHBhZ2UgaW4gYml0bWFwX210ciBiZWZvcmUKICAgICAgaW52
b2tpbmcgaWJ1Zl9zZXRfZW50cnlfY291bnRlcigpLiBUaGUgbGF0Y2hpbmcgb3JkZXIgZm9yYmlk
cyBhbnkKICAgICAgZnVydGhlciBwYWdlcyB0byBiZSBsYXRjaGVkLgogICAgICAKICAgICAgaWJ1
Zl9zZXRfZW50cnlfY291bnRlcigpOiBSZW5hbWVkIHRvIGlidWZfZ2V0X2VudHJ5X2NvdW50ZXIo
KSwKICAgICAgc2ltcGxpZmllZCB0aGUgY29kZSBhbmQgYWRkZWQgY29tbWVudHMuCiAgICAgIAog
ICAgICBBZGRlZCB0aGUgZm9sbG93aW5nIHN5bWJvbHMgZm9yIHByZWRlZmluZWQgZmllbGQgbnVt
YmVycyBpbiBjaGFuZ2UKICAgICAgYnVmZmVyIHJlY29yZHM6CiAgICAgIAogICAgICAjZGVmaW5l
IElCVUZfUkVDX0ZJRUxEX1NQQUNFCTAJLyohPCBpbiB0aGUgcHJlLTQuMSBmb3JtYXQsCiAgICAg
IAkJCQkJdGhlIHBhZ2UgbnVtYmVyLiBsYXRlciwgdGhlIHNwYWNlX2lkICovCiAgICAgICNkZWZp
bmUgSUJVRl9SRUNfRklFTERfTUFSS0VSCTEJLyohPCBzdGFydGluZyB3aXRoIDQuMSwgYSBtYXJr
ZXIKICAgICAgCQkJCQljb25zaXN0aW5nIG9mIDEgYnl0ZSB0aGF0IGlzIDAgKi8KICAgICAgI2Rl
ZmluZSBJQlVGX1JFQ19GSUVMRF9QQUdFCTIJLyohPCBzdGFydGluZyB3aXRoIDQuMSwgdGhlCiAg
ICAgIAkJCQkJcGFnZSBudW1iZXIgKi8KICAgICAgI2RlZmluZSBJQlVGX1JFQ19GSUVMRF9NRVRB
REFUQQkzCS8qIHRoZSBtZXRhZGF0YSBmaWVsZCAqLwogICAgICAjZGVmaW5lIElCVUZfUkVDX0ZJ
RUxEX1VTRVIJNAkvKiBmaXJzdCB1c2VyIGZpZWxkICovCiAgICAgIAogICAgICByYjo4MDIgYXBw
cm92ZWQgYnkgU3VubnkgQmFpbnMKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pYnVmL2lidWYwaWJ1Zi5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hh
bmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5u
b2RiLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA3MDcyODAyLWRnd2Fn
ZWpscHViMHJqa2QKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEwNzExNTExMS0zODNhbWRyMnhzOXg0
a2huCkBAIC01NzAwLDYgKzU3MDAsNyBAQCBoYV9pbm5vYmFzZTo6aW5kZXhfcmVhZCgKIAkJCShi
eXRlKikga2V5X3B0ciwKIAkJCSh1bGludCkga2V5X2xlbiwKIAkJCXByZWJ1aWx0LT50cngpOwor
CQlEQlVHX0FTU0VSVChwcmVidWlsdC0+c2VhcmNoX3R1cGxlLT5uX2ZpZWxkcyA+IDApOwogCX0g
ZWxzZSB7CiAJCS8qIFdlIHBvc2l0aW9uIHRoZSBjdXJzb3IgdG8gdGhlIGxhc3Qgb3IgdGhlIGZp
cnN0IGVudHJ5CiAJCWluIHRoZSBpbmRleCAqLwpAQCAtNzUyNyw2ICs3NTI4LDcgQEAgaGFfaW5u
b2Jhc2U6OnJlY29yZHNfaW5fcmFuZ2UoCiAJbWVtX2hlYXBfdCoJaGVhcDsKIAogCURCVUdfRU5U
RVIoInJlY29yZHNfaW5fcmFuZ2UiKTsKKwlEQlVHX0FTU0VSVChtaW5fa2V5IHx8IG1heF9rZXkp
OwogCiAJdXRfYShwcmVidWlsdC0+dHJ4ID09IHRoZF90b190cngoaGFfdGhkKCkpKTsKIApAQCAt
NzU3Niw2ICs3NTc4LDkgQEAgaGFfaW5ub2Jhc2U6OnJlY29yZHNfaW5fcmFuZ2UoCiAJCQkJCSAo
Y29uc3QgdWNoYXIqKSAwKSwKIAkJCQkodWxpbnQpIChtaW5fa2V5ID8gbWluX2tleS0+bGVuZ3Ro
IDogMCksCiAJCQkJcHJlYnVpbHQtPnRyeCk7CisJREJVR19BU1NFUlQobWluX2tleQorCQkgICAg
PyByYW5nZV9zdGFydC0+bl9maWVsZHMgPiAwCisJCSAgICA6IHJhbmdlX3N0YXJ0LT5uX2ZpZWxk
cyA9PSAwKTsKIAogCXJvd19zZWxfY29udmVydF9teXNxbF9rZXlfdG9faW5ub2Jhc2UoCiAJCQkJ
cmFuZ2VfZW5kLCAoYnl0ZSopIGtleV92YWxfYnVmZjIsCkBAIC03NTg0LDYgKzc1ODksOSBAQCBo
YV9pbm5vYmFzZTo6cmVjb3Jkc19pbl9yYW5nZSgKIAkJCQkJIChjb25zdCB1Y2hhciopIDApLAog
CQkJCSh1bGludCkgKG1heF9rZXkgPyBtYXhfa2V5LT5sZW5ndGggOiAwKSwKIAkJCQlwcmVidWls
dC0+dHJ4KTsKKwlEQlVHX0FTU0VSVChtYXhfa2V5CisJCSAgICA/IHJhbmdlX2VuZC0+bl9maWVs
ZHMgPiAwCisJCSAgICA6IHJhbmdlX2VuZC0+bl9maWVsZHMgPT0gMCk7CiAKIAltb2RlMSA9IGNv
bnZlcnRfc2VhcmNoX21vZGVfdG9faW5ub2Jhc2UobWluX2tleSA/IG1pbl9rZXktPmZsYWcgOgog
CQkJCQkJSEFfUkVBRF9LRVlfRVhBQ1QpOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9y
IHB1c2ggZW1haWxzKS4=