From: marko.makela
Date: May 28 2012 1:40pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3879 to 3881) WL#6255
List-Archive: http://lists.mysql.com/commits/143984
Message-Id: <201205281340.q4SDeKAP012438@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4ODEgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOAogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
OiBTaW1wbGlmeSB0aGUgaW5kZXgtPm9ubGluZV9zdGF0dXMgZm9yIHJlYnVpbGRpbmcgdGFibGUu
CiAgICAgIAogICAgICBkaWN0X2luZGV4X2lzX29ubGluZV9kZGwoKTogT24gY2x1c3RlcmVkIGlu
ZGV4LCBhc3NlcnQgdGhhdCBvbmxpbmVfc3RhdHVzCiAgICAgIGlzIGVpdGhlciBPTkxJTkVfSU5E
RVhfQ1JFQVRJT04gb3IgT05MSU5FX0lOREVYX0NPTVBMRVRFLgogICAgICAKICAgICAgZGljdF90
YWJsZV9pc19vbmxpbmVfcmVidWlsZCgpOiBJbnZva2UgZGljdF9pbmRleF9pc19vbmxpbmVfZGRs
KCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRp
Y3QuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmljCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MG1lbS5oCiAzODgwIE1hcmtvIE3DpGtlbMOkCTIw
MTItMDUtMjgKICAgICAgV0wjNjI1NSBwcmVwYXJhdGlvbjogRml4IGEgYnVnIGluIHRoZSByZWNf
Z2V0X29mZnNldHMoKSBlbGltaW5hdGlvbi4KICAgICAgCiAgICAgIGJ0cl9jdXJfb3B0aW1pc3Rp
Y191cGRhdGUoKTogQ3JlYXRlICpoZWFwIHdoZW4gbmVlZGVkLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCiAzODc5IE1hcmtvIE3DpGtlbMOkCTIw
MTItMDUtMjgKICAgICAgQ29udmVydCBpYm9vbCB0byBib29sLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcHVyZ2UuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnRy
L2J0cjBjdXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjgxMDA5NTAt
NGZ2NjEya2xsY2pneXNmaAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI4MTMzODI0LXQ3MXp2ajl0dHozcXMw
NzAKQEAgLTIwNzYsNiArMjA3NiwxMiBAQCBhbnlfZXh0ZXJuOgogCiAJcGFnZV9jdXJzb3IgPSBi
dHJfY3VyX2dldF9wYWdlX2N1cihjdXJzb3IpOwogCisJaWYgKCEqaGVhcCkgeworCQkqaGVhcCA9
IG1lbV9oZWFwX2NyZWF0ZSgKKwkJCXJlY19vZmZzX3NpemUoKm9mZnNldHMpCisJCQkrIERUVVBM
RV9FU1RfQUxMT0MocmVjX29mZnNfbl9maWVsZHMoKm9mZnNldHMpKSk7CisJfQorCiAJbmV3X2Vu
dHJ5ID0gcm93X3JlY190b19pbmRleF9lbnRyeShST1dfQ09QWV9EQVRBLCByZWMsIGluZGV4LCAq
b2Zmc2V0cywKIAkJCQkJICAgJm5fZXh0LCAqaGVhcCk7CiAJLyogV2UgY2hlY2tlZCBhYm92ZSB0
aGF0IHRoZXJlIGFyZSBubyBleHRlcm5hbGx5IHN0b3JlZCBmaWVsZHMuICovCgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5oJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjA1MjgxMDA5NTAtNGZ2NjEya2xsY2pneXNmaAorKysgYi9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZGljdDBkaWN0LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MjA1MjgxMzM4MjQtdDcxenZqOXR0ejNxczA3MApAQCAtMTMzMSw2ICsxMzMxLDE3IEBAIGRpY3Rf
aW5kZXhfaXNfb25saW5lX2RkbCgKIC8qPT09PT09PT09PT09PT09PT09PT09Ki8KIAljb25zdCBk
aWN0X2luZGV4X3QqCWluZGV4KQkvKiE8IGluOiBpbmRleCAqLwogCV9fYXR0cmlidXRlX18oKG5v
bm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOworLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorRGV0ZXJtaW5l
cyBpZiBhIHRhYmxlIGlzIGJlaW5nIHJlYnVpbHQgb25saW5lLAorYWxsb3dpbmcgY29uY3VycmVu
dCBtb2RpZmljYXRpb25zIHRvIHRoZSB0YWJsZS4KK0ByZXR2YWwgdHJ1ZSBpZiB0aGUgdGFibGUg
aXMgYmVpbmcgcmVidWlsdCBvbmxpbmUKK0ByZXR2YWwgZmFsc2Ugb3RoZXJ3aXNlICovCitVTklW
X0lOTElORQorYm9vbAorZGljdF90YWJsZV9pc19vbmxpbmVfcmVidWlsZCgKKy8qPT09PT09PT09
PT09PT09PT09PT09PT09PSovCisJY29uc3QgZGljdF90YWJsZV90Kgl0YWJsZSkJLyohPCBpbjog
dGFibGUgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCiBMb2dzIGFuIG9wZXJhdGlvbiB0byBhIHNlY29uZGFyeSBpbmRl
eCB0aGF0IGlzIGJlaW5nIGNyZWF0ZWQuICovCiBVTklWX0lOVEVSTgoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaWMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMjA1MjgxMDA5NTAtNGZ2NjEya2xsY2pneXNmaAorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvZGljdDBkaWN0LmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIw
NTI4MTMzODI0LXQ3MXp2ajl0dHozcXMwNzAKQEAgLTExODUsMTAgKzExODUsNDAgQEAgZGljdF9p
bmRleF9pc19vbmxpbmVfZGRsKAogLyo9PT09PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IGRp
Y3RfaW5kZXhfdCoJaW5kZXgpCS8qITwgaW46IGluZGV4ICovCiB7CisjaWZkZWYgVU5JVl9ERUJV
RworCWlmIChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSkgeworCQlzd2l0Y2ggKGRpY3RfaW5k
ZXhfZ2V0X29ubGluZV9zdGF0dXMoaW5kZXgpKSB7CisJCWNhc2UgT05MSU5FX0lOREVYX0NSRUFU
SU9OOgorCQkJcmV0dXJuKHRydWUpOworCQljYXNlIE9OTElORV9JTkRFWF9DT01QTEVURToKKwkJ
CXJldHVybihmYWxzZSk7CisJCWNhc2UgT05MSU5FX0lOREVYX0FCT1JURUQ6CisJCWNhc2UgT05M
SU5FX0lOREVYX0FCT1JURURfRFJPUFBFRDoKKwkJCWJyZWFrOworCQl9CisJCXV0X2FkKDApOwor
CQlyZXR1cm4oZmFsc2UpOworCX0KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisKIAlyZXR1cm4o
VU5JVl9VTkxJS0VMWShkaWN0X2luZGV4X2dldF9vbmxpbmVfc3RhdHVzKGluZGV4KQogCQkJICAg
ICAhPSBPTkxJTkVfSU5ERVhfQ09NUExFVEUpKTsKIH0KIAorLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorRGV0
ZXJtaW5lcyBpZiBhIHRhYmxlIGlzIGJlaW5nIHJlYnVpbHQgb25saW5lLAorYWxsb3dpbmcgY29u
Y3VycmVudCBtb2RpZmljYXRpb25zIHRvIHRoZSB0YWJsZS4KK0ByZXR2YWwgdHJ1ZSBpZiB0aGUg
dGFibGUgaXMgYmVpbmcgcmVidWlsdCBvbmxpbmUKK0ByZXR2YWwgZmFsc2Ugb3RoZXJ3aXNlICov
CitVTklWX0lOTElORQorYm9vbAorZGljdF90YWJsZV9pc19vbmxpbmVfcmVidWlsZCgKKy8qPT09
PT09PT09PT09PT09PT09PT09PT09PSovCisJY29uc3QgZGljdF90YWJsZV90Kgl0YWJsZSkJLyoh
PCBpbjogdGFibGUgKi8KK3sKKwlyZXR1cm4oZGljdF9pbmRleF9pc19vbmxpbmVfZGRsKGRpY3Rf
dGFibGVfZ2V0X2ZpcnN0X2luZGV4KHRhYmxlKSkpOworfQorCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgog
QXR0ZW1wdHMgdG8gbG9nIGFuIG9wZXJhdGlvbiBvbiBhIHNlY29uZGFyeSBpbmRleCB0aGF0IGlz
IGJlaW5nIGNyZWF0ZWQuCiBAcmV0dXJuIFRSVUUgaWYgdGhlIG9wZXJhdGlvbiB3YXMgbG9nZ2Vk
IG9yIHRoZSBpbmRleCBjcmVhdGlvbiBmYWlsZWQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbWVtLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9kaWN0MG1lbS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI4MTAw
OTUwLTRmdjYxMmtsbGNqZ3lzZmgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3Qw
bWVtLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjgxMzM4MjQtdDcxenZq
OXR0ejNxczA3MApAQCAtNDkxLDEyICs0OTEsOCBAQCBzdHJ1Y3QgZGljdF9pbmRleF9zdHJ1Y3R7
CiAJCQkJVHJhbnNpdGlvbnMgZnJvbSBPTkxJTkVfSU5ERVhfQ09NUExFVEUgKHRvCiAJCQkJT05M
SU5FX0lOREVYX0NSRUFUSU9OKSBhcmUgcHJvdGVjdGVkCiAJCQkJYnkgZGljdF9vcGVyYXRpb25f
bG9jayBhbmQKLQkJCQlkaWN0X3N5cy0+bXV0ZXguIFRyYW5zaXRpb25zIG9mIHRoZQotCQkJCWNs
dXN0ZXJlZCBpbmRleCBmcm9tIE9OTElORV9JTkRFWF9DUkVBVElPTgotCQkJCXRvIE9OTElORV9J
TkRFWF9BQk9SVEVEIChtb2RpZmljYXRpb24gbG9nCi0JCQkJb3ZlcmZsb3cgb3Igb3RoZXIgZXJy
b3IpIGFyZSBwcm90ZWN0ZWQKLQkJCQlieSBpbmRleC0+b25saW5lX2xvZy0+bXV0ZXguIE90aGVy
Ci0JCQkJY2hhbmdlcyBhcmUgcHJvdGVjdGVkIGJ5IGluZGV4LT5sb2NrLiAqLworCQkJCWRpY3Rf
c3lzLT5tdXRleC4gT3RoZXIgY2hhbmdlcyBhcmUKKwkJCQlwcm90ZWN0ZWQgYnkgaW5kZXgtPmxv
Y2suICovCiAJZGljdF9maWVsZF90KglmaWVsZHM7CS8qITwgYXJyYXkgb2YgZmllbGQgZGVzY3Jp
cHRpb25zICovCiAjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAJVVRfTElTVF9OT0RFX1QoZGljdF9p
bmRleF90KQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=