From: marko.makela
Date: May 29 2012 12:31pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3888 to 3889) WL#6255
List-Archive: http://lists.mysql.com/commits/143995
Message-Id: <201205291231.q4TCVtpH032277@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4ODkgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1IHJlZmFjdG9yaW5n
LgogICAgICAKICAgICAgcm93X3VwZF9idWlsZF9kaWZmZXJlbmNlX2JpbmFyeSgpOiBBZGQgdGhl
IHBhcmFtZXRlcnMgb2Zmc2V0cyBhbmQgbm9fc3lzLgogICAgICBXaGVuIGFwcGx5aW5nIGxvZ2dl
ZCByb3dzIGluIG9ubGluZSB0YWJsZSByZWJ1aWxkLCB3ZSBkbyBuZWVkIHRvIGluY2x1ZGUKICAg
ICAgREJfVFJYX0lEIGFuZCBEQl9ST0xMX1BUUiBpbiB0aGUgdXBkYXRlIHZlY3Rvci4KCiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzB1cGQuaAogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzB1cGQuY2MKIDM4ODggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1
IGRlYnVnIGFzc2VydGlvbiByZWxheGF0aW9uCiAgICAgIAogICAgICByZWNfaW5pdF9vZmZzZXRz
X2NvbXBfb3JkaW5hcnkoKToKICAgICAgQWxsb3cgbl9udWxsIDwgaW5kZXgtPm5fbnVsbGFibGUu
IEFzc2VydCB0aGF0IG9mIHRoZSBwcm9jZXNzZWQgZmllbGRzLAogICAgICBubyBtb3JlIHRoYW4g
bl9udWxsIGFyZSBOVUxMYWJsZS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9yZW0vcmVtMHJlYy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3JvdzB1cGQuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzB1cGQuaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyODIxMDAwOC1iamk3MGtxeXN3bm01
cXQ1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwdXBkLmgJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjkxMjI5NDUtZjZ1aW1scmhxNW9xOWFldgpAQCAtMjA1
LDE0ICsyMDUsMTkgQEAgdGhlIGVxdWFsIG9yZGVyaW5nIGZpZWxkcy4gTk9URTogd2UgY29tcAog
QHJldHVybiBvd246IHVwZGF0ZSB2ZWN0b3Igb2YgZGlmZmVyaW5nIGZpZWxkcywgZXhjbHVkaW5n
IHJvbGwgcHRyIGFuZAogdHJ4IGlkICovCiBVTklWX0lOVEVSTgotdXBkX3QqCitjb25zdCB1cGRf
dCoKIHJvd191cGRfYnVpbGRfZGlmZmVyZW5jZV9iaW5hcnkoCiAvKj09PT09PT09PT09PT09PT09
PT09PT09PT09PT0qLwogCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGNsdXN0ZXJlZCBp
bmRleCAqLwogCWNvbnN0IGR0dXBsZV90KgllbnRyeSwJLyohPCBpbjogZW50cnkgdG8gaW5zZXJ0
ICovCiAJY29uc3QgcmVjX3QqCXJlYywJLyohPCBpbjogY2x1c3RlcmVkIGluZGV4IHJlY29yZCAq
LwotCXRyeF90KgkJdHJ4LAkvKiE8IGluOiB0cmFuc2FjdGlvbiAqLwotCW1lbV9oZWFwX3QqCWhl
YXApOwkvKiE8IGluOiBtZW1vcnkgaGVhcCBmcm9tIHdoaWNoIGFsbG9jYXRlZCAqLworCWNvbnN0
IHVsaW50KglvZmZzZXRzLC8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsaW5kZXgpLCBvciBO
VUxMICovCisJYm9vbAkJbm9fc3lzLAkvKiE8IGluOiBza2lwIHRoZSBzeXN0ZW0gY29sdW1ucwor
CQkJCURCX1RSWF9JRCBhbmQgREJfUk9MTF9QVFIgKi8KKwl0cnhfdCoJCXRyeCwJLyohPCBpbjog
dHJhbnNhY3Rpb24gKGZvciBkaWFnbm9zdGljcyksCisJCQkJb3IgTlVMTCAqLworCW1lbV9oZWFw
X3QqCWhlYXApCS8qITwgaW46IG1lbW9yeSBoZWFwIGZyb20gd2hpY2ggYWxsb2NhdGVkICovCisJ
X19hdHRyaWJ1dGVfXygobm9ubnVsbCgxLDIsMyw3KSwgd2Fybl91bnVzZWRfcmVzdWx0KSk7CiAv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCiBSZXBsYWNlcyB0aGUgbmV3IGNvbHVtbiB2YWx1ZXMgc3RvcmVkIGluIHRoZSB1cGRh
dGUgdmVjdG9yIHRvIHRoZSBpbmRleCBlbnRyeQogZ2l2ZW4uICovCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MGlucy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyODIx
MDAwOC1iamk3MGtxeXN3bm01cXQ1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjkxMjI5NDUtZjZ1aW1scmhx
NW9xOWFldgpAQCAtMzI1LDggKzMyNSw4IEBAIHJvd19pbnNfY2x1c3RfaW5kZXhfZW50cnlfYnlf
bW9kaWZ5KAogCW10cl90KgkJbXRyKQkvKiE8IGluOiBtdHI7IG11c3QgYmUgY29tbWl0dGVkIGJl
Zm9yZQogCQkJCWxhdGNoaW5nIGFueSBmdXJ0aGVyIHBhZ2VzICovCiB7Ci0JcmVjX3QqCQlyZWM7
Ci0JdXBkX3QqCQl1cGRhdGU7CisJY29uc3QgcmVjX3QqCXJlYzsKKwljb25zdCB1cGRfdCoJdXBk
YXRlOwogCWRiZXJyX3QJCWVycjsKIAogCXV0X2FkKGRpY3RfaW5kZXhfaXNfY2x1c3QoY3Vyc29y
LT5pbmRleCkpOwpAQCAtMzQyLDggKzM0Miw5IEBAIHJvd19pbnNfY2x1c3RfaW5kZXhfZW50cnlf
YnlfbW9kaWZ5KAogCU5PVEUgdGhhdCB0aGlzIHZlY3RvciBtYXkgTk9UIGNvbnRhaW4gc3lzdGVt
IGNvbHVtbnMgdHJ4X2lkIG9yCiAJcm9sbF9wdHIgKi8KIAotCXVwZGF0ZSA9IHJvd191cGRfYnVp
bGRfZGlmZmVyZW5jZV9iaW5hcnkoY3Vyc29yLT5pbmRleCwgZW50cnksIHJlYywKLQkJCQkJCSB0
aHJfZ2V0X3RyeCh0aHIpLCBoZWFwKTsKKwl1cGRhdGUgPSByb3dfdXBkX2J1aWxkX2RpZmZlcmVu
Y2VfYmluYXJ5KAorCQljdXJzb3ItPmluZGV4LCBlbnRyeSwgcmVjLCBOVUxMLCB0cnVlLAorCQl0
aHJfZ2V0X3RyeCh0aHIpLCBoZWFwKTsKIAlpZiAobW9kZSA9PSBCVFJfTU9ESUZZX0xFQUYpIHsK
IAkJLyogVHJ5IG9wdGltaXN0aWMgdXBkYXRpbmcgb2YgdGhlIHJlY29yZCwga2VlcGluZyBjaGFu
Z2VzCiAJCXdpdGhpbiB0aGUgcGFnZSAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzB1cGQuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjgyMTAwMDgtYmppNzBrcXlz
d25tNXF0NQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmNjCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI5MTIyOTQ1LWY2dWltbHJocTVvcTlhZXYKQEAgLTg0
OCwxMiArODQ4LDE1IEBAIHRoZSBlcXVhbCBvcmRlcmluZyBmaWVsZHMuIE5PVEU6IHdlIGNvbXAK
IEByZXR1cm4gb3duOiB1cGRhdGUgdmVjdG9yIG9mIGRpZmZlcmluZyBmaWVsZHMsIGV4Y2x1ZGlu
ZyByb2xsIHB0ciBhbmQKIHRyeCBpZCAqLwogVU5JVl9JTlRFUk4KLXVwZF90KgorY29uc3QgdXBk
X3QqCiByb3dfdXBkX2J1aWxkX2RpZmZlcmVuY2VfYmluYXJ5KAogLyo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ki8KIAlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQg
aW5kZXggKi8KIAljb25zdCBkdHVwbGVfdCoJZW50cnksCS8qITwgaW46IGVudHJ5IHRvIGluc2Vy
dCAqLwogCWNvbnN0IHJlY190KglyZWMsCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCByZWNvcmQg
Ki8KKwljb25zdCB1bGludCoJb2Zmc2V0cywvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjLGlu
ZGV4KSwgb3IgTlVMTCAqLworCWJvb2wJCW5vX3N5cywJLyohPCBpbjogc2tpcCB0aGUgc3lzdGVt
IGNvbHVtbnMKKwkJCQlEQl9UUlhfSUQgYW5kIERCX1JPTExfUFRSICovCiAJdHJ4X3QqCQl0cngs
CS8qITwgaW46IHRyYW5zYWN0aW9uICovCiAJbWVtX2hlYXBfdCoJaGVhcCkJLyohPCBpbjogbWVt
b3J5IGhlYXAgZnJvbSB3aGljaCBhbGxvY2F0ZWQgKi8KIHsKQEAgLTg2MywxMSArODY2LDkgQEAg
cm93X3VwZF9idWlsZF9kaWZmZXJlbmNlX2JpbmFyeSgKIAl1bGludAkJbGVuOwogCXVwZF90KgkJ
dXBkYXRlOwogCXVsaW50CQluX2RpZmY7Ci0JdWxpbnQJCXJvbGxfcHRyX3BvczsKIAl1bGludAkJ
dHJ4X2lkX3BvczsKIAl1bGludAkJaTsKIAl1bGludAkJb2Zmc2V0c19bUkVDX09GRlNfTk9STUFM
X1NJWkVdOwotCWNvbnN0IHVsaW50KglvZmZzZXRzOwogCXJlY19vZmZzX2luaXQob2Zmc2V0c18p
OwogCiAJLyogVGhpcyBmdW5jdGlvbiBpcyB1c2VkIG9ubHkgZm9yIGEgY2x1c3RlcmVkIGluZGV4
ICovCkBAIC04NzcsMTEgKzg3OCwxNiBAQCByb3dfdXBkX2J1aWxkX2RpZmZlcmVuY2VfYmluYXJ5
KAogCiAJbl9kaWZmID0gMDsKIAotCXJvbGxfcHRyX3BvcyA9IGRpY3RfaW5kZXhfZ2V0X3N5c19j
b2xfcG9zKGluZGV4LCBEQVRBX1JPTExfUFRSKTsKIAl0cnhfaWRfcG9zID0gZGljdF9pbmRleF9n
ZXRfc3lzX2NvbF9wb3MoaW5kZXgsIERBVEFfVFJYX0lEKTsKKwl1dF9hZChkaWN0X2luZGV4X2dl
dF9zeXNfY29sX3BvcyhpbmRleCwgREFUQV9ST0xMX1BUUikKKwkgICAgICA9PSB0cnhfaWRfcG9z
ICsgMSk7CiAKLQlvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgsIG9mZnNldHNf
LAotCQkJCSAgVUxJTlRfVU5ERUZJTkVELCAmaGVhcCk7CisJaWYgKCFvZmZzZXRzKSB7CisJCW9m
ZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCwgb2Zmc2V0c18sCisJCQkJCSAgVUxJ
TlRfVU5ERUZJTkVELCAmaGVhcCk7CisJfSBlbHNlIHsKKwkJdXRfYWQocmVjX29mZnNfdmFsaWRh
dGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOworCX0KIAogCWZvciAoaSA9IDA7IGkgPCBkdHVwbGVf
Z2V0X25fZmllbGRzKGVudHJ5KTsgaSsrKSB7CiAKQEAgLTg5Miw5ICs4OTgsOSBAQCByb3dfdXBk
X2J1aWxkX2RpZmZlcmVuY2VfYmluYXJ5KAogCQkvKiBOT1RFOiB3ZSBjb21wYXJlIHRoZSBmaWVs
ZHMgYXMgYmluYXJ5IHN0cmluZ3MhCiAJCShObyBjb2xsYXRpb24pICovCiAKLQkJaWYgKGkgPT0g
dHJ4X2lkX3BvcyB8fCBpID09IHJvbGxfcHRyX3BvcykgeworCQlpZiAobm9fc3lzICYmIChpID09
IHRyeF9pZF9wb3MgfHwgaSA9PSB0cnhfaWRfcG9zICsgMSkpIHsKIAotCQkJZ290byBza2lwX2Nv
bXBhcmU7CisJCQljb250aW51ZTsKIAkJfQogCiAJCWlmICghZGZpZWxkX2lzX2V4dChkZmllbGQp
CkBAIC05MDksOCArOTE1LDYgQEAgcm93X3VwZF9idWlsZF9kaWZmZXJlbmNlX2JpbmFyeSgKIAog
CQkJbl9kaWZmKys7CiAJCX0KLXNraXBfY29tcGFyZToKLQkJOwogCX0KIAogCXVwZGF0ZS0+bl9m
aWVsZHMgPSBuX2RpZmY7CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFp
bHMpLg==