From: marko.makela
Date: June 9 2011 10:59am
Subject: bzr commit into mysql-5.5 branch (marko.makela:3433)
List-Archive: http://lists.mysql.com/commits/138940
Message-Id: <201106091059.p59AxpHX010686@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0301133468=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xlLmNvbS0yMDExMDYwODEzNDQ1MC0xZDBv
cGFicGd6cDM2emE2CgogMzQzMyBNYXJrbyBNw6RrZWzDpAkyMDExLTA2LTA5IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS4xIHRvIG15c3FsLTUuNS4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9yZW0wcmVjLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzB2ZXJzLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwlyZXZpZDpkbWl0cnkuc2h1bGdhQG9yYWNsZS5jb20t
MjAxMTA2MDgxMzQ0NTAtMWQwb3BhYnBnenAzNnphNgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0
ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MDkxMDU5MDIt
cHBidmQ2czJleWF2ZGsyZwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgog
Ci1Db3B5cmlnaHQgKGMpIDE5OTQsIDIwMTAsIElubm9iYXNlIE95LiBBbGwgUmlnaHRzIFJlc2Vy
dmVkLgorQ29weXJpZ2h0IChjKSAxOTk0LCAyMDExLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlh
dGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogQ29weXJpZ2h0IChjKSAyMDA4LCBHb29nbGUgSW5j
LgogCiBQb3J0aW9ucyBvZiB0aGlzIGZpbGUgY29udGFpbiBtb2RpZmljYXRpb25zIGNvbnRyaWJ1
dGVkIGFuZCBjb3B5cmlnaHRlZCBieQpAQCAtMTk4OSw2ICsxOTg5LDkgQEAgYnRyX2N1cl9vcHRp
bWlzdGljX3VwZGF0ZSgKIAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAyNCk7CiAJb2Zmc2V0
cyA9IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4LCBOVUxMLCBVTElOVF9VTkRFRklORUQsICZo
ZWFwKTsKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKKwl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7Cisj
ZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KIAogI2lmZGVm
IFVOSVZfREVCVUcKIAlpZiAoYnRyX2N1cl9wcmludF9yZWNvcmRfb3BzICYmIHRocikgewoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBv
cmFjbGUuY29tLTIwMTEwNjA4MTM0NDUwLTFkMG9wYWJwZ3pwMzZ6YTYKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDYwOTEwNTkwMi1wcGJ2ZDZzMmV5YXZkazJnCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqCiAKLUNvcHlyaWdodCAoYykgMTk5NCwgMjAwOSwgSW5ub2Jhc2UgT3kuIEFs
bCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTQsIDIwMTEsIE9yYWNsZSBhbmQv
b3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3JhbSBp
cyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0
IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1
Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtNDgwLDYgKzQ4MCwxOCBAQCB1bGludAog
cmVjX29mZnNfYW55X2V4dGVybigKIC8qPT09PT09PT09PT09PT09PSovCiAJY29uc3QgdWxpbnQq
CW9mZnNldHMpOy8qITwgaW46IGFycmF5IHJldHVybmVkIGJ5IHJlY19nZXRfb2Zmc2V0cygpICov
CisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
CisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgorRGV0ZXJtaW5lIGlmIHRoZSBvZmZzZXRzIGFyZSBmb3IgYSByZWNvcmQgY29udGFpbmlu
ZyBudWxsIEJMT0IgcG9pbnRlcnMuCitAcmV0dXJuCWZpcnN0IGZpZWxkIGNvbnRhaW5pbmcgYSBu
dWxsIEJMT0IgcG9pbnRlciwgb3IgTlVMTCBpZiBub25lIGZvdW5kICovCitVTklWX0lOTElORQor
Y29uc3QgYnl0ZSoKK3JlY19vZmZzX2FueV9udWxsX2V4dGVybigKKy8qPT09PT09PT09PT09PT09
PT09PT09Ki8KKwljb25zdCByZWNfdCoJcmVjLAkJLyohPCBpbjogcmVjb3JkICovCisJY29uc3Qg
dWxpbnQqCW9mZnNldHMpCS8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMpICovCisJX19hdHRy
aWJ1dGVfXygobm9ubnVsbCwgd2Fybl91bnVzZWRfcmVzdWx0KSk7CisjZW5kaWYgLyogVU5JVl9E
RUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KIC8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIG5vbnplcm8gaWYg
dGhlIGV4dGVybiBiaXQgaXMgc2V0IGluIG50aCBmaWVsZCBvZiByZWMuCiBAcmV0dXJuCW5vbnpl
cm8gaWYgZXh0ZXJuYWxseSBzdG9yZWQgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3JlbTByZWMuaWMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNjA4MTM0NDUw
LTFkMG9wYWJwZ3pwMzZ6YTYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMu
aWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MDkxMDU5MDItcHBidmQ2czJl
eWF2ZGsyZwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmln
aHQgKGMpIDE5OTQsIDIwMDksIElubm9iYXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgorQ29w
eXJpZ2h0IChjKSAxOTk0LCAyMDExLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwg
UmlnaHRzIFJlc2VydmVkLgogCiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh
biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRlcgogdGhlIHRlcm1zIG9mIHRo
ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29m
dHdhcmUKQEAgLTI2LDYgKzI2LDcgQEAgQ3JlYXRlZCA1LzMwLzE5OTQgSGVpa2tpIFR1dXJpCiAj
aW5jbHVkZSAibWFjaDBkYXRhLmgiCiAjaW5jbHVkZSAidXQwYnl0ZS5oIgogI2luY2x1ZGUgImRp
Y3QwZGljdC5oIgorI2luY2x1ZGUgImJ0cjB0eXBlcy5oIgogCiAvKiBDb21wYWN0IGZsYWcgT1Jl
ZCB0byB0aGUgZXh0cmEgc2l6ZSByZXR1cm5lZCBieSByZWNfZ2V0X29mZnNldHMoKSAqLwogI2Rl
ZmluZSBSRUNfT0ZGU19DT01QQUNUCSgodWxpbnQpIDEgPDwgMzEpCkBAIC0xMDg3LDYgKzEwODgs
NDQgQEAgcmVjX29mZnNfYW55X2V4dGVybigKIAlyZXR1cm4oVU5JVl9VTkxJS0VMWSgqcmVjX29m
ZnNfYmFzZShvZmZzZXRzKSAmIFJFQ19PRkZTX0VYVEVSTkFMKSk7CiB9CiAKKyNpZiBkZWZpbmVk
IFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKy8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitEZXRlcm1p
bmUgaWYgdGhlIG9mZnNldHMgYXJlIGZvciBhIHJlY29yZCBjb250YWluaW5nIG51bGwgQkxPQiBw
b2ludGVycy4KK0ByZXR1cm4JZmlyc3QgZmllbGQgY29udGFpbmluZyBhIG51bGwgQkxPQiBwb2lu
dGVyLCBvciBOVUxMIGlmIG5vbmUgZm91bmQgKi8KK1VOSVZfSU5MSU5FCitjb25zdCBieXRlKgor
cmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAorLyo9PT09PT09PT09PT09PT09PT09PT0qLworCWNv
bnN0IHJlY190KglyZWMsCQkvKiE8IGluOiByZWNvcmQgKi8KKwljb25zdCB1bGludCoJb2Zmc2V0
cykJLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYykgKi8KK3sKKwl1bGludAlpOworCXV0X2Fk
KHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgTlVMTCwgb2Zmc2V0cykpOworCisJaWYgKCFyZWNfb2Zm
c19hbnlfZXh0ZXJuKG9mZnNldHMpKSB7CisJCXJldHVybihOVUxMKTsKKwl9CisKKwlmb3IgKGkg
PSAwOyBpIDwgcmVjX29mZnNfbl9maWVsZHMob2Zmc2V0cyk7IGkrKykgeworCQlpZiAocmVjX29m
ZnNfbnRoX2V4dGVybihvZmZzZXRzLCBpKSkgeworCQkJdWxpbnQJCWxlbjsKKwkJCWNvbnN0IGJ5
dGUqCWZpZWxkCisJCQkJPSByZWNfZ2V0X250aF9maWVsZChyZWMsIG9mZnNldHMsIGksICZsZW4p
OworCisJCQl1dF9hKGxlbiA+PSBCVFJfRVhURVJOX0ZJRUxEX1JFRl9TSVpFKTsKKwkJCWlmICgh
bWVtY21wKGZpZWxkICsgbGVuCisJCQkJICAgIC0gQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSwK
KwkJCQkgICAgZmllbGRfcmVmX3plcm8sCisJCQkJICAgIEJUUl9FWFRFUk5fRklFTERfUkVGX1NJ
WkUpKSB7CisJCQkJcmV0dXJuKGZpZWxkKTsKKwkJCX0KKwkJfQorCX0KKworCXJldHVybihOVUxM
KTsKK30KKyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLwor
CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgogUmV0dXJucyBub256ZXJvIGlmIHRoZSBleHRlcm4gYml0IGlzIHNldCBpbiBudGggZmll
bGQgb2YgcmVjLgogQHJldHVybglub256ZXJvIGlmIGV4dGVybmFsbHkgc3RvcmVkICovCgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29t
LTIwMTEwNjA4MTM0NDUwLTFkMG9wYWJwZ3pwMzZ6YTYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTA1OTAy
LXBwYnZkNnMyZXlhdmRrMmcKQEAgLTEsNiArMSw2IEBACiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioK
IAotQ29weXJpZ2h0IChjKSAxOTk2LCAyMDEwLCBJbm5vYmFzZSBPeS4gQWxsIFJpZ2h0cyBSZXNl
cnZlZC4KK0NvcHlyaWdodCAoYykgMTk5NiwgMjAxMSwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxp
YXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KIAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdh
cmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRoZSB0
ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRo
ZSBGcmVlIFNvZnR3YXJlCkBAIC0yMDAsNiArMjAwLDEwIEBAIHJvd19idWlsZCgKIAkJdXRfYWQo
cmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOwogCX0KIAorI2lmIGRlZmlu
ZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworCXV0X2EoIXJl
Y19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsKKyNlbmRpZiAvKiBVTklWX0RF
QlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworCiAJaWYgKHR5cGUgIT0gUk9XX0NPUFlf
UE9JTlRFUlMpIHsKIAkJLyogVGFrZSBhIGNvcHkgb2YgcmVjIHRvIGhlYXAgKi8KIAkJYnVmID0g
bWVtX2hlYXBfYWxsb2MoaGVhcCwgcmVjX29mZnNfc2l6ZShvZmZzZXRzKSk7CkBAIC0zODMsNiAr
Mzg3LDEwIEBAIHJvd19yZWNfdG9faW5kZXhfZW50cnkoCiAJCXJlYyA9IHJlY19jb3B5KGJ1Ziwg
cmVjLCBvZmZzZXRzKTsKIAkJLyogQXZvaWQgYSBkZWJ1ZyBhc3NlcnRpb24gaW4gcmVjX29mZnNf
dmFsaWRhdGUoKS4gKi8KIAkJcmVjX29mZnNfbWFrZV92YWxpZChyZWMsIGluZGV4LCBvZmZzZXRz
KTsKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVC
VUcKKwl9IGVsc2UgeworCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZz
ZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8K
IAl9CiAKIAllbnRyeSA9IHJvd19yZWNfdG9faW5kZXhfZW50cnlfbG93KHJlYywgaW5kZXgsIG9m
ZnNldHMsIG5fZXh0LCBoZWFwKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwdmVycy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCXJl
dmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xlLmNvbS0yMDExMDYwODEzNDQ1MC0xZDBvcGFicGd6cDM2
emE2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA2MDkxMDU5MDItcHBidmQ2czJleWF2ZGsyZwpAQCAtMSw2ICsx
LDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTcsIDIwMDks
IElubm9iYXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAxOTk3LCAy
MDExLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgog
CiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg
YW5kL29yIG1vZGlmeSBpdCB1bmRlcgogdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJs
aWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTU1MCw2ICs1
NTAsMTEgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgKIAkJCQkvKiBUaGUg
dmlldyBhbHJlYWR5IHNlZXMgdGhpcyB2ZXJzaW9uOiB3ZSBjYW4KIAkJCQljb3B5IGl0IHRvIGlu
X2hlYXAgYW5kIHJldHVybiAqLwogCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCQkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJu
KAorCQkJCQkgICAgIHZlcnNpb24sICpvZmZzZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8
fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwogCQkJCWJ1ZiA9IG1lbV9oZWFwX2FsbG9jKGlu
X2hlYXAsCiAJCQkJCQkgICAgIHJlY19vZmZzX3NpemUoKm9mZnNldHMpKTsKIAkJCQkqb2xkX3Zl
cnMgPSByZWNfY29weShidWYsIHZlcnNpb24sICpvZmZzZXRzKTsKQEAgLTU4Myw2ICs1ODgsMTAg
QEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgKIAkJKm9mZnNldHMgPSByZWNf
Z2V0X29mZnNldHMocHJldl92ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMsCiAJCQkJCSAgIFVMSU5U
X1VOREVGSU5FRCwgb2Zmc2V0X2hlYXApOwogCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRl
ZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4
dGVybihwcmV2X3ZlcnNpb24sICpvZmZzZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBV
TklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwogCQl0cnhfaWQgPSByb3dfZ2V0X3JlY190cnhfaWQo
cHJldl92ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMpOwogCiAJCWlmIChyZWFkX3ZpZXdfc2Vlc190
cnhfaWQodmlldywgdHJ4X2lkKSkgewpAQCAtNjgyLDYgKzY5MSwxMCBAQCByb3dfdmVyc19idWls
ZF9mb3Jfc2VtaV9jb25zaXN0ZW50X3JlYWQoCiAJCQkvKiBXZSBmb3VuZCBhIHZlcnNpb24gdGhh
dCBiZWxvbmdzIHRvIGEKIAkJCWNvbW1pdHRlZCB0cmFuc2FjdGlvbjogcmV0dXJuIGl0LiAqLwog
CisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
CisJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4odmVyc2lvbiwgKm9mZnNldHMpKTsK
KyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworCiAJCQlp
ZiAocmVjID09IHZlcnNpb24pIHsKIAkJCQkqb2xkX3ZlcnMgPSByZWM7CiAJCQkJZXJyID0gREJf
U1VDQ0VTUzsKQEAgLTczOSw2ICs3NTIsOSBAQCByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25z
aXN0ZW50X3JlYWQoCiAJCXZlcnNpb24gPSBwcmV2X3ZlcnNpb247CiAJCSpvZmZzZXRzID0gcmVj
X2dldF9vZmZzZXRzKHZlcnNpb24sIGluZGV4LCAqb2Zmc2V0cywKIAkJCQkJICAgVUxJTlRfVU5E
RUZJTkVELCBvZmZzZXRfaGVhcCk7CisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybih2
ZXJzaW9uLCAqb2Zmc2V0cykpOworI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJ
R0hUX0RFQlVHICovCiAJfS8qIGZvciAoOzspICovCiAKIAlpZiAoaGVhcCkgewoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS90cngvdHJ4MHJlYy5jCXJldmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xlLmNvbS0yMDEx
MDYwODEzNDQ1MC0xZDBvcGFicGd6cDM2emE2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3Ry
eDByZWMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYwOTEwNTkwMi1wcGJ2
ZDZzMmV5YXZkazJnCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNv
cHlyaWdodCAoYykgMTk5NiwgMjAxMCwgSW5ub2Jhc2UgT3kuIEFsbCBSaWdodHMgUmVzZXJ2ZWQu
CitDb3B5cmlnaHQgKGMpIDE5OTYsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMu
IEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5
b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMg
b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJl
ZSBTb2Z0d2FyZQpAQCAtMTU5Myw2ICsxNTkzLDEwIEBAIHRyeF91bmRvX3ByZXZfdmVyc2lvbl9i
dWlsZCgKIAkJcmV0dXJuKERCX0VSUk9SKTsKIAl9CiAKKyMgaWYgZGVmaW5lZCBVTklWX0RFQlVH
IHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJdXRfYSghcmVjX29mZnNfYW55X251
bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOworIyBlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZf
QkxPQl9MSUdIVF9ERUJVRyAqLworCiAJaWYgKHJvd191cGRfY2hhbmdlc19maWVsZF9zaXplX29y
X2V4dGVybmFsKGluZGV4LCBvZmZzZXRzLCB1cGRhdGUpKSB7CiAJCXVsaW50CW5fZXh0OwogCgo=

--===============0301133468==
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.5/
# testament_sha1: 61ffcc64cd858718be2517c7b1720b5f89bbafea
# timestamp: 2011-06-09 13:59:41 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: dmitry.shulga@stripped\
#   1d0opabpgzp36za6
# 
# Begin bundle
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
KRBTUsiB/waD3H/i7kinChIcV9vOYA==


--===============0301133468==--