From: marko.makela
Date: May 24 2012 9:57am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3860 to 3861)
List-Archive: http://lists.mysql.com/commits/143929
Message-Id: <201205240957.q4O9v6qg016617@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NjEgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNAogICAgICBGaXggYSBidWcgaW4gcmVjX2dl
dF9vZmZzZXRzKCkgZWxpbWluYXRpb24uCiAgICAgIAogICAgICBidHJfY3VyX3Blc3NpbWlzdGlj
X3VwZGF0ZSgpOiBBbGxvY2F0ZSBuZXdfZW50cnkgZnJvbSBhIHNlcGFyYXRlIGhlYXAsCiAgICAg
IGJlY2F1c2UgdGhlIGhlYXAgZm9yIG9mZnNldHMgY2FuIGJlIGVtcHRpZWQuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MKIDM4NjAgTWFya28gTcOk
a2Vsw6QJMjAxMi0wNS0yMwogICAgICBidHJfY3VyX3Blc3NpbWlzdGljX3VwZGF0ZSgpOiBGaXgg
YSBidWcgaW4gdGhlIHJlY19nZXRfb2Zmc2V0cygpIGVsaW1pbmF0aW9uLgogICAgICAKICAgICAg
V2hlbiB0aGUgcGFnZSBpcyBjb21wcmVzc2VkIGFuZCB3ZSBuZWVkIHRvIGtlZXAgdGhlIGN1cnNv
ciBwb3NpdGlvbiwKICAgICAgYWRqdXN0IHRoZSBvZmZzZXRzIGFzIHdlbGwuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvYnRyL2J0cjBjdXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjMy
MDIyNDctemJhejhhOGc3aHR3ZzlkYgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI0MDk1NjA4LTFzZGd4MTFm
bGlkZGg0dmEKQEAgLTIyNTIsNyArMjI1Miw2IEBAIGJ0cl9jdXJfcGVzc2ltaXN0aWNfdXBkYXRl
KAogCXBhZ2VfemlwX2Rlc190KglwYWdlX3ppcDsKIAlyZWNfdCoJCXJlYzsKIAlwYWdlX2N1cl90
KglwYWdlX2N1cnNvcjsKLQlkdHVwbGVfdCoJbmV3X2VudHJ5OwogCWRiZXJyX3QJCWVycjsKIAlk
YmVycl90CQlvcHRpbV9lcnI7CiAJcm9sbF9wdHJfdAlyb2xsX3B0cjsKQEAgLTIzMjYsMTQgKzIz
MjUsMTQgQEAgYnRyX2N1cl9wZXNzaW1pc3RpY191cGRhdGUoCiAJCX0KIAl9CiAKLQlpZiAoISpo
ZWFwKSB7Ci0JCSpoZWFwID0gbWVtX2hlYXBfY3JlYXRlKDEwMjQpOwotCX0KIAkqb2Zmc2V0cyA9
IHJlY19nZXRfb2Zmc2V0cygKIAkJcmVjLCBpbmRleCwgKm9mZnNldHMsIFVMSU5UX1VOREVGSU5F
RCwgaGVhcCk7CiAKLQluZXdfZW50cnkgPSByb3dfcmVjX3RvX2luZGV4X2VudHJ5KFJPV19DT1BZ
X0RBVEEsIHJlYywgaW5kZXgsICpvZmZzZXRzLAotCQkJCQkgICAmbl9leHQsICpoZWFwKTsKKwlt
ZW1faGVhcF90KgluZXdfZW50cnlfaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgKKwkJcmVjX29mZnNf
c2l6ZSgqb2Zmc2V0cykKKwkJKyBEVFVQTEVfRVNUX0FMTE9DKHJlY19vZmZzX25fZmllbGRzKCpv
ZmZzZXRzKSkpOworCWR0dXBsZV90KgluZXdfZW50cnkgPSByb3dfcmVjX3RvX2luZGV4X2VudHJ5
KAorCQlST1dfQ09QWV9EQVRBLCByZWMsIGluZGV4LCAqb2Zmc2V0cywgJm5fZXh0LCBuZXdfZW50
cnlfaGVhcCk7CiAKIAkvKiBUaGUgcGFnZSBjb250YWluaW5nIHRoZSBjbHVzdGVyZWQgaW5kZXgg
cmVjb3JkCiAJY29ycmVzcG9uZGluZyB0byBuZXdfZW50cnkgaXMgbGF0Y2hlZCBpbiBtdHIuICBJ
ZiB0aGUKQEAgLTI1MzcsNiArMjUzNiw3IEBAIG1ha2VfZXh0ZXJuYWw6CiAJfQogCiByZXR1cm5f
YWZ0ZXJfcmVzZXJ2YXRpb25zOgorCW1lbV9oZWFwX2ZyZWUobmV3X2VudHJ5X2hlYXApOwogI2lm
ZGVmIFVOSVZfWklQX0RFQlVHCiAJdXRfYSghcGFnZV96aXAgfHwgcGFnZV96aXBfdmFsaWRhdGUo
cGFnZV96aXAsIHBhZ2UpKTsKICNlbmRpZiAvKiBVTklWX1pJUF9ERUJVRyAqLwpAQCAtMzA1OCw3
ICszMDU4LDYgQEAgYnRyX2N1cl9wZXNzaW1pc3RpY19kZWxldGUoCiAJcGFnZV96aXBfZGVzX3Qq
CXBhZ2VfemlwOwogCWRpY3RfaW5kZXhfdCoJaW5kZXg7CiAJcmVjX3QqCQlyZWM7Ci0JZHR1cGxl
X3QqCW5vZGVfcHRyOwogCXVsaW50CQluX2V4dGVudHMJPSAwOwogCXVsaW50CQluX3Jlc2VydmVk
OwogCWlib29sCQlzdWNjZXNzOwpAQCAtMzE1Niw3ICszMTU1LDcgQEAgYnRyX2N1cl9wZXNzaW1p
c3RpY19kZWxldGUoCiAKIAkJCWJ0cl9ub2RlX3B0cl9kZWxldGUoaW5kZXgsIGJsb2NrLCBtdHIp
OwogCi0JCQlub2RlX3B0ciA9IGRpY3RfaW5kZXhfYnVpbGRfbm9kZV9wdHIoCisJCQlkdHVwbGVf
dCoJbm9kZV9wdHIgPSBkaWN0X2luZGV4X2J1aWxkX25vZGVfcHRyKAogCQkJCWluZGV4LCBuZXh0
X3JlYywgYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKSwKIAkJCQloZWFwLCBsZXZlbCk7CiAK
Ck5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku