From: marko.makela
Date: June 15 2011 7:17am
Subject: bzr commit into mysql-5.1 branch (marko.makela:3648) Bug#12650861
List-Archive: http://lists.mysql.com/commits/139206
X-Bug: 12650861
Message-Id: <201106150717.p5F7HVpD012232@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0300063512=="

--===============0300063512==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjEvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE0MDU0MDMyLXlzOGI2
aDZzNzd3dXJodWYKCiAzNjQ4IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDYtMTUKICAgICAgSW50cm9k
dWNlIFVOSVZfQkxPQl9OVUxMX0RFQlVHIGZvciB0ZW1wb3JhcmlseSBoaWRpbmcgQnVnIzEyNjUw
ODYxLgogICAgICBTb21lIHV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybigpKSBhc3NlcnRp
b24gZmFpbHVyZXMgYXJlIGluZGljYXRpbmcKICAgICAgZ2VudWluZSBCTE9CIGJ1Z3MsIG90aGVy
cyBhcmUgYm9ndXMgZmFpbHVyZXMgd2hlbiByb2xsaW5nIGJhY2sgaW5jb21wbGV0ZQogICAgICB0
cmFuc2FjdGlvbnMgYXQgY3Jhc2ggcmVjb3ZlcnkuIFRoaXMgbmVlZHMgbW9yZSB3b3JrLCBhbmQg
dW50aWwgSSBnZXQgYQogICAgICBjaGFuY2UgdG8gd29yayBvbiBpdCwgb3RoZXIgdGVzdGluZyBt
dXN0IG5vdCBiZSBkaXNydXB0ZWQgYnkgdGhpcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9y
ZW0wcmVjLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwcm93LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2J0ci9idHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvcmVtMHJl
Yy5oCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JlbTByZWMuaWMKICAgICAg
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pCiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9yb3cvcm93MHJvdy5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93
MHZlcnMuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDByZWMuYwo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTA2MTQwNTQwMzIteXM4YjZoNnM3N3d1cmh1ZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9i
dHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzE2NTktN2M4
YTlhcGN3MDY5M253OApAQCAtMTU5Miw5ICsxNTkyLDkgQEAgYnRyX2N1cl9vcHRpbWlzdGljX3Vw
ZGF0ZSgKIAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAyNCk7CiAJb2Zmc2V0cyA9IHJlY19n
ZXRfb2Zmc2V0cyhyZWMsIGluZGV4LCBOVUxMLCBVTElOVF9VTkRFRklORUQsICZoZWFwKTsKLSNp
ZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNp
ZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVy
bihyZWMsIG9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdI
VF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKICNpZmRlZiBV
TklWX0RFQlVHCiAJaWYgKGJ0cl9jdXJfcHJpbnRfcmVjb3JkX29wcyAmJiB0aHIpIHsKCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNjE0MDU0MDMyLXlzOGI2aDZzNzd3dXJodWYKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3JlbTByZWMuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDYxNTA3MTY1OS03YzhhOWFwY3cwNjkzbnc4CkBAIC0zMzksNyArMzM5LDcgQEAgcmVjX29mZnNf
YW55X2V4dGVybigKIC8qPT09PT09PT09PT09PT09PSovCiAJCQkJLyogb3V0OiBUUlVFIGlmIGEg
ZmllbGQgaXMgc3RvcmVkIGV4dGVybmFsbHkgKi8KIAljb25zdCB1bGludCoJb2Zmc2V0cyk7Lyog
aW46IGFycmF5IHJldHVybmVkIGJ5IHJlY19nZXRfb2Zmc2V0cygpICovCi0jaWYgZGVmaW5lZCBV
TklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9C
TE9CX05VTExfREVCVUcKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKgogRGV0ZXJtaW5lIGlmIHRoZSBvZmZzZXRzIGFyZSBmb3IgYSByZWNv
cmQgY29udGFpbmluZyBudWxsIEJMT0IgcG9pbnRlcnMuICovCiBVTklWX0lOTElORQpAQCAtMzUx
LDcgKzM1MSw3IEBAIHJlY19vZmZzX2FueV9udWxsX2V4dGVybigKIAkJCQkJb3IgTlVMTCBpZiBu
b25lIGZvdW5kICovCiAJcmVjX3QqCQlyZWMsCQkvKiE8IGluOiByZWNvcmQgKi8KIAljb25zdCB1
bGludCoJb2Zmc2V0cyk7CS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMpICovCi0jZW5kaWYg
LyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklW
X0JMT0JfTlVMTF9ERUJVRyAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKgogU2V0cyB0aGUgdmFsdWUgb2YgdGhlIGl0aCBm
aWVsZCBleHRlcm4gc3RvcmFnZSBiaXQuICovCiBVTklWX0lOTElORQoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDYxNDA1NDAzMi15czhiNmg2czc3d3VyaHVmCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9yZW0wcmVjLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDcx
NjU5LTdjOGE5YXBjdzA2OTNudzgKQEAgLTEwMjEsNyArMTAyMSw3IEBAIHJlY19vZmZzX2FueV9l
eHRlcm4oCiAJcmV0dXJuKEZBTFNFKTsKIH0KIAotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBk
ZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVH
CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioKIERldGVybWluZSBpZiB0aGUgb2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3JkIGNvbnRhaW5pbmcg
bnVsbCBCTE9CIHBvaW50ZXJzLiAqLwogVU5JVl9JTkxJTkUKQEAgLTEwNTUsNyArMTA1NSw3IEBA
IHJlY19vZmZzX2FueV9udWxsX2V4dGVybigKIAogCXJldHVybihOVUxMKTsKIH0KLSNlbmRpZiAv
KiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZf
QkxPQl9OVUxMX0RFQlVHICovCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioKIFNldHMgdGhlIHZhbHVlIG9mIHRoZSBpdGgg
ZmllbGQgZXh0ZXJuIHN0b3JhZ2UgYml0LiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91
bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTQwNTQwMzIteXM4YjZo
NnM3N3d1cmh1ZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDcxNjU5LTdjOGE5YXBjdzA2OTNudzgKQEAg
LTg4LDggKzg4LDggQEAgbWVtb3J5IGlzIHJlYWQgb3V0c2lkZSB0aGUgYWxsb2NhdGVkIGJsbwog
I2lmIDAKICNkZWZpbmUgVU5JVl9ERUJVR19WQUxHUklORAkJCS8qIEVuYWJsZSBleHRyYQogCQkJ
CQkJVmFsZ3JpbmQgaW5zdHJ1bWVudGF0aW9uICovCi0jZGVmaW5lIFVOSVZfQkxPQl9MSUdIVF9E
RUJVRwkJCS8qIEVuYWJsZSBvZmYtcGFnZSBjb2x1bW4KLQkJCQkJCWRlYnVnZ2luZyB3aXRob3V0
IFVOSVZfREVCVUcgKi8KKyNkZWZpbmUgVU5JVl9CTE9CX05VTExfREVCVUcJCQkvKiBFbmFibGUg
ZGVlcCBvZmYtcGFnZQorCQkJCQkJY29sdW1uIGRlYnVnZ2luZyAqLwogI2RlZmluZSBVTklWX0RF
QlVHCQkJCS8qIEVuYWJsZSB1dF9hZCgpIGFzc2VydGlvbnMgKi8KICNkZWZpbmUgVU5JVl9MSVNU
X0RFQlVHCQkJCS8qIGRlYnVnIFVUX0xJU1RfIG1hY3JvcyAqLwogI2RlZmluZSBVTklWX01FTV9E
RUJVRwkJCQkvKiBkZXRlY3QgbWVtb3J5IGxlYWtzIGV0YyAqLwoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE0MDU0MDMy
LXlzOGI2aDZzNzd3dXJodWYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDcxNjU5LTdjOGE5YXBjdzA2OTNu
dzgKQEAgLTIxMCwxMyArMjEwLDEzIEBAIHJvd19idWlsZCgKIAkJdXRfYWQocmVjX29mZnNfdmFs
aWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOwogCX0KIAotI2lmIDAvKiBkZWZpbmVkIFVOSVZf
REVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcqLworI2lmIDAgJiYgZGVmaW5l
ZCBVTklWX0JMT0JfTlVMTF9ERUJVRwogCS8qIFRoaXMgb25lIGNhbiBmYWlsIGluIHRyeF9yb2xs
YmFja19vcl9jbGVhbl9hbGxfd2l0aG91dF9zZXNzKCkKIAlpZiB0aGUgc2VydmVyIGNyYXNoZWQg
ZHVyaW5nIGFuIGluc2VydCBiZWZvcmUgdGhlCiAJYnRyX3N0b3JlX2JpZ19yZWNfZXh0ZXJuX2Zp
ZWxkcygpIGRpZCBtdHJfY29tbWl0KCkKIAlhbGwgQkxPQiBwb2ludGVycyB0byB0aGUgY2x1c3Rl
cmVkIGluZGV4IHJlY29yZC4gKi8KIAl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVj
LCBvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVC
VUcgKi8KKyNlbmRpZiAvKiAwICYmIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKIAlpZiAodHlw
ZSAhPSBST1dfQ09QWV9QT0lOVEVSUykgewogCQkvKiBUYWtlIGEgY29weSBvZiByZWMgdG8gaGVh
cCAqLwpAQCAtMzEwLDEwICszMTAsMTAgQEAgcm93X3JlY190b19pbmRleF9lbnRyeSgKIAkJcmVj
ID0gcmVjX2NvcHkoYnVmLCByZWMsIG9mZnNldHMpOwogCQkvKiBBdm9pZCBhIGRlYnVnIGFzc2Vy
dGlvbiBpbiByZWNfb2Zmc192YWxpZGF0ZSgpLiAqLwogCQlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJl
YywgaW5kZXgsIG9mZnNldHMpOwotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVO
SVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJfSBlbHNl
IHsKIAkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOwotI2Vu
ZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyog
VU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAl9CiAKIAlyZWNfbGVuID0gcmVjX29mZnNfbl9maWVs
ZHMob2Zmc2V0cyk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHZlcnMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNDA1NDAzMi15czhiNmg2czc3d3VyaHVmCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA2MTUwNzE2NTktN2M4YTlhcGN3MDY5M253OApAQCAtNDczLDEwICs0NzMsMTAg
QEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgKIAkJCQkvKiBUaGUgdmlldyBh
bHJlYWR5IHNlZXMgdGhpcyB2ZXJzaW9uOiB3ZSBjYW4KIAkJCQljb3B5IGl0IHRvIGluX2hlYXAg
YW5kIHJldHVybiAqLwogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9C
TE9CX0xJR0hUX0RFQlVHCisjaWYgZGVmaW5lZCBVTklWX0JMT0JfTlVMTF9ERUJVRwogCQkJCXV0
X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybigKIAkJCQkJICAgICB2ZXJzaW9uLCAqb2Zmc2V0
cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisj
ZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCQkJCWJ1ZiA9IG1lbV9oZWFwX2Fs
bG9jKGluX2hlYXAsCiAJCQkJCQkgICAgIHJlY19vZmZzX3NpemUoKm9mZnNldHMpKTsKQEAgLTUx
MSw5ICs1MTEsOSBAQCByb3dfdmVyc19idWlsZF9mb3JfY29uc2lzdGVudF9yZWFkKAogCQkqb2Zm
c2V0cyA9IHJlY19nZXRfb2Zmc2V0cyhwcmV2X3ZlcnNpb24sIGluZGV4LCAqb2Zmc2V0cywKIAkJ
CQkJICAgVUxJTlRfVU5ERUZJTkVELCBvZmZzZXRfaGVhcCk7CiAKLSNpZiBkZWZpbmVkIFVOSVZf
REVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0Jf
TlVMTF9ERUJVRwogCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocHJldl92ZXJzaW9u
LCAqb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCQl0cnhfaWQgPSBy
b3dfZ2V0X3JlY190cnhfaWQocHJldl92ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMpOwogCkBAIC02
MTUsOSArNjE1LDkgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAog
CQkJLyogV2UgZm91bmQgYSB2ZXJzaW9uIHRoYXQgYmVsb25ncyB0byBhCiAJCQljb21taXR0ZWQg
dHJhbnNhY3Rpb246IHJldHVybiBpdC4gKi8KIAotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBk
ZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVH
CiAJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4odmVyc2lvbiwgKm9mZnNldHMpKTsK
LSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlm
IC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKIAkJCWlmIChyZWMgPT0gdmVyc2lvbikgewog
CQkJCSpvbGRfdmVycyA9IHJlYzsKQEAgLTY3Niw5ICs2NzYsOSBAQCByb3dfdmVyc19idWlsZF9m
b3Jfc2VtaV9jb25zaXN0ZW50X3JlYWQoCiAJCXZlcnNpb24gPSBwcmV2X3ZlcnNpb247CiAJCSpv
ZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHZlcnNpb24sIGluZGV4LCAqb2Zmc2V0cywKIAkJCQkJ
ICAgVUxJTlRfVU5ERUZJTkVELCBvZmZzZXRfaGVhcCk7Ci0jaWYgZGVmaW5lZCBVTklWX0RFQlVH
IHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExf
REVCVUcKIAkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHZlcnNpb24sICpvZmZzZXRz
KSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNl
bmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCX0vKiBmb3IgKDs7KSAqLwogCiAJaWYg
KGhlYXApIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVj
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDYxNDA1NDAzMi15czhiNmg2czc3d3VyaHVmCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDYxNTA3MTY1OS03YzhhOWFwY3cwNjkzbnc4CkBAIC0xMzk3LDkgKzEzOTcsOSBAQCB0cnhf
dW5kb19wcmV2X3ZlcnNpb25fYnVpbGQoCiAJCXJldHVybihEQl9FUlJPUik7CiAJfQogCi0jIGlm
IGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworIyBp
ZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVy
bihyZWMsIG9mZnNldHMpKTsKLSMgZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElH
SFRfREVCVUcgKi8KKyMgZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCWlmIChy
b3dfdXBkX2NoYW5nZXNfZmllbGRfc2l6ZV9vcl9leHRlcm5hbChpbmRleCwgb2Zmc2V0cywgdXBk
YXRlKSkgewogCQl1bGludCoJZXh0X3ZlY3Q7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9i
dHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE0MDU0MDMy
LXlzOGI2aDZzNzd3dXJodWYKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3Vy
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzE2NTktN2M4YTlhcGN3
MDY5M253OApAQCAtMTg3MSw5ICsxODcxLDkgQEAgYnRyX2N1cl9vcHRpbWlzdGljX3VwZGF0ZSgK
IAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAyNCk7CiAJb2Zmc2V0cyA9IHJlY19nZXRfb2Zm
c2V0cyhyZWMsIGluZGV4LCBOVUxMLCBVTElOVF9VTkRFRklORUQsICZoZWFwKTsKLSNpZiBkZWZp
bmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBV
TklWX0JMT0JfTlVMTF9ERUJVRwogCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMs
IG9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJV
RyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKICNpZmRlZiBVTklWX0RF
QlVHCiAJaWYgKGJ0cl9jdXJfcHJpbnRfcmVjb3JkX29wcyAmJiB0aHIpIHsKCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9yZW0wcmVjLmgnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JlbTByZWMuaAlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDExMDYxNDA1NDAzMi15czhiNmg2czc3d3VyaHVmCisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JlbTByZWMuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDYxNTA3MTY1OS03YzhhOWFwY3cwNjkzbnc4CkBAIC00ODAsNyArNDgwLDcgQEAg
dWxpbnQKIHJlY19vZmZzX2FueV9leHRlcm4oCiAvKj09PT09PT09PT09PT09PT0qLwogCWNvbnN0
IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiBhcnJheSByZXR1cm5lZCBieSByZWNfZ2V0X29mZnNl
dHMoKSAqLwotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdI
VF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogRGV0ZXJtaW5lIGlmIHRo
ZSBvZmZzZXRzIGFyZSBmb3IgYSByZWNvcmQgY29udGFpbmluZyBudWxsIEJMT0IgcG9pbnRlcnMu
CiBAcmV0dXJuCWZpcnN0IGZpZWxkIGNvbnRhaW5pbmcgYSBudWxsIEJMT0IgcG9pbnRlciwgb3Ig
TlVMTCBpZiBub25lIGZvdW5kICovCkBAIC00OTEsNyArNDkxLDcgQEAgcmVjX29mZnNfYW55X251
bGxfZXh0ZXJuKAogCWNvbnN0IHJlY190KglyZWMsCQkvKiE8IGluOiByZWNvcmQgKi8KIAljb25z
dCB1bGludCoJb2Zmc2V0cykJLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYykgKi8KIAlfX2F0
dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsKLSNlbmRpZiAvKiBVTklW
X0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9O
VUxMX0RFQlVHICovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLy8qKgogUmV0dXJucyBub256ZXJvIGlmIHRoZSBleHRlcm4gYml0IGlzIHNl
dCBpbiBudGggZmllbGQgb2YgcmVjLgogQHJldHVybglub256ZXJvIGlmIGV4dGVybmFsbHkgc3Rv
cmVkICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
cmVtMHJlYy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvcmVtMHJlYy5p
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNDA1NDAzMi15czhiNmg2czc3
d3VyaHVmCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JlbTByZWMuaWMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzE2NTktN2M4YTlhcGN3MDY5M253
OApAQCAtMTA4OCw3ICsxMDg4LDcgQEAgcmVjX29mZnNfYW55X2V4dGVybigKIAlyZXR1cm4oVU5J
Vl9VTkxJS0VMWSgqcmVjX29mZnNfYmFzZShvZmZzZXRzKSAmIFJFQ19PRkZTX0VYVEVSTkFMKSk7
CiB9CiAKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIERldGVybWluZSBpZiB0aGUg
b2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3JkIGNvbnRhaW5pbmcgbnVsbCBCTE9CIHBvaW50ZXJzLgog
QHJldHVybglmaXJzdCBmaWVsZCBjb250YWluaW5nIGEgbnVsbCBCTE9CIHBvaW50ZXIsIG9yIE5V
TEwgaWYgbm9uZSBmb3VuZCAqLwpAQCAtMTEyNCw3ICsxMTI0LDcgQEAgcmVjX29mZnNfYW55X251
bGxfZXh0ZXJuKAogCiAJcmV0dXJuKE5VTEwpOwogfQotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcg
Ki8KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKIFJldHVybnMgbm9uemVybyBpZiB0aGUgZXh0ZXJuIGJpdCBpcyBzZXQgaW4gbnRo
IGZpZWxkIG9mIHJlYy4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4v
aW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYu
aQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNDA1NDAzMi15czhiNmg2czc3
d3VyaHVmCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaQlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNTA3MTY1OS03YzhhOWFwY3cwNjkzbnc4CkBA
IC0xNzksNiArMTc5LDggQEAgY29tbWFuZC4gTm90IHRlc3RlZCBvbiBXaW5kb3dzLiAqLwogCQkJ
CQkJZGVidWdnaW5nIHdpdGhvdXQgVU5JVl9ERUJVRyAqLwogI2RlZmluZSBVTklWX0JMT0JfTElH
SFRfREVCVUcJCQkvKiBFbmFibGUgb2ZmLXBhZ2UgY29sdW1uCiAJCQkJCQlkZWJ1Z2dpbmcgd2l0
aG91dCBVTklWX0RFQlVHICovCisjZGVmaW5lIFVOSVZfQkxPQl9OVUxMX0RFQlVHCQkJLyogRW5h
YmxlIGRlZXAgb2ZmLXBhZ2UKKwkJCQkJCWNvbHVtbiBkZWJ1Z2dpbmcgKi8KICNkZWZpbmUgVU5J
Vl9ERUJVRwkJCQkvKiBFbmFibGUgdXRfYWQoKSBhc3NlcnRpb25zCiAJCQkJCQlhbmQgZGlzYWJs
ZSBVTklWX0lOTElORSAqLwogI2RlZmluZSBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUJCS8qIEVu
YWJsZQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHJv
dy5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzByb3cuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNDA1NDAzMi15czhiNmg2czc3d3VyaHVmCisrKyBi
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTEwNjE1MDcxNjU5LTdjOGE5YXBjdzA2OTNudzgKQEAgLTIzMSwxMyArMjMx
LDEzIEBAIHJvd19idWlsZCgKIAkJdXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwg
b2Zmc2V0cykpOwogCX0KIAotI2lmIDAgLyogZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjaWYgMCAmJiBkZWZpbmVkIFVOSVZfQkxPQl9OVUxM
X0RFQlVHCiAJLyogVGhpcyBvbmUgY2FuIGZhaWwgaW4gdHJ4X3JvbGxiYWNrX2FjdGl2ZSgpIGlm
CiAJdGhlIHNlcnZlciBjcmFzaGVkIGR1cmluZyBhbiBpbnNlcnQgYmVmb3JlIHRoZQogCWJ0cl9z
dG9yZV9iaWdfcmVjX2V4dGVybl9maWVsZHMoKSBkaWQgbXRyX2NvbW1pdCgpCiAJYWxsIEJMT0Ig
cG9pbnRlcnMgdG8gdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQuICovCiAJdXRfYSghcmVjX29m
ZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcg
fHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogMCAmJiBVTklWX0JMT0JfTlVM
TF9ERUJVRyAqLwogCiAJaWYgKHR5cGUgIT0gUk9XX0NPUFlfUE9JTlRFUlMpIHsKIAkJLyogVGFr
ZSBhIGNvcHkgb2YgcmVjIHRvIGhlYXAgKi8KQEAgLTQyMywxMCArNDIzLDEwIEBAIHJvd19yZWNf
dG9faW5kZXhfZW50cnkoCiAJCXJlYyA9IHJlY19jb3B5KGJ1ZiwgcmVjLCBvZmZzZXRzKTsKIAkJ
LyogQXZvaWQgYSBkZWJ1ZyBhc3NlcnRpb24gaW4gcmVjX29mZnNfdmFsaWRhdGUoKS4gKi8KIAkJ
cmVjX29mZnNfbWFrZV92YWxpZChyZWMsIGluZGV4LCBvZmZzZXRzKTsKLSNpZiBkZWZpbmVkIFVO
SVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JM
T0JfTlVMTF9ERUJVRwogCX0gZWxzZSB7CiAJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVy
bihyZWMsIG9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdI
VF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAJfQogCiAJZW50
cnkgPSByb3dfcmVjX3RvX2luZGV4X2VudHJ5X2xvdyhyZWMsIGluZGV4LCBvZmZzZXRzLCBuX2V4
dCwgaGVhcCk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9y
b3cwdmVycy5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB2ZXJzLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTQwNTQwMzIteXM4YjZoNnM3N3d1cmh1
ZgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB2ZXJzLmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzE2NTktN2M4YTlhcGN3MDY5M253OApAQCAtNTUw
LDEwICs1NTAsMTAgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgKIAkJCQkv
KiBUaGUgdmlldyBhbHJlYWR5IHNlZXMgdGhpcyB2ZXJzaW9uOiB3ZSBjYW4KIAkJCQljb3B5IGl0
IHRvIGluX2hlYXAgYW5kIHJldHVybiAqLwogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRl
ZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcK
IAkJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4oCiAJCQkJCSAgICAgdmVyc2lvbiwg
Km9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJV
RyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKIAkJCQlidWYgPSBtZW1f
aGVhcF9hbGxvYyhpbl9oZWFwLAogCQkJCQkJICAgICByZWNfb2Zmc19zaXplKCpvZmZzZXRzKSk7
CkBAIC01ODgsOSArNTg4LDkgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgK
IAkJKm9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocHJldl92ZXJzaW9uLCBpbmRleCwgKm9mZnNl
dHMsCiAJCQkJCSAgIFVMSU5UX1VOREVGSU5FRCwgb2Zmc2V0X2hlYXApOwogCi0jaWYgZGVmaW5l
ZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5J
Vl9CTE9CX05VTExfREVCVUcKIAkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHByZXZf
dmVyc2lvbiwgKm9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9M
SUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKIAkJdHJ4
X2lkID0gcm93X2dldF9yZWNfdHJ4X2lkKHByZXZfdmVyc2lvbiwgaW5kZXgsICpvZmZzZXRzKTsK
IApAQCAtNjkxLDkgKzY5MSw5IEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRf
cmVhZCgKIAkJCS8qIFdlIGZvdW5kIGEgdmVyc2lvbiB0aGF0IGJlbG9uZ3MgdG8gYQogCQkJY29t
bWl0dGVkIHRyYW5zYWN0aW9uOiByZXR1cm4gaXQuICovCiAKLSNpZiBkZWZpbmVkIFVOSVZfREVC
VUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVM
TF9ERUJVRwogCQkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHZlcnNpb24sICpvZmZz
ZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8K
KyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAJCQlpZiAocmVjID09IHZlcnNp
b24pIHsKIAkJCQkqb2xkX3ZlcnMgPSByZWM7CkBAIC03NTIsOSArNzUyLDkgQEAgcm93X3ZlcnNf
YnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAogCQl2ZXJzaW9uID0gcHJldl92ZXJzaW9u
OwogCQkqb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyh2ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMs
CiAJCQkJCSAgIFVMSU5UX1VOREVGSU5FRCwgb2Zmc2V0X2hlYXApOwotI2lmIGRlZmluZWQgVU5J
Vl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxP
Ql9OVUxMX0RFQlVHCiAJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybih2ZXJzaW9uLCAq
b2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
ICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAl9LyogZm9yICg7OykgKi8K
IAogCWlmIChoZWFwKSB7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3RyeC90cngwcmVjLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi90cngvdHJ4MHJlYy5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE0MDU0MDMyLXlzOGI2aDZzNzd3
dXJodWYKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwcmVjLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzE2NTktN2M4YTlhcGN3MDY5M253OApAQCAt
MTU3Nyw5ICsxNTc3LDkgQEAgdHJ4X3VuZG9fcHJldl92ZXJzaW9uX2J1aWxkKAogCQlyZXR1cm4o
REJfRVJST1IpOwogCX0KIAotIyBpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklW
X0JMT0JfTElHSFRfREVCVUcKKyMgaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIAl1dF9hKCFy
ZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7Ci0jIGVuZGlmIC8qIFVOSVZf
REVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjIGVuZGlmIC8qIFVOSVZfQkxPQl9O
VUxMX0RFQlVHICovCiAKIAlpZiAocm93X3VwZF9jaGFuZ2VzX2ZpZWxkX3NpemVfb3JfZXh0ZXJu
YWwoaW5kZXgsIG9mZnNldHMsIHVwZGF0ZSkpIHsKIAkJdWxpbnQJbl9leHQ7Cgo=

--===============0300063512==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marko.makela@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.1/
# testament_sha1: 57df958d71d8b278b51268eae58589aa7aa8a550
# timestamp: 2011-06-15 10:17:23 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: marko.makela@stripped\
#   ys8b6h6s77wurhuf
# 
# Begin bundle
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
ILTY42A=


--===============0300063512==--