From: marko.makela
Date: April 23 2012 12:27pm
Subject: bzr push into mysql-trunk-wl5545 branch (marko.makela:3905 to 3907) WL#5526
 WL#5545
List-Archive: http://lists.mysql.com/commits/143614
Message-Id: <201204231228.q3NCS0bJ016046@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MDcgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0yMwogICAgICBXTCM1NTQ1L1dMIzU1MjYgY29k
ZSBjb3ZlcmFnZSBmaXhlcy4KICAgICAgCiAgICAgIHJvd19tZXJnZV9kaWN0X3RhYmxlX2dldF9p
bmRleCgpOiBSZW1vdmUuIFRoZXJlIG5ldmVyIGNhbiBiZSBkdXBsaWNhdGUKICAgICAgaW5kZXgg
bmFtZXMuIFVzZSBwbGFpbiBkaWN0X3RhYmxlX2dldF9pbmRleF9vbl9uYW1lKCkgaW5zdGVhZC4K
ICAgICAgCiAgICAgIFdoZW4gZG9pbmcgQUREIElOREVYIGFuZCBEUk9QIElOREVYIGluIGEgc2lu
Z2xlIHN0YXRlbWVudCwgdGhlIG5ldyBpbmRleAogICAgICB3aWxsIGNhcnJ5IHRoZSBURU1QX0lO
REVYX1BSRUZJWCBhbmQgdGhlIG9sZCBvbmUgKHRvIGJlIGRyb3BwZWQpCiAgICAgIHdpbGwgbGFj
ayBpdC4KICAgICAgCiAgICAgIEFwcHJvdmVkIGJ5IEppbW15IFlhbmcuCgogICAgbW9kaWZpZWQ6
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYwogMzkwNiBNYXJrbyBNw6RrZWzDpAkyMDEyLTA0
LTIzCiAgICAgIEZpeCBhIGJ1ZyBpbnRyb2R1Y2VkIGluCiAgICAgIHJldmlzaW9uLWlkIG1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDIzMTIwOTIwLWlxMHkzMzZrMG8xc3NuYXEKCiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MK
IDM5MDUgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0yMwogICAgICBXTCM1NTQ1IHRlc3QgY292ZXJh
Z2UgaW1wcm92ZW1lbnRzLgogICAgICAKICAgICAgVGVzdCBpZiBpbmNvbXBsZXRlbHkgY3JlYXRl
ZCBpbmRleGVzIHdpbGwgYmUgZHJvcHBlZCB3aGVuIHRoZXJlIGlzCiAgICAgIGEgdGFibGUgbmFt
ZSMyIGNsYXNoIHdoZW4gY3JlYXRpbmcgYSBjbHVzdGVyZWQgaW5kZXguCiAgICAgIAogICAgICBo
YV9pbm5vYmFzZTo6Y29tbWl0X2lucGxhY2VfYWx0ZXJfdGFibGUoKTogRml4IGJyb2tlbiBlcnJv
ciBoYW5kbGluZy4KICAgICAgRG8gbm90IGRlY3JlbWVudCBNT05JVE9SX1BFTkRJTkdfQUxURVJf
VEFCTEUgaWYgYW4gZXJyb3IgaXMgYmVpbmcKICAgICAgcmV0dXJuZWQgZm9yIGNvbW1pdD10cnVl
LiBJbiB0aGlzIGNhc2UsIHRoZSBtZXRob2Qgd2lsbCBiZSByZS1pbnZva2VkCiAgICAgIHdpdGgg
Y29tbWl0PWZhbHNlLiBUaGlzIGJ1ZyB3YXMgaW50cm9kdWNlZCBpbiBXTCM1NTI2LgoKICAgIG1v
ZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1pbmRleC1vbmxp
bmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LW9u
bGluZS50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNj
Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1pbmRl
eC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJl
c3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQyMzEyMDkyMC1pcTB5MzM2
azBvMXNzbmFxCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJl
c3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQyMzEyMjcwNS1zb2s4d2Fw
cnpubHkzZzcyCkBAIC05NjIsNCArOTYyLDE0IEBAIGEJYgogMQllCiAzCWEKIDMJYgorYWx0ZXIg
dGFibGUgdDIgYWRkIGluZGV4IHQyYShiKTsKK0VSUk9SIDQyMDAwOiBEdXBsaWNhdGUga2V5IG5h
bWUgJ3QyYScKK2FsdGVyIHRhYmxlIHQyIGRyb3AgaW5kZXggdDJhLCBhZGQgaW5kZXggdDJhKGIp
Oworc2hvdyBjcmVhdGUgdGFibGUgdDI7CitUYWJsZQlDcmVhdGUgVGFibGUKK3QyCUNSRUFURSBU
QUJMRSBgdDJgICgKKyAgYGFgIGludCgxMSkgREVGQVVMVCBOVUxMLAorICBgYmAgY2hhcigxKSBE
RUZBVUxUIE5VTEwsCisgIEtFWSBgdDJhYCAoYGJgKQorKSBFTkdJTkU9SW5ub0RCIERFRkFVTFQg
Q0hBUlNFVD1sYXRpbjEKIERST1AgVEFCTEUgdDEsdDI7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdCcKLS0tIGEvbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEyMDQyMzEyMDkyMC1pcTB5MzM2azBvMXNzbmFxCisrKyBiL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjA0MjMxMjI3MDUtc29rOHdhcHJ6bmx5M2c3MgpAQCAtMzcwLDQgKzM3MCw5IEBA
IGNvbm5lY3Rpb24gZGVmYXVsdDsKIGRpc2Nvbm5lY3QgYTsKIGRpc2Nvbm5lY3QgYjsKIAorLS1l
cnJvciBFUl9EVVBfS0VZTkFNRQorYWx0ZXIgdGFibGUgdDIgYWRkIGluZGV4IHQyYShiKTsKK2Fs
dGVyIHRhYmxlIHQyIGRyb3AgaW5kZXggdDJhLCBhZGQgaW5kZXggdDJhKGIpOworc2hvdyBjcmVh
dGUgdGFibGUgdDI7CisKIERST1AgVEFCTEUgdDEsdDI7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTIwNDIzMTIwOTIwLWlxMHkzMzZrMG8xc3NuYXEKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA0MjMxMjI3MDUtc29rOHdhcHJ6bmx5M2c3MgpAQCAtMzA1Miw3ICszMDUyLDcgQEAgcHJv
Y2Vzc2VkX2ZpZWxkOgogCXJvd19teXNxbF91bmxvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CiAJ
dHJ4X2ZyZWVfZm9yX215c3FsKHRyeCk7CiAKLQlpZiAodHJ4ID09IGN0eC0+dHJ4KSB7CisJaWYg
KGN0eCAmJiB0cnggPT0gY3R4LT50cngpIHsKIAkJY3R4LT50cnggPSBOVUxMOwogCX0KIAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIwNDIzMTIwOTIwLWlxMHkzMzZrMG8xc3NuYXEKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MG1lcmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIw
NDIzMTIyNzA1LXNvazh3YXByem5seTNnNzIKQEAgLTc5NCw1MyArNzk0LDYgQEAgcm93X21lcmdl
X2hlYXBfY3JlYXRlKAogCXJldHVybihoZWFwKTsKIH0KIAotLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1T
ZWFyY2ggYW4gaW5kZXggb2JqZWN0IGJ5IG5hbWUgYW5kIGNvbHVtbiBuYW1lcy4gIElmIHNldmVy
YWwgaW5kZXhlcyBtYXRjaCwKLXJldHVybiB0aGUgaW5kZXggd2l0aCB0aGUgbWF4IGlkLgotQHJl
dHVybgltYXRjaGluZyBpbmRleCwgTlVMTCBpZiBub3QgZm91bmQgKi8KLXN0YXRpYyBfX2F0dHJp
YnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKQotZGljdF9pbmRleF90Kgotcm93
X21lcmdlX2RpY3RfdGFibGVfZ2V0X2luZGV4KAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09
PT0qLwotCWRpY3RfdGFibGVfdCoJCXRhYmxlLAkJLyohPCBpbjogdGFibGUgKi8KLQljb25zdCBt
ZXJnZV9pbmRleF9kZWZfdCppbmRleF9kZWYpCS8qITwgaW46IGluZGV4IGRlZmluaXRpb24gKi8K
LXsKLQlkaWN0X2luZGV4X3QqCWZvdW5kCT0gTlVMTDsKLQotCWZvdW5kID0gTlVMTDsKLQlmb3Ig
KGRpY3RfaW5kZXhfdCogaW5kZXggPSBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCh0YWJsZSk7
Ci0JICAgICBpbmRleCAhPSBOVUxMOwotCSAgICAgaW5kZXggPSBkaWN0X3RhYmxlX2dldF9uZXh0
X2luZGV4KGluZGV4KSkgewotCi0JCWlmICh1dF9zdHJjbXAoaW5kZXgtPm5hbWUsIGluZGV4X2Rl
Zi0+bmFtZSkgPT0gMAotCQkgICAgJiYgZGljdF9pbmRleF9nZXRfbl9vcmRlcmluZ19kZWZpbmVk
X2J5X3VzZXIoaW5kZXgpCi0JCSAgICA9PSBpbmRleF9kZWYtPm5fZmllbGRzKSB7Ci0KLQkJCWZv
ciAodWxpbnQgaSA9IDA7IGkgPCBpbmRleF9kZWYtPm5fZmllbGRzOyBpKyspIHsKLQkJCQljb25z
dCBkaWN0X2ZpZWxkX3QqCWZpZWxkCi0JCQkJCT0gZGljdF9pbmRleF9nZXRfbnRoX2ZpZWxkKGlu
ZGV4LCBpKTsKLQotCQkJCWlmIChkaWN0X2NvbF9nZXRfbm8oZmllbGQtPmNvbCkgIT0KLQkJCQkg
ICAgaW5kZXhfZGVmLT5maWVsZHNbaV0uY29sX25vKSB7Ci0JCQkJCWdvdG8gbmV4dF9pbmRleDsK
LQkJCQl9Ci0JCQl9Ci0KLQkJCS8qIFdlIGZvdW5kIGEgbWF0Y2hpbmcgaW5kZXgsIHNlbGVjdAot
CQkJdGhlIGluZGV4IHdpdGggdGhlIGhpZ2hlciBpZCovCi0KLQkJCWlmICghZm91bmQgfHwgaW5k
ZXgtPmlkID4gZm91bmQtPmlkKSB7Ci0KLQkJCQlmb3VuZCA9IGluZGV4OwotCQkJfQotCQl9Ci1u
ZXh0X2luZGV4OgotCQljb250aW51ZTsKLQl9Ci0KLQlyZXR1cm4oZm91bmQpOwotfQotCiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKiovLyoqCiBSZWFkIGEgbWVyZ2UgYmxvY2sgZnJvbSB0aGUgZmlsZSBzeXN0ZW0uCiBA
cmV0dXJuCVRSVUUgaWYgcmVxdWVzdCB3YXMgc3VjY2Vzc2Z1bCwgRkFMU0UgaWYgZmFpbCAqLwpA
QCAtMzEyMiw4ICszMDc1LDcgQEAgcm93X21lcmdlX2NyZWF0ZV9pbmRleCgKIAogCWlmIChlcnIg
PT0gREJfU1VDQ0VTUykgewogCi0JCWluZGV4ID0gcm93X21lcmdlX2RpY3RfdGFibGVfZ2V0X2lu
ZGV4KAotCQkJdGFibGUsIGluZGV4X2RlZik7CisJCWluZGV4ID0gZGljdF90YWJsZV9nZXRfaW5k
ZXhfb25fbmFtZSh0YWJsZSwgaW5kZXhfZGVmLT5uYW1lKTsKIAogCQl1dF9hKGluZGV4KTsKIAoK
Tm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=