From: marko.makela
Date: February 2 2012 12:04pm
Subject: bzr push into mysql-5.5 branch (marko.makela:3697 to 3699)
List-Archive: http://lists.mysql.com/commits/142717
Message-Id: <201202021204.q12C4c77018908@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2OTkgTWFya28gTcOka2Vsw6QJMjAxMi0wMi0wMgogICAgICBoYV9pbm5vYmFzZTo6cmVjb3Jk
c19pbl9yYW5nZSgpOiBSZW1vdmUgYSBkZWJ1ZyBhc3NlcnRpb24KICAgICAgdGhhdCBwcm9oaWJp
dHMgYW4gb3BlbiByYW5nZSAoZnVsbCB0YWJsZSkuCiAgICAgIFRoaXMgYXNzZXJ0aW9uIGNhdGNo
ZXMgdW5uZWNlc3NhcnkgY2FsbHMgdG8gdGhpcyBtZXRob2QsIGJ1dCBzdWNoIGNhbGxzCiAgICAg
IGFyZSBub3QgaGFybWluZyBjb3JyZWN0bmVzcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwogMzY5OCBNYXJrbyBNw6RrZWzDpAkyMDEy
LTAyLTAyIFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xIHRvIG15c3FsLTUuNS4KCiAgICBt
b2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmMKIDM2OTcgTWFya28gTcOka2Vsw6QJ
MjAxMi0wMi0wMgogICAgICBCdWcgIzEzNjUxNjI3IE1vdmUgdXRfYWQoMCkgZnJvbSB0aGUgYmVn
aW5uaW5nIHRvIHRoZSBlbmQgb2YgYnVmX3BhZ2VfcHJpbnQoKSwKICAgICAgcHJpbnQgcGFnZSBk
dW1wCiAgICAgIAogICAgICBidWZfcGFnZV9wcmludCgpOiBSZW1vdmUgdGhlIHV0X2FkKDApIGZy
b20gdGhlIGJlZ2lubmluZy4gQWRkIHR3byBmbGFncwogICAgICAoZW51bSBidWZfcGFnZV9wcmlu
dF9mbGFncykgdGhhdCBjYW4gYmUgYml0d2lzZS1PUmVkIHRvZ2V0aGVyOgogICAgICAKICAgICAg
QlVGX1BBR0VfUFJJTlRfTk9fQ1JBU0g6CiAgICAgICAgRG8gbm90IGNyYXNoIGRlYnVnIGJ1aWxk
cyBhdCB0aGUgZW5kIG9mIGJ1Zl9wYWdlX3ByaW50KCkuCiAgICAgIEJVRl9QQUdFX1BSSU5UX05P
X0ZVTEw6CiAgICAgICAgRG8gbm90IHByaW50IHRoZSBmdWxsIHBhZ2UgZHVtcC4gVGhpcyBjYW4g
YmUgdXNlZnVsIHdoZW4gYWRkaW5nCiAgICAgICAgZGlhZ25vc3RpYyBwcmludG91dCB0byBmbHVz
aGluZyBvciB0byB0aGUgZG91Ymxld3JpdGUgYnVmZmVyLgogICAgICAKICAgICAgdHJ4X3N5c19k
b3VibGV3cml0ZV9pbml0X29yX3Jlc3RvcmVfcGFnZSgpOiBSZXBsYWNlIGV4aXQoMSkgd2l0aCB1
dF9lcnJvciwKICAgICAgc28gdGhhdCB3ZSBjYW4gZ2V0IGEgY29yZSBkdW1wIGlmIHRoaXMgZXh0
cmFvcmRpbmFyeSBjb25kaXRpb24gaGFwcGVucy4KICAgICAgCiAgICAgIHJiOjkyNCBhcHByb3Zl
ZCBieSBTdW5ueSBCYWlucwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0
ci9idHIwYnRyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHNlYS5jCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9i
dWYwZmx1LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwYnRyLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9idWYwYnVmLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3BhZ2UwcGFn
ZS5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9wYWdlL3BhZ2UwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3Bh
Z2UwcGFnZS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL3RyeC90cngwc3lzLmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTIwMjAyMTAzMTU3LXI4amRvdGZxYm50OTZ0Z3YKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTIwMjAyMTE1NDI3LTFkaG5paXRnZnlnbW83OTkKQEAgLTExNCw2ICsxMTQsMTAgQEAg
dDEyOTYzODIzCUNSRUFURSBUQUJMRSBgdDEyOTYzODIzYCAoCiAgIEtFWSBgbmR4X29gIChgb2Ao
NTAwKSksCiAgIEtFWSBgbmR4X3BgIChgcGAoNTAwKSkKICkgRU5HSU5FPUlubm9EQiBERUZBVUxU
IENIQVJTRVQ9bGF0aW4xIFJPV19GT1JNQVQ9RFlOQU1JQworY3JlYXRlIHRhYmxlIHQxKGEgdmFy
Y2hhcigyKSBwcmltYXJ5IGtleSkgZW5naW5lPWlubm9kYjsKK2luc2VydCBpbnRvIHQxIHZhbHVl
cygnJyk7CitjcmVhdGUgaW5kZXggdDFhMSBvbiB0MShhKDEpKTsKK2Ryb3AgdGFibGUgdDE7CiBz
ZXQgZ2xvYmFsIGlubm9kYl9maWxlX3Blcl90YWJsZT0wOwogc2V0IGdsb2JhbCBpbm5vZGJfZmls
ZV9mb3JtYXQ9QW50ZWxvcGU7CiBjcmVhdGUgdGFibGUgdDEoYSBpbnQgbm90IG51bGwsIGIgaW50
LCBjIGNoYXIoMTApIG5vdCBudWxsLCBkIHZhcmNoYXIoMjApKSBlbmdpbmUgPSBpbm5vZGI7Cgo9
PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgu
dGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDIwMjEwMzE1Ny1yOGpkb3RmcWJudDk2
dGd2CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjAyMDIxMTU0MjctMWRobmlpdGdmeWdtbzc5
OQpAQCAtMTE5LDYgKzExOSwxMSBAQCBzaG93IGNyZWF0ZSB0YWJsZSB0MTI5NjM4MjM7CiAjIHRo
aXMgZmlsZSBjb21wbGV0ZSBiZWZvcmUgZHJvcHBpbmcgdGhlIHRhYmxlLiAgQnkgdGhlbiwgdGhl
IHB1cmdlIHRocmVhZAogIyB3aWxsIGhhdmUgZGVsdCB3aXRoIHRoZSB1cGRhdGVzIGFib3ZlLgog
CisjIEJ1ZyMxMzY1NDkyMyBCT0dVUyBERUJVRyBBU1NFUlRJT04gSU4gSU5ERVggQ1JFQVRJT04g
Rk9SIFpFUk8tTEVOR1RIIFJFQ09SRAorY3JlYXRlIHRhYmxlIHQxKGEgdmFyY2hhcigyKSBwcmlt
YXJ5IGtleSkgZW5naW5lPWlubm9kYjsKK2luc2VydCBpbnRvIHQxIHZhbHVlcygnJyk7CitjcmVh
dGUgaW5kZXggdDFhMSBvbiB0MShhKDEpKTsKK2Ryb3AgdGFibGUgdDE7CiAKIGV2YWwgc2V0IGds
b2JhbCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9JHBlcl90YWJsZTsKIGV2YWwgc2V0IGdsb2JhbCBp
bm5vZGJfZmlsZV9mb3JtYXQ9JGZvcm1hdDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRs
ZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjAyMTAz
MTU3LXI4amRvdGZxYm50OTZ0Z3YKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lu
bm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDIwMjExNTQyNy0xZGhu
aWl0Z2Z5Z21vNzk5CkBAIC03NjExLDcgKzc2MTEsNiBAQCBoYV9pbm5vYmFzZTo6cmVjb3Jkc19p
bl9yYW5nZSgKIAltZW1faGVhcF90KgloZWFwOwogCiAJREJVR19FTlRFUigicmVjb3Jkc19pbl9y
YW5nZSIpOwotCURCVUdfQVNTRVJUKG1pbl9rZXkgfHwgbWF4X2tleSk7CiAKIAl1dF9hKHByZWJ1
aWx0LT50cnggPT0gdGhkX3RvX3RyeChoYV90aGQoKSkpOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBtZXJnZS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjAyMTAz
MTU3LXI4amRvdGZxYm50OTZ0Z3YKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdl
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjAyMDIxMTU0MjctMWRobmlpdGdm
eWdtbzc5OQpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmln
aHQgKGMpIDIwMDUsIDIwMTAsIElubm9iYXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgorQ29w
eXJpZ2h0IChjKSAxOTk1LCAyMDEyLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwg
UmlnaHRzIFJlc2VydmVkLgogCiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh
biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRlcgogdGhlIHRlcm1zIG9mIHRo
ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29m
dHdhcmUKQEAgLTU4Miw3ICs1ODIsNyBAQCByb3dfbWVyZ2VfYnVmX3dyaXRlKAogCQkJCQkJICAg
UkVDX1NUQVRVU19PUkRJTkFSWSwKIAkJCQkJCSAgIGVudHJ5LCBuX2ZpZWxkcywKIAkJCQkJCSAg
ICZleHRyYV9zaXplKTsKLQkJdXRfYWQoc2l6ZSA+IGV4dHJhX3NpemUpOworCQl1dF9hZChzaXpl
ID49IGV4dHJhX3NpemUpOwogCQl1dF9hZChleHRyYV9zaXplID49IFJFQ19OX05FV19FWFRSQV9C
WVRFUyk7CiAJCWV4dHJhX3NpemUgLT0gUkVDX05fTkVXX0VYVFJBX0JZVEVTOwogCQlzaXplIC09
IFJFQ19OX05FV19FWFRSQV9CWVRFUzsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBw
dXNoIGVtYWlscyku