From: marko.makela
Date: June 12 2012 9:05pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3969 to 3970) WL#6255
List-Archive: http://lists.mysql.com/commits/144220
Message-Id: <20120612210530.7556.29054.3970@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NzAgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xMwogICAgICBXTCM2MjU1IGFzc2VydGlvbiBm
YWlsdXJlIGZpeAogICAgICAKICAgICAgaW5ub2Jhc2VfcmVjX3RvX215c3FsKCk6IEluIHRoZSBh
c3NlcnRpb24gYWJvdXQgbl9maWVsZHMsIHN1YnRyYWN0CiAgICAgIG9uZSBmcm9tIGluZGV4LT50
YWJsZS0+bl9jb2xzIHdoZW4gdGhlIHRhYmxlIGNvbnRhaW5zIGEgaGlkZGVuCiAgICAgIEZUU19E
T0NfSUQgY29sdW1uLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRs
ZXIvaGFuZGxlcjBhbHRlci5jYwogMzk2OSBNYXJrbyBNw6RrZWzDpAkyMDEyLTA2LTEyCiAgICAg
IFdMIzYyNTUgcmI6MTEwNSBQcm9ibGVtIDIwLDIxIGZpeC4KICAgICAgCiAgICAgIENoZWNrIHRo
ZSBtYXhpbXVtIGNvbHVtbiBwcmVmaXggbGVuZ3RoIHdoZW4gY2hhbmdpbmcgUk9XX0ZPUk1BVCBv
cgogICAgICBLRVlfQkxPQ0tfU0laRS4KICAgICAgCiAgICAgIGlubm9iYXNlX2NoZWNrX2NvbHVt
bl9sZW5ndGgoKTogUmVwbGFjZSB0YWJsZSB3aXRoIG1heF9jb2xfbGVuLgogICAgICAKICAgICAg
aGFfaW5ub2Jhc2U6OnByZXBhcmVfaW5wbGFjZV9hbHRlcl90YWJsZSgpOiBDb21wdXRlIG1heF9j
b2xfbGVuCiAgICAgIGJ5IGludm9raW5nIGlubm9iYXNlX3RhYmxlX2ZsYWdzKCkgd2hlbiBuZWVk
ZWQuIEVuZm9yY2UgdGhlIG1heF9jb2xfbGVuCiAgICAgIGFsc28gaW4gZXhpc3RpbmcgaW5kZXhl
cyBvZiB0aGUgdGFibGUuCiAgICAgIAogICAgICBpbm5vYmFzZV90YWJsZV9mbGFncygpOiBSZW1v
dmUgdGhlIHBhcmFtZXRlciBuYW1lLiBEbyBub3QgY29tcGxhaW4KICAgICAgYWJvdXQgYmFkbHkg
Zm9ybWVkIEZUU19ET0NfSURfSU5ERVgsIHVubGVzcyB0aGUgdGFibGUgaXMgYWxzbyB0byBoYXZl
CiAgICAgIEZVTExURVhUIGluZGV4ZXMuIFdoZW4gY29tcGxhaW5pbmcsIHVzZSB0aGUgZGVkaWNh
dGVkIGVycm9yIGNvZGUKICAgICAgRVJfSU5OT0RCX0ZUX1dST05HX0RPQ0lEX0lOREVYIGluc3Rl
YWQgb2YgdGhlIGdlbmVyaWMgYW5kIG1pc2xlYWRpbmcKICAgICAgRVJfV1JPTkdfTkFNRV9GT1Jf
SU5ERVguCiAgICAgIAogICAgICBwcmVwYXJlX2lucGxhY2VfYWx0ZXJfdGFibGVfZGljdCgpOiBB
ZGQgdGhlIHBhcmFtZXRlcnMgZmxhZ3MsIGZsYWdzMiwKICAgICAgc28gdGhhdCBpbm5vYmFzZV90
YWJsZV9mbGFncygpIGRvZXMgbm90IG5lZWQgdG8gYmUgaW52b2tlZCBhZ2Fpbi4gSXRzCiAgICAg
IG91dGNvbWUgY2FuIGNoYW5nZSBpZiBpbm5vZGJfZmlsZV9mb3JtYXQgaXMgY2hhbmdlZCBiZXR3
ZWVuIGNhbGxzLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9y
L2lubm9kYl9wcmVmaXhfaW5kZXhfbGlmdGVkbGltaXQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3QvaW5ub2RiX3ByZWZpeF9pbmRleF9saWZ0ZWRsaW1pdC50ZXN0CiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX2Z0cy9yL2lubm9kYi1mdHMtZGRsLnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9mdHMvdC9pbm5vZGItZnRzLWRkbC50ZXN0CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9oYW5kbGVyL2hhX2lubm9kYi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YW5kbGVyMGFsdGVyLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRs
ZXIvaGFuZGxlcjBhbHRlci5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRs
ZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTIyMDM2MTQt
N2pjemMyb2Y1bjBhc2c2ZAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBh
bHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYxMjIxMDM0MS1sdWkw
amJvbWVrdTJ5cTJkCkBAIC0xMDQ0LDcgKzEwNDQsOSBAQCBpbm5vYmFzZV9yZWNfdG9fbXlzcWwo
CiAJdWludAluX2ZpZWxkcwk9IHRhYmxlLT5zLT5maWVsZHM7CiAJdWludAlpOwogCi0JdXRfYWQo
Y29sX21hcCB8fCBuX2ZpZWxkcyA9PSBkaWN0X3RhYmxlX2dldF9uX3VzZXJfY29scyhpbmRleC0+
dGFibGUpKTsKKwl1dF9hZChjb2xfbWFwIHx8IG5fZmllbGRzID09IGRpY3RfdGFibGVfZ2V0X25f
dXNlcl9jb2xzKGluZGV4LT50YWJsZSkKKwkgICAgICAtICEhKERJQ1RfVEYyX0ZMQUdfSVNfU0VU
KGluZGV4LT50YWJsZSwKKwkJCQkJRElDVF9URjJfRlRTX0hBU19ET0NfSUQpKSk7CiAKIAlmb3Ig
KGkgPSAwOyBpIDwgbl9maWVsZHM7IGkrKykgewogCQlGaWVsZCoJCWZpZWxkCT0gdGFibGUtPmZp
ZWxkW2ldOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=