From: marko.makela
Date: February 2 2012 12:03pm
Subject: bzr push into mysql-trunk branch (marko.makela:3826 to 3827)
List-Archive: http://lists.mysql.com/commits/142716
Message-Id: <201202021203.q12C3VMg018222@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MjcgTWFya28gTcOka2Vsw6QJMjAxMi0wMi0wMiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiLWluZGV4LnRlc3QKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1l
cmdlLmNjCiAzODI2IEFsZXhhbmRlciBCYXJrb3YJMjAxMi0wMi0wMgogICAgICAgQnVnIzEzNjE2
NDM0IEFTU0VSVElPTiBGQUlMRUQ6IE5BTk9TRUNPTkRTPCAgMTAwMDAwMDAwMAogICAgICAKICAg
ICAgIFByb2JsZW06CiAgICAgIAogICAgICAgbmVnYXRpdmUgbGxkaXZfdCB2YWx1ZXMgd2l0aCB6
ZXJvIGludGVnZXIgcGFydCBhbmQgbm9uLXplcm8gZnJhY3Rpb25hbCBwYXJ0CiAgICAgICAoZS5n
LiAtMC4xMTExKSAgd2VyZSBub3QgZGV0ZWN0ZWQsIHNvIG5lZ2F0aXZlIGZyYWN0aW9uYWwgcGFy
dCB3YXMKICAgICAgIGxhdGVyIGNhc3RlZCB0byBhIGJpZyB1bnNpZ25lZCBudW1iZXIsIHdoaWNo
IG1hZGUgdGhlIGFzc2VydGlvbiBjcmFzaC4KICAgICAgCiAgICAgICBGaXg6CiAgICAgIAogICAg
ICAgUmV0dXJuIGVycm9yIGlmIGxsZC5yZW0gaXMgbmVnYXRpdmUuCiAgICAgIAogICAgICAgbW9k
aWZpZWQ6CiAgICAgICAgbXlzcWwtdGVzdC9yL3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25hbC5yZXN1
bHQKICAgICAgICBteXNxbC10ZXN0L3QvdHlwZV90ZW1wb3JhbF9mcmFjdGlvbmFsLnRlc3QKICAg
ICAgICBzcWwvc3FsX3RpbWUuY2MgCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci90
eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC90eXBlX3Rl
bXBvcmFsX2ZyYWN0aW9uYWwudGVzdAogICAgICBzcWwvc3FsX3RpbWUuY2MKPT09IG1vZGlmaWVk
IGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdCcKLS0t
IGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOmFs
ZXhhbmRlci5iYXJrb3ZAb3JhY2xlLmNvbS0yMDEyMDIwMjEwNTgxOC0wZGdieXY4MGgxaHM5aGRq
CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDIwMjEyMDA1MC16bXFiMGxwY2g2dzJ5cGU1
CkBAIC0xLDUgKzEsOSBAQAogc2V0IGdsb2JhbCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9b247CiBz
ZXQgZ2xvYmFsIGlubm9kYl9maWxlX2Zvcm1hdD0nQmFycmFjdWRhJzsKK2NyZWF0ZSB0YWJsZSB0
MShhIHZhcmNoYXIoMikgcHJpbWFyeSBrZXkpIGVuZ2luZT1pbm5vZGI7CitpbnNlcnQgaW50byB0
MSB2YWx1ZXMoJycpOworY3JlYXRlIGluZGV4IHQxYTEgb24gdDEoYSgxKSk7Citkcm9wIHRhYmxl
IHQxOwogY3JlYXRlIHRhYmxlIHQxKGEgaW50IG5vdCBudWxsLCBiIGludCwgYyBjaGFyKDEwKSBu
b3QgbnVsbCwgZCB2YXJjaGFyKDIwKSkgZW5naW5lID0gaW5ub2RiOwogaW5zZXJ0IGludG8gdDEg
dmFsdWVzICg1LDUsJ29vJywnb28nKSwoNCw0LCd0cicsJ3RyJyksKDMsNCwnYWQnLCdhZCcpLCgy
LDMsJ2FrJywnYWsnKTsKIGNvbW1pdDsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1
aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOmFsZXhhbmRlci5iYXJrb3ZAb3JhY2xlLmNv
bS0yMDEyMDIwMjEwNTgxOC0wZGdieXY4MGgxaHM5aGRqCisrKyBiL215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjAyMDIxMjAwNTAtem1xYjBscGNoNncyeXBlNQpAQCAtNyw2ICs3LDEyIEBAIGxldCAkZm9y
bWF0PWBzZWxlY3QgQEBpbm5vZGJfZmlsZV9mb3JtYXQKIHNldCBnbG9iYWwgaW5ub2RiX2ZpbGVf
cGVyX3RhYmxlPW9uOwogc2V0IGdsb2JhbCBpbm5vZGJfZmlsZV9mb3JtYXQ9J0JhcnJhY3VkYSc7
CiAKKyMgQnVnIzEzNjU0OTIzIEJPR1VTIERFQlVHIEFTU0VSVElPTiBJTiBJTkRFWCBDUkVBVElP
TiBGT1IgWkVSTy1MRU5HVEggUkVDT1JECitjcmVhdGUgdGFibGUgdDEoYSB2YXJjaGFyKDIpIHBy
aW1hcnkga2V5KSBlbmdpbmU9aW5ub2RiOworaW5zZXJ0IGludG8gdDEgdmFsdWVzKCcnKTsKK2Ny
ZWF0ZSBpbmRleCB0MWExIG9uIHQxKGEoMSkpOworZHJvcCB0YWJsZSB0MTsKKwogY3JlYXRlIHRh
YmxlIHQxKGEgaW50IG5vdCBudWxsLCBiIGludCwgYyBjaGFyKDEwKSBub3QgbnVsbCwgZCB2YXJj
aGFyKDIwKSkgZW5naW5lID0gaW5ub2RiOwogaW5zZXJ0IGludG8gdDEgdmFsdWVzICg1LDUsJ29v
Jywnb28nKSwoNCw0LCd0cicsJ3RyJyksKDMsNCwnYWQnLCdhZCcpLCgyLDMsJ2FrJywnYWsnKTsK
IGNvbW1pdDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVy
Z2UuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYwlyZXZpZDphbGV4
YW5kZXIuYmFya292QG9yYWNsZS5jb20tMjAxMjAyMDIxMDU4MTgtMGRnYnl2ODBoMWhzOWhkagor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuY2MJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMjAyMDIxMjAwNTAtem1xYjBscGNoNncyeXBlNQpAQCAtMSw2ICsxLDYg
QEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmlnaHQgKGMpIDIwMDUsIDIwMTEsIE9y
YWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmln
aHQgKGMpIDE5OTUsIDIwMTIsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdo
dHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJl
ZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdO
VSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2Fy
ZQpAQCAtNjY0LDcgKzY2NCw3IEBAIHJvd19tZXJnZV9idWZfd3JpdGUoCiAJCQkJCQkgICBSRUNf
U1RBVFVTX09SRElOQVJZLAogCQkJCQkJICAgZW50cnksIG5fZmllbGRzLAogCQkJCQkJICAgJmV4
dHJhX3NpemUpOwotCQl1dF9hZChzaXplID4gZXh0cmFfc2l6ZSk7CisJCXV0X2FkKHNpemUgPj0g
ZXh0cmFfc2l6ZSk7CiAJCXV0X2FkKGV4dHJhX3NpemUgPj0gUkVDX05fTkVXX0VYVFJBX0JZVEVT
KTsKIAkJZXh0cmFfc2l6ZSAtPSBSRUNfTl9ORVdfRVhUUkFfQllURVM7CiAJCXNpemUgLT0gUkVD
X05fTkVXX0VYVFJBX0JZVEVTOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2gg
ZW1haWxzKS4=