From: marko.makela
Date: April 18 2012 9:49am
Subject: bzr push into mysql-trunk-wl5522 branch (marko.makela:4075 to 4077)
List-Archive: http://lists.mysql.com/commits/143541
Message-Id: <201204180949.q3I9nque019866@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQwNzcgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0xOAogICAgICBXaGl0ZSBzcGFjZSBjbGVhbnVw
LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9t
eXNxbC50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuY2MKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmNjCiA0MDc2IE1hcmtvIE3DpGtlbMOkCTIwMTIt
MDQtMTgKICAgICAgUmV2ZXJ0IGEgbm9uLWZ1bmN0aW9uYWwgY2hhbmdlIGluIFdMIzU1MjIuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuY2MKIDQwNzUg
TWFya28gTcOka2Vsw6QJMjAxMi0wNC0xOAogICAgICBXTCM1NTIyOiBSZW1vdmUgdHJhaWxpbmcg
c3BhY2UgZnJvbSBjb2RlIGFuZCB0ZXN0cy4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9wdXJnZV9ydW5fbm93X2Jhc2ljLnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX3B1cmdlX3N0b3Bfbm93X2Jhc2lj
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvaW5ub2RiX3B1cmdlX3J1
bl9ub3dfYmFzaWMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvaW5ub2Ri
X3B1cmdlX3N0b3Bfbm93X2Jhc2ljLnRlc3QKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRy
MGJ0ci5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmNjCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvbXRyL210cjBtdHIuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGltcG9ydC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbXlzcWwuY2MKPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX215c3FsLnRlc3Qn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX215c3FsLnRlc3QJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MTgwODEyMjMtbG8xd212ZHY3ZGE4eWkweQor
KysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9teXNxbC50ZXN0CXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDE4MDk0ODUwLTQ0bzB1ZXlhdDdlanUyenQKQEAg
LTEwMDMsNCArMTAwMyw1IEBAIEFMVEVSIFRBQkxFIHQxIERST1AgSU5ERVggYSwgQUREIElOREVY
ICgKIAogRFJPUCBUQUJMRSB0MTsKIAorCiAtLWVjaG8gRW5kIG9mIDYuMCB0ZXN0cwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuY2MnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA0MTgwODEyMjMtbG8xd212ZHY3ZGE4eWkweQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1
Zi9idWYwbHJ1LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDE4MDk0ODUw
LTQ0bzB1ZXlhdDdlanUyenQKQEAgLTM1OSw2ICszNTksNyBAQCBidWZfZmx1c2hfeWllbGQoCiAJ
bXV0ZXhfdCoJYmxvY2tfbXV0ZXg7CiAKIAl1dF9hZChidWZfcG9vbF9tdXRleF9vd24oYnVmX3Bv
b2wpKTsKKwl1dF9hZChidWZfcGFnZV9pbl9maWxlKGJwYWdlKSk7CiAKIAlibG9ja19tdXRleCA9
IGJ1Zl9wYWdlX2dldF9tdXRleChicGFnZSk7CiAKQEAgLTM2NywxMSArMzY4LDExIEBAIGJ1Zl9m
bHVzaF95aWVsZCgKIAljaGFuZ2VkIGFmdGVyIHdlIHJlbGVhc2UgdGhlIGJ1ZmZlciBwb29sIGFu
ZAogCWJsb2NrIG11dGV4ZXMuICovCiAJYnVmX3BhZ2Vfc2V0X3N0aWNreShicGFnZSk7Ci0JbXV0
ZXhfZXhpdChibG9ja19tdXRleCk7CiAKIAkvKiBOb3cgaXQgaXMgc2FmZSB0byByZWxlYXNlIHRo
ZSBidWZfcG9vbC0+bXV0ZXguICovCiAJYnVmX3Bvb2xfbXV0ZXhfZXhpdChidWZfcG9vbCk7CiAK
KwltdXRleF9leGl0KGJsb2NrX211dGV4KTsKIAkvKiBUcnkgYW5kIGZvcmNlIGEgY29udGV4dCBz
d2l0Y2guICovCiAJb3NfdGhyZWFkX3lpZWxkKCk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2ZpbC9m
aWwwZmlsLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDE4MDgxMjIzLWxv
MXdtdmR2N2RhOHlpMHkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jYwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQxODA5NDg1MC00NG8wdWV5YXQ3ZWp1Mnp0
CkBAIC0zNDYyLDcgKzM0NjIsNyBAQCBmaWxfcmVzZXRfc3BhY2VfYW5kX2xzbigKIAl9CiAKIAlE
QlVHX0VYRUNVVEVfSUYoImliX3Jlc2V0X3NwYWNlX2FuZF9sc25fcG9zdF9mbHVzaF9jcmFzaCIs
Ci0JCSAgICAgICAJREJVR19TVUlDSURFKCk7KTsKKwkJCURCVUdfU1VJQ0lERSgpOyk7CiAKIGZ1
bmNfZXhpdDoKIAlvc19maWxlX2Nsb3NlKGZpbGUpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MG15c3FsLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDE4MDgxMjIz
LWxvMXdtdmR2N2RhOHlpMHkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmNj
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDE4MDk0ODUwLTQ0bzB1ZXlhdDdl
anUyenQKQEAgLTI4MjcsNyArMjgyNyw3IEBAIHJvd19kaXNjYXJkX3RhYmxlc3BhY2UoCiAKIAkv
KiBVcGRhdGUgdGhlIGluZGV4IHJvb3QgcGFnZXMgaW4gdGhlIHN5c3RlbSB0YWJsZXMsIG9uIGRp
c2sgKi8KIAotICAgIAllcnIgPSByb3dfaW1wb3J0X3VwZGF0ZV9pbmRleF9yb290KHRyeCwgdGFi
bGUsIHRydWUsIHRydWUpOworCWVyciA9IHJvd19pbXBvcnRfdXBkYXRlX2luZGV4X3Jvb3QodHJ4
LCB0YWJsZSwgdHJ1ZSwgdHJ1ZSk7CiAKIAlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKIAkJcmV0
dXJuKGVycik7CkBAIC0yODM2LDcgKzI4MzYsNyBAQCByb3dfZGlzY2FyZF90YWJsZXNwYWNlKAog
CS8qIEFzc2lnbiBhIG5ldyBzcGFjZSBJRCB0byB0aGUgdGFibGUgZGVmaW5pdGlvbiBzbyB0aGF0
IHB1cmdlCiAJY2FuIGlnbm9yZSB0aGUgY2hhbmdlcy4gVXBkYXRlIHRoZSBzeXN0ZW0gdGFibGUg
b24gZGlzay4gKi8KIAotICAgIAllcnIgPSByb3dfbXlzcWxfdGFibGVfaWRfcmVhc3NpZ24odGFi
bGUsIHRyeCwgJm5ld19pZCk7CisJZXJyID0gcm93X215c3FsX3RhYmxlX2lkX3JlYXNzaWduKHRh
YmxlLCB0cngsICZuZXdfaWQpOwogCiAJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7CiAJCXJldHVy
bihlcnIpOwpAQCAtMjg0NCw3ICsyODQ0LDcgQEAgcm93X2Rpc2NhcmRfdGFibGVzcGFjZSgKIAog
CS8qIERpc2NhcmQgdGhlIHBoeXNpY2FsIGZpbGUgdGhhdCBpcyB1c2VkIGZvciB0aGUgdGFibGVz
cGFjZS4gKi8KIAotICAgIAllcnIgPSBmaWxfZGlzY2FyZF90YWJsZXNwYWNlKHRhYmxlLT5zcGFj
ZSwgVFJVRSk7CisJZXJyID0gZmlsX2Rpc2NhcmRfdGFibGVzcGFjZSh0YWJsZS0+c3BhY2UsIFRS
VUUpOwogCiAJc3dpdGNoKGVycikgewogCWNhc2UgREJfU1VDQ0VTUzoKCk5vIGJ1bmRsZSAocmVh
c29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku