From: marko.makela
Date: September 20 2012 7:22pm
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4302 to 4303)
List-Archive: http://lists.mysql.com/commits/144845
Message-Id: <20120920192254.5575.25781.4303@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzMDMgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yMAogICAgICBGaXggZXJyb3JzIGluIHRoZSBw
cmV2aW91cyBjb21taXQsIHJlZmFjdG9yaW5nIG9mIG9wZW5fb3JfY3JlYXRlX2xvZ19maWxlKCku
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwog
NDMwMiBNYXJrbyBNw6RrZWzDpAkyMDEyLTA5LTIwCiAgICAgIFdMIzY0OTQgcHJlcGFyYXRpb246
IFJlZmFjdG9yIHRoZSByZWRvIGxvZyBvcGVuL2NyZWF0ZS4KICAgICAgCiAgICAgIHNydl9sb2df
ZmlsZV9zaXplX3JlcXVlc3RlZDogQSBjb3B5IG9mIHNydl9sb2dfZmlsZV9zaXplLgogICAgICAK
ICAgICAgc3J2X2xvZ19maWxlX3NpemU6IFRoZSBhY3R1YWwgc2l6ZSBvZiB0aGUgcmVkbyBsb2cg
ZmlsZXMsIGluIHBhZ2VzLgogICAgICAKICAgICAgb3Blbl9vcl9jcmVhdGVfbG9nX2ZpbGUoKTog
UmVmYWN0b3IgaW50byBjcmVhdGVfbG9nX2ZpbGUoKSBhbmQKICAgICAgb3Blbl9sb2dfZmlsZSgp
LgogICAgICAKICAgICAgaW5ub2Jhc2Vfc3RhcnRfb3JfY3JlYXRlX2Zvcl9teXNxbCgpOiBJZiBp
Yl9sb2dmaWxlMCBjYW5ub3QgYmUgZm91bmQsCiAgICAgIGNyZWF0ZSBsb2cgZmlsZXMuIE90aGVy
d2lzZSwgb3BlbiB0aGUgbG9nIGZpbGVzIGFuZCBlbnN1cmUgdGhhdCBldmVyeQogICAgICBmaWxl
IGlzIG9mIHRoZSBzYW1lIHNpemUsIHdoaWNoIGlzIGEgbXVsdGlwbGUgb2YgdGhlIHBhZ2Ugc2l6
ZS4KICAgICAgCiAgICAgIGlubm9iYXNlX3N0YXJ0X29yX2NyZWF0ZV9mb3JfbXlzcWwoKTogQWZ0
ZXIgcHJvY2Vzc2luZyB0aGUgcmVkbyBsb2cKICAgICAgZmlsZXMsIGlmIHRoZSBudW1iZXIgb3Ig
c2l6ZSBvZiByZWRvIGxvZyBmaWxlcyBkaXNhZ3JlZXMgd2l0aCB0aGUKICAgICAgY29uZmlndXJl
ZCBudW1iZXIgb3Igc2l6ZSwgY3Jhc2ggdGhlIHNlcnZlci4gKFRoaXMgaXMgYSBwbGFjZWhvbGRl
cgogICAgICBmb3IgdGhlIGNvZGUgdGhhdCB3aWxsIHJlcGxhY2UgdGhlIGxvZ3MuKQoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYv
c3J2MHN0YXJ0LmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYw
c3RhcnQuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyMDEwMzQzMi1jbzc5ZzVqejFzNXpvbmRiCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEyMDkyMDE5MjE1Ni1ya3FyNWFhNDJ6YnJ5ZHd6CkBAIC0xODU2LDYgKzE4
NTYsMTAgQEAgY3JlYXRlX2xvZ19maWxlczoKIAkJCQlicmVhazsKIAkJCX0KIAorCQkJaWYgKCFz
cnZfZmlsZV9jaGVja19tb2RlKGxvZ2ZpbGVuYW1lKSkgeworCQkJCXJldHVybihEQl9FUlJPUik7
CisJCQl9CisKIAkJCWVyciA9IG9wZW5fbG9nX2ZpbGUoJmZpbGVzW2ldLCBsb2dmaWxlbmFtZSwg
JnNpemUpOwogCiAJCQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKQEAgLTE5MDgsNiArMTkxMiw5
IEBAIGNyZWF0ZV9sb2dfZmlsZXM6CiAJdXRfYShzcnZfbG9nX2ZpbGVfc2l6ZSA8PSBVTElOVF9N
QVgpOwogCiAJZm9yICh1bGludCBqID0gMDsgaiA8IGk7IGorKykgeworCQlzcHJpbnRmKGxvZ2Zp
bGVuYW1lICsgZGlybmFtZWxlbiwgImliX2xvZ2ZpbGUlbHUiLAorCQkJKHVsb25nKSBqKTsKKwog
CQlmaWxfbm9kZV9jcmVhdGUobG9nZmlsZW5hbWUsICh1bGludCkgc3J2X2xvZ19maWxlX3NpemUs
CiAJCQkJU1JWX0xPR19TUEFDRV9GSVJTVF9JRCwgRkFMU0UpOwogCX0KCk5vIGJ1bmRsZSAocmVh
c29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku