From: marko.makela
Date: May 23 2012 7:56pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3857 to 3858)
List-Archive: http://lists.mysql.com/commits/143946
Message-Id: <201205231956.q4NJujMU021150@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NTggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yMwogICAgICBTaW1wbGlmeSByZWNfb2Zmc19t
YWtlX3ZhbGlkKCkgY2FsbHMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
YXBpL2FwaTBhcGkuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmNjCiAzODU3IE1hcmtvIE3DpGtlbMOkCTIw
MTItMDUtMjMKICAgICAgV0wjNjI1NSBwcmVwYXJhdGlvbjogQWRkIHRoZSBhY2Nlc3NvciB0cnhf
dW5kb190cnhfaWRfaXNfaW5zZXJ0KCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS90cngwdW5kby5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90
cngwdW5kby5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuY2MKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYXBpL2FwaTBhcGkuY2MnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvYXBpL2FwaTBhcGkuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA1MjMxMzQyMTQtOXdwOTI4d2RtdjBrODJoaworKysgYi9zdG9yYWdlL2lubm9iYXNlL2Fw
aS9hcGkwYXBpLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTIzMTk1NTMy
LWkxM2pqeDJyeHQ0M3h1bTUKQEAgLTM4MCw5ICszODAsNiBAQCBpYl9yZWFkX3R1cGxlKAogCXB0
ciA9IG1lbV9oZWFwX2FsbG9jKHR1cGxlLT5oZWFwLCByZWNfb2Zmc19zaXplKG9mZnNldHMpKTsK
IAljb3B5ID0gcmVjX2NvcHkocHRyLCByZWMsIG9mZnNldHMpOwogCi0JLyogQXZvaWQgYSBkZWJ1
ZyBhc3NlcnRpb24gaW4gcmVjX29mZnNfdmFsaWRhdGUoKS4gKi8KLQlyZWNfb2Zmc19tYWtlX3Zh
bGlkKHJlYywgaW5kZXgsICh1bGludCopIG9mZnNldHMpOwotCiAJbl9pbmRleF9maWVsZHMgPSB1
dF9taW4oCiAJCXJlY19vZmZzX25fZmllbGRzKG9mZnNldHMpLCBkdHVwbGVfZ2V0X25fZmllbGRz
KGR0dXBsZSkpOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRy
MGN1ci5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyMzEzNDIxNC05d3A5Mjh3ZG12MGs4MmhrCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjA1MjMxOTU1MzItaTEzamp4MnJ4dDQzeHVtNQpAQCAtMjEzNCwxMiArMjEzNCw2
IEBAIGFueV9leHRlcm46CiAKIAlidHJfc2VhcmNoX3VwZGF0ZV9oYXNoX29uX2RlbGV0ZShjdXJz
b3IpOwogCi0JLyogVGhlIGNhbGwgdG8gcm93X3JlY190b19pbmRleF9lbnRyeShST1dfQ09QWV9E
QVRBLCAuLi4pIGFib3ZlCi0JaW52b2tlcyByZWNfb2Zmc19tYWtlX3ZhbGlkKCkgdG8gcG9pbnQg
dG8gdGhlIGNvcGllZCByZWNvcmQgdGhhdAotCXRoZSBmaWVsZHMgb2YgbmV3X2VudHJ5IHBvaW50
IHRvLiAgV2UgaGF2ZSB0byB1bmRvIGl0IGhlcmUuICovCi0JdXRfYWQocmVjX29mZnNfdmFsaWRh
dGUoTlVMTCwgaW5kZXgsICpvZmZzZXRzKSk7Ci0JcmVjX29mZnNfbWFrZV92YWxpZChwYWdlX2N1
cl9nZXRfcmVjKHBhZ2VfY3Vyc29yKSwgaW5kZXgsICpvZmZzZXRzKTsKLQogCXBhZ2VfY3VyX2Rl
bGV0ZV9yZWMocGFnZV9jdXJzb3IsIGluZGV4LCAqb2Zmc2V0cywgbXRyKTsKIAogCXBhZ2VfY3Vy
X21vdmVfdG9fcHJldihwYWdlX2N1cnNvcik7CkBAIC0yMzQwLDExICsyMzM0LDYgQEAgYnRyX2N1
cl9wZXNzaW1pc3RpY191cGRhdGUoCiAKIAluZXdfZW50cnkgPSByb3dfcmVjX3RvX2luZGV4X2Vu
dHJ5KFJPV19DT1BZX0RBVEEsIHJlYywgaW5kZXgsICpvZmZzZXRzLAogCQkJCQkgICAmbl9leHQs
ICpoZWFwKTsKLQkvKiBUaGUgY2FsbCB0byByb3dfcmVjX3RvX2luZGV4X2VudHJ5KFJPV19DT1BZ
X0RBVEEsIC4uLikgYWJvdmUKLQlpbnZva2VzIHJlY19vZmZzX21ha2VfdmFsaWQoKSB0byBwb2lu
dCB0byB0aGUgY29waWVkIHJlY29yZCB0aGF0Ci0JdGhlIGZpZWxkcyBvZiBuZXdfZW50cnkgcG9p
bnQgdG8uICBXZSBoYXZlIHRvIHVuZG8gaXQgaGVyZS4gKi8KLQl1dF9hZChyZWNfb2Zmc192YWxp
ZGF0ZShOVUxMLCBpbmRleCwgKm9mZnNldHMpKTsKLQlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywg
aW5kZXgsICpvZmZzZXRzKTsKIAogCS8qIFRoZSBwYWdlIGNvbnRhaW5pbmcgdGhlIGNsdXN0ZXJl
ZCBpbmRleCByZWNvcmQKIAljb3JyZXNwb25kaW5nIHRvIG5ld19lbnRyeSBpcyBsYXRjaGVkIGlu
IG10ci4gIElmIHRoZQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzByb3cuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuY2MJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjMxMzQyMTQtOXdwOTI4d2RtdjBrODJoaworKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIwNTIzMTk1NTMyLWkxM2pqeDJyeHQ0M3h1bTUKQEAgLTIyMyw2ICsyMjMsNyBA
QCByb3dfYnVpbGQoCiAJbWVtX2hlYXBfdCoJCWhlYXApCS8qITwgaW46IG1lbW9yeSBoZWFwIGZy
b20gd2hpY2gKIAkJCQkJdGhlIG1lbW9yeSBuZWVkZWQgaXMgYWxsb2NhdGVkICovCiB7CisJY29u
c3QgYnl0ZSoJCWNvcHk7CiAJZHR1cGxlX3QqCQlyb3c7CiAJY29uc3QgZGljdF90YWJsZV90Kgl0
YWJsZTsKIAl1bGludAkJCW5fZmllbGRzOwpAQCAtMjY2LDkgKzI2Nyw5IEBAIHJvd19idWlsZCgK
IAkJYnVmID0gc3RhdGljX2Nhc3Q8Ynl0ZSo+KAogCQkJbWVtX2hlYXBfYWxsb2MoaGVhcCwgcmVj
X29mZnNfc2l6ZShvZmZzZXRzKSkpOwogCi0JCXJlYyA9IHJlY19jb3B5KGJ1ZiwgcmVjLCBvZmZz
ZXRzKTsKLQkJLyogQXZvaWQgYSBkZWJ1ZyBhc3NlcnRpb24gaW4gcmVjX29mZnNfdmFsaWRhdGUo
KS4gKi8KLQkJcmVjX29mZnNfbWFrZV92YWxpZChyZWMsIGluZGV4LCAodWxpbnQqKSBvZmZzZXRz
KTsKKwkJY29weSA9IHJlY19jb3B5KGJ1ZiwgcmVjLCBvZmZzZXRzKTsKKwl9IGVsc2UgeworCQlj
b3B5ID0gcmVjOwogCX0KIAogCXRhYmxlID0gaW5kZXgtPnRhYmxlOwpAQCAtMjg4LDYgKzI4OSw5
IEBAIHJvd19idWlsZCgKIAkJCW1lbV9oZWFwX2FsbG9jKGhlYXAsIG5fZXh0X2NvbHMgKiBzaXpl
b2YgKmV4dF9jb2xzKSk7CiAJfQogCisJLyogQXZvaWQgYSBkZWJ1ZyBhc3NlcnRpb24gaW4gcmVj
X29mZnNfdmFsaWRhdGUoKS4gKi8KKwlyZWNfb2Zmc19tYWtlX3ZhbGlkKGNvcHksIGluZGV4LCBj
b25zdF9jYXN0PHVsaW50Kj4ob2Zmc2V0cykpOworCiAJZm9yIChpID0gaiA9IDA7IGkgPCBuX2Zp
ZWxkczsgaSsrKSB7CiAJCWRpY3RfZmllbGRfdCoJCWluZF9maWVsZAogCQkJPSBkaWN0X2luZGV4
X2dldF9udGhfZmllbGQoaW5kZXgsIGkpOwpAQCAtMzAxLDcgKzMwNSw3IEBAIHJvd19idWlsZCgK
IAkJaWYgKGluZF9maWVsZC0+cHJlZml4X2xlbiA9PSAwKSB7CiAKIAkJCWNvbnN0IGJ5dGUqCWZp
ZWxkID0gcmVjX2dldF9udGhfZmllbGQoCi0JCQkJcmVjLCBvZmZzZXRzLCBpLCAmbGVuKTsKKwkJ
CQljb3B5LCBvZmZzZXRzLCBpLCAmbGVuKTsKIAogCQkJZGZpZWxkX3NldF9kYXRhKGRmaWVsZCwg
ZmllbGQsIGxlbik7CiAJCX0KQEAgLTMyNSw2ICszMjksOCBAQCByb3dfYnVpbGQoCiAJCX0KIAl9
CiAKKwlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywgaW5kZXgsIGNvbnN0X2Nhc3Q8dWxpbnQqPihv
ZmZzZXRzKSk7CisKIAl1dF9hZChkdHVwbGVfY2hlY2tfdHlwZWQocm93KSk7CiAKIAlpZiAoIWV4
dCkgewoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=