From: marko.makela
Date: May 7 2012 11:32am
Subject: bzr push into mysql-trunk-wl5854 branch (marko.makela:3762 to 3763)
List-Archive: http://lists.mysql.com/commits/143758
Message-Id: <201205071132.q47BWNoA024972@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3NjMgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0wNwogICAgICBBc3NlcnQgdGhhdCBtb2RpZmll
ZCBCLXRyZWUgcGFnZXMgY2FycnkgcGFnZSB0eXBlIEZJTF9QQUdFX0lOREVYLgogICAgICBBc3Nl
cnQgdGhhdCBQQUdFX0lOREVYX0lEIG9mIG1vZGlmaWVkIEItdHJlZSBwYWdlcyBtYXRjaGVzIGlu
ZGV4LT5pZCwKICAgICAgZXhjZXB0IHdoZW4gbWVyZ2luZyBidWZmZXJlZCBjaGFuZ2VzIG9yIGFw
cGx5aW5nIHRoZSByZWRvIGxvZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idHIvYnRyMGN1ci5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTBjdXIuY2MK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jYwogMzc2MiBNYXJrbyBNw6RrZWzD
pAkyMDEyLTA1LTA3CiAgICAgIFJlbW92ZSBkdXBsaWNhdGUgdGVzdHMsIGFuZCBhZGQgc29tZSBE
TUwgaW50byB0aGUgbWl4LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYi1hbHRlci1udWxsYWJsZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvdC9pbm5vZGItYWx0ZXItbnVsbGFibGUudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9i
dHIvYnRyMGN1ci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUwNzA5NTEy
MS1jM3VtMXdqYjQ0eHhvMHplCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MDcxMTMxMTktZHNrcDllZDFvazNj
OHcwawpAQCAtMTkxNSw2ICsxOTE1LDggQEAgYnRyX2N1cl91cGRhdGVfaW5fcGxhY2UoCiAJdXRf
YWQoIXRociB8fCB0aHJfZ2V0X3RyeCh0aHIpLT5pZCA9PSB0cnhfaWQpOwogCXV0X2FkKHRociB8
fCBmbGFncyA9PSAoQlRSX05PX1VORE9fTE9HX0ZMQUcgfCBCVFJfTk9fTE9DS0lOR19GTEFHCiAJ
CQkgICAgICAgfCBCVFJfQ1JFQVRFX0ZMQUcgfCBCVFJfS0VFUF9TWVNfRkxBRykpOworCXV0X2Fk
KGZpbF9wYWdlX2dldF90eXBlKGJ0cl9jdXJfZ2V0X3BhZ2UoY3Vyc29yKSkgPT0gRklMX1BBR0Vf
SU5ERVgpOworCXV0X2FkKGJ0cl9wYWdlX2dldF9pbmRleF9pZChidHJfY3VyX2dldF9wYWdlKGN1
cnNvcikpID09IGluZGV4LT5pZCk7CiAKIAlvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywg
aW5kZXgsIG9mZnNldHMsIFVMSU5UX1VOREVGSU5FRCwgJmhlYXApOwogI2lmZGVmIFVOSVZfREVC
VUcKQEAgLTIwNjIsNiArMjA2NCw4IEBAIGJ0cl9jdXJfb3B0aW1pc3RpY191cGRhdGUoCiAJdXRf
YWQoIXRociB8fCB0aHJfZ2V0X3RyeCh0aHIpLT5pZCA9PSB0cnhfaWQpOwogCXV0X2FkKHRociB8
fCBmbGFncyA9PSAoQlRSX05PX1VORE9fTE9HX0ZMQUcgfCBCVFJfTk9fTE9DS0lOR19GTEFHCiAJ
CQkgICAgICAgfCBCVFJfQ1JFQVRFX0ZMQUcgfCBCVFJfS0VFUF9TWVNfRkxBRykpOworCXV0X2Fk
KGZpbF9wYWdlX2dldF90eXBlKHBhZ2UpID09IEZJTF9QQUdFX0lOREVYKTsKKwl1dF9hZChidHJf
cGFnZV9nZXRfaW5kZXhfaWQocGFnZSkgPT0gaW5kZXgtPmlkKTsKIAogCWhlYXAgPSBtZW1faGVh
cF9jcmVhdGUoMTAyNCk7CiAJb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4LCBO
VUxMLCBVTElOVF9VTkRFRklORUQsICZoZWFwKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL3BhZ2UvcGFnZTBjdXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9w
YWdlMGN1ci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUwNzA5NTEyMS1j
M3VtMXdqYjQ0eHhvMHplCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9wYWdlMGN1ci5jYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUwNzExMzExOS1kc2twOWVkMW9rM2M4
dzBrCkBAIC05NzMsNiArOTczLDkgQEAgcGFnZV9jdXJfaW5zZXJ0X3JlY19sb3coCiAJcGFnZSA9
IHBhZ2VfYWxpZ24oY3VycmVudF9yZWMpOwogCXV0X2FkKGRpY3RfdGFibGVfaXNfY29tcChpbmRl
eC0+dGFibGUpCiAJICAgICAgPT0gKGlib29sKSAhIXBhZ2VfaXNfY29tcChwYWdlKSk7CisJdXRf
YWQoZmlsX3BhZ2VfZ2V0X3R5cGUocGFnZSkgPT0gRklMX1BBR0VfSU5ERVgpOworCXV0X2FkKG1h
Y2hfcmVhZF9mcm9tXzgocGFnZSArIFBBR0VfSEVBREVSICsgUEFHRV9JTkRFWF9JRCkKKwkgICAg
ICA9PSBpbmRleC0+aWQgfHwgbXRyLT5pbnNpZGVfaWJ1ZiB8fCByZWN2X3JlY292ZXJ5X2lzX29u
KCkpOwogCiAJdXRfYWQoIXBhZ2VfcmVjX2lzX3N1cHJlbXVtKGN1cnJlbnRfcmVjKSk7CiAKQEAg
LTEyNDYsNiArMTI0OSw5IEBAIHBhZ2VfY3VyX2luc2VydF9yZWNfemlwKAogCXBhZ2UgPSBwYWdl
X2FsaWduKCpjdXJyZW50X3JlYyk7CiAJdXRfYWQoZGljdF90YWJsZV9pc19jb21wKGluZGV4LT50
YWJsZSkpOwogCXV0X2FkKHBhZ2VfaXNfY29tcChwYWdlKSk7CisJdXRfYWQoZmlsX3BhZ2VfZ2V0
X3R5cGUocGFnZSkgPT0gRklMX1BBR0VfSU5ERVgpOworCXV0X2FkKG1hY2hfcmVhZF9mcm9tXzgo
cGFnZSArIFBBR0VfSEVBREVSICsgUEFHRV9JTkRFWF9JRCkKKwkgICAgICA9PSBpbmRleC0+aWQg
fHwgbXRyLT5pbnNpZGVfaWJ1ZiB8fCByZWN2X3JlY292ZXJ5X2lzX29uKCkpOwogCiAJdXRfYWQo
IXBhZ2VfcmVjX2lzX3N1cHJlbXVtKCpjdXJyZW50X3JlYykpOwogI2lmZGVmIFVOSVZfWklQX0RF
QlVHCkBAIC0xODk3LDYgKzE5MDMsOSBAQCBwYWdlX2N1cl9kZWxldGVfcmVjKAogCWN1cnJlbnRf
cmVjID0gY3Vyc29yLT5yZWM7CiAJdXRfYWQocmVjX29mZnNfdmFsaWRhdGUoY3VycmVudF9yZWMs
IGluZGV4LCBvZmZzZXRzKSk7CiAJdXRfYWQoISFwYWdlX2lzX2NvbXAocGFnZSkgPT0gZGljdF90
YWJsZV9pc19jb21wKGluZGV4LT50YWJsZSkpOworCXV0X2FkKGZpbF9wYWdlX2dldF90eXBlKHBh
Z2UpID09IEZJTF9QQUdFX0lOREVYKTsKKwl1dF9hZChtYWNoX3JlYWRfZnJvbV84KHBhZ2UgKyBQ
QUdFX0hFQURFUiArIFBBR0VfSU5ERVhfSUQpCisJICAgICAgPT0gaW5kZXgtPmlkIHx8IG10ci0+
aW5zaWRlX2lidWYgfHwgcmVjdl9yZWNvdmVyeV9pc19vbigpKTsKIAogCS8qIFRoZSByZWNvcmQg
bXVzdCBub3QgYmUgdGhlIHN1cHJlbXVtIG9yIGluZmltdW0gcmVjb3JkLiAqLwogCXV0X2FkKHBh
Z2VfcmVjX2lzX3VzZXJfcmVjKGN1cnJlbnRfcmVjKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MHNlbC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUwNzA5NTEyMS1j
M3VtMXdqYjQ0eHhvMHplCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MDcxMTMxMTktZHNrcDllZDFvazNjOHcw
awpAQCAtNDMzMyw2ICs0MzMzLDkgQEAgd3Jvbmdfb2ZmczoKIAogCS8qIENhbGN1bGF0ZSB0aGUg
J29mZnNldHMnIGFzc29jaWF0ZWQgd2l0aCAncmVjJyAqLwogCisJdXRfYWQoZmlsX3BhZ2VfZ2V0
X3R5cGUoYnRyX3BjdXJfZ2V0X3BhZ2UocGN1cikpID09IEZJTF9QQUdFX0lOREVYKTsKKwl1dF9h
ZChidHJfcGFnZV9nZXRfaW5kZXhfaWQoYnRyX3BjdXJfZ2V0X3BhZ2UocGN1cikpID09IGluZGV4
LT5pZCk7CisKIAlvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgsIG9mZnNldHMs
IFVMSU5UX1VOREVGSU5FRCwgJmhlYXApOwogCiAJaWYgKFVOSVZfVU5MSUtFTFkoc3J2X2ZvcmNl
X3JlY292ZXJ5ID4gMCkpIHsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt
YWlscyku