From: marko.makela
Date: June 11 2012 12:47pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3960 to 3962) WL#6255
List-Archive: http://lists.mysql.com/commits/144192
Message-Id: <20120611124702.28943.18205.3962@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NjIgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xMQogICAgICBXTCM2MjU1IGJ1ZyBmaXggZm9y
IGFwcGx5aW5nIGJ1ZmZlcmVkIGRlbGV0ZSB3aXRoIEFERCBQUklNQVJZIEtFWS4KICAgICAgCiAg
ICAgIHJvd19sb2dfdGFibGVfYXBwbHlfZGVsZXRlKCk6IFJlbW92ZSB0aGUgcGFyYW1ldGVyIHRy
eF9pZF9jb2wuCiAgICAgIFJlbmFtZSBuZXdfdHJ4X2lkX2NvbCB0byB0cnhfaWRfY29sLiBJbiB0
aGUgYnVmZmVyZWQgcmVjb3JkLCB3ZSBoYXZlCiAgICAgIHRoZSBQUklNQVJZIEtFWSBjb2x1bW5z
IGFzIHRoZXkgYXBwZWFyIGluIHRoZSBuZXcgdGFibGUuCiAgICAgIFRodXMsIHRoZSBzdHJ1Y3R1
cmUgb2YgdGhlIG9sZCBjbHVzdGVyZWQgaW5kZXggcmVjb3JkcyBpcyBpcnJlbGV2YW50LgogICAg
ICAKICAgICAgVGhpcyBhZGRyZXNzZXMgcmI6MTEwNSBQcm9ibGVtIDEyLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCiAzOTYxIE1hcmtvIE3DpGtl
bMOkCTIwMTItMDYtMTEKICAgICAgQXR0ZW1wdCB0byBmaXggV0wjNjI1NSByYjoxMTA1IFByb2Js
ZW0gOSwxMSwxMy4KICAgICAgCiAgICAgIHJvd19sb2dfdGFibGVfYXBwbHlfdXBkYXRlKCk6IEFk
ZCBhIG1pc3NpbmcgbXRyX2NvbW1pdCgpIGNhbGwuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MKIDM5NjAgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0x
MQogICAgICBTaWxlbmNlIHNvbWUgY29tcGlsZXIgd2FybmluZ3MuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIw
NjExMTEyOTI3LTRjZHhvdXJpMzFoMzF6dzcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYxMTEyNDAyMy14bndv
aWJkZTJhOW13dm4wCkBAIC0xMzI2LDkgKzEzMjYsNiBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X2Rl
bGV0ZSgKIC8qPT09PT09PT09PT09PT09PT09PT09PT0qLwogCXF1ZV90aHJfdCoJCXRociwJCS8q
ITwgaW46IHF1ZXJ5IGdyYXBoICovCiAJdWxpbnQJCQl0cnhfaWRfY29sLAkvKiE8IGluOiBwb3Np
dGlvbiBvZgotCQkJCQkJREJfVFJYX0lEIGluIHRoZQotCQkJCQkJb2xkIGNsdXN0ZXJlZCBpbmRl
eCAqLwotCXVsaW50CQkJbmV3X3RyeF9pZF9jb2wsCS8qITwgaW46IHBvc2l0aW9uIG9mCiAJCQkJ
CQlEQl9UUlhfSUQgaW4gdGhlIG5ldwogCQkJCQkJY2x1c3RlcmVkIGluZGV4ICovCiAJY29uc3Qg
bXJlY190KgkJbXJlYywJCS8qITwgaW46IG1lcmdlIHJlY29yZCAqLwpAQCAtMTQwNiw3ICsxNDAz
LDcgQEAgYWxsX2RvbmU6CiAJCXV0X2FkKGxlbiA9PSBEQVRBX1RSWF9JRF9MRU4pOwogCQljb25z
dCB2b2lkKglyZWNfdHJ4X2lkCiAJCQk9IHJlY19nZXRfbnRoX2ZpZWxkKGJ0cl9wY3VyX2dldF9y
ZWMoJnBjdXIpLCBvZmZzZXRzLAotCQkJCQkgICAgbmV3X3RyeF9pZF9jb2wsICZsZW4pOworCQkJ
CQkgICAgdHJ4X2lkX2NvbCwgJmxlbik7CiAJCXV0X2FkKGxlbiA9PSBEQVRBX1RSWF9JRF9MRU4p
OwogCQlpZiAobWVtY21wKG1yZWNfdHJ4X2lkLCByZWNfdHJ4X2lkLCBEQVRBX1RSWF9JRF9MRU4p
KSB7CiAJCQlnb3RvIGFsbF9kb25lOwpAQCAtMTQ4OSw2ICsxNDg2LDcgQEAgcm93X2xvZ190YWJs
ZV9hcHBseV91cGRhdGUoCiAJICAgIHx8IGJ0cl9wY3VyX2dldF9sb3dfbWF0Y2goJnBjdXIpIDwg
aW5kZXgtPm5fdW5pcSkgewogCQltdHJfY29tbWl0KCZtdHIpOwogaW5zZXJ0OgorCQl1dF9hZCht
dHIuc3RhdGUgPT0gTVRSX0NPTU1JVFRFRCk7CiAJCS8qIFRoZSByb3cgd2FzIG5vdCBmb3VuZC4g
SW5zZXJ0IGl0LiAqLwogCQllcnJvciA9IHJvd19sb2dfdGFibGVfYXBwbHlfaW5zZXJ0X2xvdygK
IAkJCXRociwgcm93LCBvZmZzZXRzX2hlYXAsIGhlYXAsIGxvZy0+dGFibGUsIGR1cCk7CkBAIC0x
NTgwLDYgKzE1NzgsNyBAQCBkZWxldGVfaW5zZXJ0OgogCiAJCS8qIFVubGVzcyB3ZSBjYWxsZWQg
cm93X2xvZ190YWJsZV9hcHBseV9kZWxldGVfbG93KCksCiAJCXRoaXMgd2lsbCBsaWtlbHkgY2F1
c2UgYSBkdXBsaWNhdGUga2V5IGVycm9yLiAqLworCQltdHJfY29tbWl0KCZtdHIpOwogCQlnb3Rv
IGluc2VydDsKIAl9CiAKQEAgLTE3ODQsNyArMTc4Myw3IEBAIHJvd19sb2dfdGFibGVfYXBwbHlf
b3AoCiAJCW5leHRfbXJlYyA9IG1yZWMgKyByZWNfb2Zmc19kYXRhX3NpemUob2Zmc2V0cyk7CiAK
IAkJKmVycm9yID0gcm93X2xvZ190YWJsZV9hcHBseV9kZWxldGUoCi0JCQl0aHIsIHRyeF9pZF9j
b2wsIG5ld190cnhfaWRfY29sLAorCQkJdGhyLCBuZXdfdHJ4X2lkX2NvbCwKIAkJCW1yZWMsIG9m
ZnNldHMsIG9mZnNldHNfaGVhcCwgaGVhcCwKIAkJCWxvZy0+dGFibGUpOwogCQlicmVhazsKCk5v
IGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku