From: marko.makela
Date: May 28 2012 9:02pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3887 to 3888) WL#6255
List-Archive: http://lists.mysql.com/commits/143988
Message-Id: <201205282102.q4SL2qh4029333@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4ODggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1IGRlYnVnIGFzc2Vy
dGlvbiByZWxheGF0aW9uCiAgICAgIAogICAgICByZWNfaW5pdF9vZmZzZXRzX2NvbXBfb3JkaW5h
cnkoKToKICAgICAgQWxsb3cgbl9udWxsIDwgaW5kZXgtPm5fbnVsbGFibGUuIEFzc2VydCB0aGF0
IG9mIHRoZSBwcm9jZXNzZWQgZmllbGRzLAogICAgICBubyBtb3JlIHRoYW4gbl9udWxsIGFyZSBO
VUxMYWJsZS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yZW0vcmVtMHJl
Yy5jYwogMzg4NyBNYXJrbyBNw6RrZWzDpAkyMDEyLTA1LTI4CiAgICAgIFdMIzYyNTUgZGVidWcg
YXNzZXJ0aW9uIHJlbGF4YXRpb24KICAgICAgCiAgICAgIHJlY19nZXRfY29udmVydGVkX3NpemVf
Y29tcF9wcmVmaXgoKSwgcmVjX2NvbnZlcnRfZHR1cGxlX3RvX3JlY19jb21wKCk6CiAgICAgIEFs
bG93IG5fbnVsbCA8IGluZGV4LT5uX251bGxhYmxlLiBBc3NlcnQgdGhhdCBvZiB0aGUgcHJvY2Vz
c2VkIGZpZWxkcywKICAgICAgbm8gbW9yZSB0aGFuIG5fbnVsbCBhcmUgTlVMTGFibGUuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcmVtL3JlbTByZWMuY2MKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvcmVtL3JlbTByZWMuY2MnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvcmVtL3JlbTByZWMuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MjA1MjgyMDE5MDgtZG85YW5zdTBwd2R2cTFqZQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3JlbS9y
ZW0wcmVjLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI4MjEwMDA4LWJq
aTcwa3F5c3dubTVxdDUKQEAgLTI3Miw3ICsyNzIsNiBAQCByZWNfaW5pdF9vZmZzZXRzX2NvbXBf
b3JkaW5hcnkoCiAJb2Zmc2V0c1syXSA9ICh1bGludCkgcmVjOwogCW9mZnNldHNbM10gPSAodWxp
bnQpIGluZGV4OwogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KLQl1dF9hZChuX251bGwgPj0gaW5k
ZXgtPm5fbnVsbGFibGUpOwogCiAJLyogcmVhZCB0aGUgbGVuZ3RocyBvZiBmaWVsZHMgMC4ubiAq
LwogCWRvIHsKQEAgLTI4Miw2ICsyODEsNyBAQCByZWNfaW5pdF9vZmZzZXRzX2NvbXBfb3JkaW5h
cnkoCiAJCWlmICghKGRpY3RfZmllbGRfZ2V0X2NvbChmaWVsZCktPnBydHlwZQogCQkgICAgICAm
IERBVEFfTk9UX05VTEwpKSB7CiAJCQkvKiBudWxsYWJsZSBmaWVsZCA9PiByZWFkIHRoZSBudWxs
IGZsYWcgKi8KKwkJCXV0X2FkKG5fbnVsbC0tKTsKIAogCQkJaWYgKFVOSVZfVU5MSUtFTFkoIShi
eXRlKSBudWxsX21hc2spKSB7CiAJCQkJbnVsbHMtLTsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2Vs
ZXNzIGZvciBwdXNoIGVtYWlscyku