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

IDM4NjAgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yMwogICAgICBidHJfY3VyX3Blc3NpbWlzdGlj
X3VwZGF0ZSgpOiBGaXggYSBidWcgaW4gdGhlIHJlY19nZXRfb2Zmc2V0cygpIGVsaW1pbmF0aW9u
LgogICAgICAKICAgICAgV2hlbiB0aGUgcGFnZSBpcyBjb21wcmVzc2VkIGFuZCB3ZSBuZWVkIHRv
IGtlZXAgdGhlIGN1cnNvciBwb3NpdGlvbiwKICAgICAgYWRqdXN0IHRoZSBvZmZzZXRzIGFzIHdl
bGwuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MK
IDM4NTkgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yMwogICAgICByb3dfcmVjX3RvX2luZGV4X2Vu
dHJ5KCk6IE1ha2Ugb2Zmc2V0cyBjb25zdCwKICAgICAgd2hpY2ggaXQgaXMgZXhjZXB0IGluIGRl
YnVnIGJ1aWxkcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3JvdzByb3cuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmNjCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTIwNTIzMjAwODI1LTFiMjR3Ym94bWU3N2YwZ3oKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idHIv
YnRyMGN1ci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyMzIwMjI0Ny16
YmF6OGE4ZzdodHdnOWRiCkBAIC0yNDM3LDEwICsyNDM3LDEyIEBAIG1ha2VfZXh0ZXJuYWw6CiAJ
CQkJcGFnZV96aXAsIHJlYywgaW5kZXgsICpvZmZzZXRzLCBtdHIpOwogCQl9CiAKLQkJYnRyX2N1
cl9jb21wcmVzc19pZl91c2VmdWwoCi0JCQljdXJzb3IsCi0JCQliaWdfcmVjX3ZlYyAhPSBOVUxM
ICYmIChmbGFncyAmIEJUUl9LRUVQX1BPU19GTEFHKSwKLQkJCW10cik7CisJCWJvb2wgYWRqdXN0
ID0gYmlnX3JlY192ZWMgJiYgKGZsYWdzICYgQlRSX0tFRVBfUE9TX0ZMQUcpOworCisJCWlmIChi
dHJfY3VyX2NvbXByZXNzX2lmX3VzZWZ1bChjdXJzb3IsIGFkanVzdCwgbXRyKQorCQkgICAgJiYg
YWRqdXN0KSB7CisJCQlyZWNfb2Zmc19tYWtlX3ZhbGlkKHBhZ2VfY3Vyc29yLT5yZWMsIGluZGV4
LCAqb2Zmc2V0cyk7CisJCX0KIAogCQlpZiAocGFnZV96aXAgJiYgIWRpY3RfaW5kZXhfaXNfY2x1
c3QoaW5kZXgpCiAJCSAgICAmJiBwYWdlX2lzX2xlYWYocGFnZSkpIHsKQEAgLTI0NTQsOCArMjQ1
Niw3IEBAIG1ha2VfZXh0ZXJuYWw6CiAJCXV0X2Eob3B0aW1fZXJyICE9IERCX1VOREVSRkxPVyk7
CiAKIAkJLyogT3V0IG9mIHNwYWNlOiByZXNldCB0aGUgZnJlZSBiaXRzLiAqLwotCQlpZiAoIWRp
Y3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpCi0JCSAgICAmJiBwYWdlX2lzX2xlYWYocGFnZSkpIHsK
KwkJaWYgKCFkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSAmJiBwYWdlX2lzX2xlYWYocGFnZSkp
IHsKIAkJCWlidWZfcmVzZXRfZnJlZV9iaXRzKGJsb2NrKTsKIAkJfQogCX0KCk5vIGJ1bmRsZSAo
cmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku