From: marko.makela
Date: May 7 2012 12:03pm
Subject: bzr push into mysql-trunk-wl5854 branch (marko.makela:3763 to 3764)
List-Archive: http://lists.mysql.com/commits/143756
Message-Id: <201205071203.q47C3AY6010474@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3NjQgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0wNwogICAgICBBZGQgZGVidWcgYXNzZXJ0aW9u
cyBvbiBCLXRyZWUgcGFnZSB0eXBlIHdoZW4gb3BlbmluZyBidHJfY3VyLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCiAzNzYzIE1hcmtvIE3DpGtl
bMOkCTIwMTItMDUtMDcKICAgICAgQXNzZXJ0IHRoYXQgbW9kaWZpZWQgQi10cmVlIHBhZ2VzIGNh
cnJ5IHBhZ2UgdHlwZSBGSUxfUEFHRV9JTkRFWC4KICAgICAgQXNzZXJ0IHRoYXQgUEFHRV9JTkRF
WF9JRCBvZiBtb2RpZmllZCBCLXRyZWUgcGFnZXMgbWF0Y2hlcyBpbmRleC0+aWQsCiAgICAgIGV4
Y2VwdCB3aGVuIG1lcmdpbmcgYnVmZmVyZWQgY2hhbmdlcyBvciBhcHBseWluZyB0aGUgcmVkbyBs
b2cuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwY3VyLmNjCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzBzZWwuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBjdXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MDcxMTMxMTktZHNrcDllZDFvazNjOHcw
aworKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTIwNTA3MTIwMjExLWt6ZTBlb3Z6azQwajk3c2wKQEAgLTcxMyw2ICs3
MTMsNyBAQCByZXRyeV9wYWdlX2dldDoKIAkJCT8gU1lOQ19JQlVGX1RSRUVfTk9ERSA6IFNZTkNf
VFJFRV9OT0RFKTsKIAl9CiAKKwl1dF9hZChmaWxfcGFnZV9nZXRfdHlwZShwYWdlKSA9PSBGSUxf
UEFHRV9JTkRFWCk7CiAJdXRfYWQoaW5kZXgtPmlkID09IGJ0cl9wYWdlX2dldF9pbmRleF9pZChw
YWdlKSk7CiAKIAlpZiAoVU5JVl9VTkxJS0VMWShoZWlnaHQgPT0gVUxJTlRfVU5ERUZJTkVEKSkg
ewpAQCAtOTExLDYgKzkxMiw3IEBAIGJ0cl9jdXJfb3Blbl9hdF9pbmRleF9zaWRlX2Z1bmMoCiAJ
CQkJCSBSV19OT19MQVRDSCwgTlVMTCwgQlVGX0dFVCwKIAkJCQkJIGZpbGUsIGxpbmUsIG10cik7
CiAJCXBhZ2UgPSBidWZfYmxvY2tfZ2V0X2ZyYW1lKGJsb2NrKTsKKwkJdXRfYWQoZmlsX3BhZ2Vf
Z2V0X3R5cGUocGFnZSkgPT0gRklMX1BBR0VfSU5ERVgpOwogCQl1dF9hZChpbmRleC0+aWQgPT0g
YnRyX3BhZ2VfZ2V0X2luZGV4X2lkKHBhZ2UpKTsKIAogCQlibG9jay0+Y2hlY2tfaW5kZXhfcGFn
ZV9hdF9mbHVzaCA9IFRSVUU7CkBAIC0xMDQwLDYgKzEwNDIsNyBAQCBidHJfY3VyX29wZW5fYXRf
cm5kX3Bvc19mdW5jKAogCQkJCQkgUldfTk9fTEFUQ0gsIE5VTEwsIEJVRl9HRVQsCiAJCQkJCSBm
aWxlLCBsaW5lLCBtdHIpOwogCQlwYWdlID0gYnVmX2Jsb2NrX2dldF9mcmFtZShibG9jayk7CisJ
CXV0X2FkKGZpbF9wYWdlX2dldF90eXBlKHBhZ2UpID09IEZJTF9QQUdFX0lOREVYKTsKIAkJdXRf
YWQoaW5kZXgtPmlkID09IGJ0cl9wYWdlX2dldF9pbmRleF9pZChwYWdlKSk7CiAKIAkJaWYgKGhl
aWdodCA9PSBVTElOVF9VTkRFRklORUQpIHsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZv
ciBwdXNoIGVtYWlscyku