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

IDM4OTAgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1IHJlZmFjdG9yaW5n
OgogICAgICAKICAgICAgcm93X2luc19jbHVzdF9pbmRleF9lbnRyeV9sb3coKTogTW92ZSB0aGUg
bG9nX2ZyZWVfY2hlY2soKSBjYWxsCiAgICAgIHRvIHRoZSBjYWxsZXJzLCBiZWNhdXNlIGR1cmlu
ZyBvbmxpbmUgdGFibGUgcmVidWlsZCwgdGhlIGNsdXN0ZXJlZCBpbmRleAogICAgICB0cmVlIG9m
IHRoZSBuZXcgY29weSBvZiB0aGUgdGFibGUgY291bGQgYmUgWC1sYXRjaGVkIHdoaWxlIGNhbGxp
bmcKICAgICAgdGhpcyBmdW5jdGlvbi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MGlucy5jYwogMzg4OSBNYXJrbyBNw6RrZWzDpAkyMDEyLTA1LTI5CiAgICAg
IFdMIzYyNTUgcmVmYWN0b3JpbmcuCiAgICAgIAogICAgICByb3dfdXBkX2J1aWxkX2RpZmZlcmVu
Y2VfYmluYXJ5KCk6IEFkZCB0aGUgcGFyYW1ldGVycyBvZmZzZXRzIGFuZCBub19zeXMuCiAgICAg
IFdoZW4gYXBwbHlpbmcgbG9nZ2VkIHJvd3MgaW4gb25saW5lIHRhYmxlIHJlYnVpbGQsIHdlIGRv
IG5lZWQgdG8gaW5jbHVkZQogICAgICBEQl9UUlhfSUQgYW5kIERCX1JPTExfUFRSIGluIHRoZSB1
cGRhdGUgdmVjdG9yLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvcm93MHVwZC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGlucy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyOTEyMjk0NS1mNnVp
bWxyaHE1b3E5YWV2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjkxMjM5NTMtcHdsbGoxb3J5bm03YTZxOQpA
QCAtMjE2Nyw4ICsyMTY3LDYgQEAgcm93X2luc19jbHVzdF9pbmRleF9lbnRyeV9sb3coCiAKIAl1
dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7CiAKLQlsb2dfZnJlZV9jaGVjaygpOwot
CiAJbXRyX3N0YXJ0KCZtdHIpOwogCiAJY3Vyc29yLnRociA9IHRocjsKQEAgLTI1MzksNiArMjUz
Nyw4IEBAIHJvd19pbnNfY2x1c3RfaW5kZXhfZW50cnkoCiAKIAkvKiBUcnkgZmlyc3Qgb3B0aW1p
c3RpYyBkZXNjZW50IHRvIHRoZSBCLXRyZWUgKi8KIAorCWxvZ19mcmVlX2NoZWNrKCk7CisKIAll
cnIgPSByb3dfaW5zX2NsdXN0X2luZGV4X2VudHJ5X2xvdygwLCBCVFJfTU9ESUZZX0xFQUYsIGlu
ZGV4LCBlbnRyeSwKIAkJCQkJICAgIG5fZXh0LCB0aHIpOwogCWlmIChlcnIgIT0gREJfRkFJTCkg
ewpAQCAtMjU0OCw2ICsyNTQ4LDggQEAgcm93X2luc19jbHVzdF9pbmRleF9lbnRyeSgKIAogCS8q
IFRyeSB0aGVuIHBlc3NpbWlzdGljIGRlc2NlbnQgdG8gdGhlIEItdHJlZSAqLwogCisJbG9nX2Zy
ZWVfY2hlY2soKTsKKwogCXJldHVybihyb3dfaW5zX2NsdXN0X2luZGV4X2VudHJ5X2xvdygwLCBC
VFJfTU9ESUZZX1RSRUUsIGluZGV4LCBlbnRyeSwKIAkJCQkJICAgICBuX2V4dCwgdGhyKSk7CiB9
CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==