From: marko.makela
Date: June 13 2012 8:06pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3974 to 3976)
List-Archive: http://lists.mysql.com/commits/144230
Message-Id: <20120613200631.5073.47094.3976@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NzYgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xMwogICAgICByb3dfbG9nX3RhYmxlX2RlbGV0
ZSgpOiBDaGVjayBlcnJvcnMgZnJvbSByb3dfbG9nX3RhYmxlX2dldF9waygpLgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCiAzOTc1IE1hcmtvIE3D
pGtlbMOkCTIwMTItMDYtMTMKICAgICAgcm93X21lcmdlX2luc2VydF9pbmRleF90dXBsZXMoKTog
QWRkIHV0X2FkKHRyeF9pZCksCiAgICAgIGluIGFuIGF0dGVtcCB0byB0cmFjayBkb3duIHdoeSB0
aGVyZSB3YXMgYSBzZWNvbmRhcnkgaW5kZXggd2l0aAogICAgICBvbmx5IG9uZSByZWNvcmQgaW4g
dGhlIG9ubHkgKHJvb3QpIHBhZ2UsIHdpdGggUEFHRV9NQVhfVFJYX0lEPTAuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYwogMzk3NCBNYXJrbyBN
w6RrZWzDpAkyMDEyLTA2LTEzCiAgICAgIFdMIzYyNTUgcmFjZSBjb25kaXRpb24gZml4LgogICAg
ICAKICAgICAgcm9sbGJhY2tfaW5wbGFjZV9hbHRlcl90YWJsZSgpOiBGcmVlIHRoZSBvbmxpbmUg
bG9nIGJlZm9yZQogICAgICBkcm9wcGluZyB0aGUgdGFibGUgdGhhdCB3YXMgYmVpbmcgcmVidWls
dC4gT3RoZXJ3aXNlLCBETUwgdGhyZWFkcwogICAgICBjb3VsZCBhY2Nlc3MgdGhlIGZyZWVkIHRh
YmxlIG9iamVjdCBpbiByb3dfbG9nX3RhYmxlX2dldF9waygpCiAgICAgIGFuZCBwb3NzaWJseSBl
bHNld2hlcmUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YW5kbGVyMGFsdGVyLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwbG9nLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjEzMTMyNDEzLWk4dTc5ajkyZzdiN3A4eXQKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEyMDYxMzIwMDUyMS1iajN0M3RndHoxcWZiN2Q1CkBAIC00NTcsNiArNDU3LDEy
IEBAIHJvd19sb2dfdGFibGVfZGVsZXRlKAogCQlkZmllbGRfdCoJZGZpZWxkOwogCiAJCW9sZF9w
ayA9IHJvd19sb2dfdGFibGVfZ2V0X3BrKHJlYywgaW5kZXgsIG9mZnNldHMsICZoZWFwKTsKKwor
CQlpZiAoIW9sZF9waykgeworCQkJdXRfYWQoaW5kZXgtPm9ubGluZV9sb2ctPmVycm9yICE9IERC
X1NVQ0NFU1MpOworCQkJcmV0dXJuOworCQl9CisKIAkJLyogUmVtb3ZlIERCX1JPTExfUFRSLiAq
LwogCQl1dF9hZChkdHVwbGVfZ2V0X25fZmllbGRzX2NtcChvbGRfcGspCiAJCSAgICAgID09IGRp
Y3RfaW5kZXhfZ2V0X25fdW5pcXVlKG5ld19pbmRleCkpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MG1lcmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjEzMTMy
NDEzLWk4dTc5ajkyZzdiN3A4eXQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdl
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjEzMjAwNTIxLWJqM3QzdGd0
ejFxZmI3ZDUKQEAgLTIyNDAsNiArMjI0MCw3IEBAIHJvd19tZXJnZV9pbnNlcnRfaW5kZXhfdHVw
bGVzKAogCXV0X2FkKCEoaW5kZXgtPnR5cGUgJiBESUNUX0ZUUykpOwogCXV0X2FkKGRlbF9tYXJr
cyA9PSAoZGljdF9pbmRleF9nZXRfb25saW5lX3N0YXR1cyhpbmRleCkKIAkJCSAgICAhPSBPTkxJ
TkVfSU5ERVhfQ09NUExFVEUpKTsKKwl1dF9hZCh0cnhfaWQpOwogCiAJdHVwbGVfaGVhcCA9IG1l
bV9oZWFwX2NyZWF0ZSgxMDAwKTsKIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1
c2ggZW1haWxzKS4=