From: marko.makela
Date: June 9 2011 11:01am
Subject: bzr commit into mysql-trunk branch (marko.makela:3172)
List-Archive: http://lists.mysql.com/commits/138941
Message-Id: <201106091102.p59B2S0M030239@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0625974856=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6YWxleGFuZGVyLm5vemRyaW5Ab3JhY2xlLmNvbS0yMDExMDYwOTA5MDMx
OC0wNmxydXBrM2Y4d256OXBzCgogMzE3MiBNYXJrbyBNw6RrZWzDpAkyMDExLTA2LTA5IFttZXJn
ZV0KICAgICAgTWVyZ2UgbXlzcWwtNS41IHRvIG15c3FsLXRydW5rLgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3JlbTByZWMuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJl
Yy5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHZlcnMuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVj
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOmFsZXhhbmRlci5ub3pkcmlu
QG9yYWNsZS5jb20tMjAxMTA2MDkwOTAzMTgtMDZscnVwazNmOHduejlwcworKysgYi9zdG9yYWdl
L2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTA2MDkxMTAwMzgtY3Z3eGVvMDVxMHg0bnNkawpAQCAtMTk4Nyw2ICsxOTg3LDkgQEAgYnRyX2N1
cl9vcHRpbWlzdGljX3VwZGF0ZSgKIAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAyNCk7CiAJ
b2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4LCBOVUxMLCBVTElOVF9VTkRFRklO
RUQsICZoZWFwKTsKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0Jf
TElHSFRfREVCVUcKKwl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRz
KSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KIAog
I2lmZGVmIFVOSVZfREVCVUcKIAlpZiAoYnRyX2N1cl9wcmludF9yZWNvcmRfb3BzICYmIHRocikg
ewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgJcmV2aWQ6YWxleGFuZGVy
Lm5vemRyaW5Ab3JhY2xlLmNvbS0yMDExMDYwOTA5MDMxOC0wNmxydXBrM2Y4d256OXBzCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA2MDkxMTAwMzgtY3Z3eGVvMDVxMHg0bnNkawpAQCAtMSw2ICsxLDYgQEAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTQsIDIwMDksIElubm9i
YXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAxOTk0LCAyMDExLCBP
cmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogCiBUaGlz
IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y
IG1vZGlmeSBpdCB1bmRlcgogdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj
ZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTQ4MCw2ICs0ODAsMTgg
QEAgdWxpbnQKIHJlY19vZmZzX2FueV9leHRlcm4oCiAvKj09PT09PT09PT09PT09PT0qLwogCWNv
bnN0IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiBhcnJheSByZXR1cm5lZCBieSByZWNfZ2V0X29m
ZnNldHMoKSAqLworI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9M
SUdIVF9ERUJVRworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKK0RldGVybWluZSBpZiB0aGUgb2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3Jk
IGNvbnRhaW5pbmcgbnVsbCBCTE9CIHBvaW50ZXJzLgorQHJldHVybglmaXJzdCBmaWVsZCBjb250
YWluaW5nIGEgbnVsbCBCTE9CIHBvaW50ZXIsIG9yIE5VTEwgaWYgbm9uZSBmb3VuZCAqLworVU5J
Vl9JTkxJTkUKK2NvbnN0IGJ5dGUqCityZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4oCisvKj09PT09
PT09PT09PT09PT09PT09PSovCisJY29uc3QgcmVjX3QqCXJlYywJCS8qITwgaW46IHJlY29yZCAq
LworCWNvbnN0IHVsaW50KglvZmZzZXRzKQkvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjKSAq
LworCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOworI2VuZGlm
IC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCiAvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyBu
b256ZXJvIGlmIHRoZSBleHRlcm4gYml0IGlzIHNldCBpbiBudGggZmllbGQgb2YgcmVjLgogQHJl
dHVybglub256ZXJvIGlmIGV4dGVybmFsbHkgc3RvcmVkICovCgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9yZW0wcmVjLmljCXJldmlkOmFsZXhhbmRlci5ub3pkcmluQG9yYWNsZS5jb20t
MjAxMTA2MDkwOTAzMTgtMDZscnVwazNmOHduejlwcworKysgYi9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcmVtMHJlYy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYwOTEx
MDAzOC1jdnd4ZW8wNXEweDRuc2RrCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqCiAKLUNvcHlyaWdodCAoYykgMTk5NCwgMjAwOSwgSW5ub2Jhc2UgT3kuIEFsbCBSaWdodHMg
UmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTQsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFm
ZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNv
ZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0
aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBi
eSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtMjYsNiArMjYsNyBAQCBDcmVhdGVkIDUvMzAvMTk5NCBI
ZWlra2kgVHV1cmkKICNpbmNsdWRlICJtYWNoMGRhdGEuaCIKICNpbmNsdWRlICJ1dDBieXRlLmgi
CiAjaW5jbHVkZSAiZGljdDBkaWN0LmgiCisjaW5jbHVkZSAiYnRyMHR5cGVzLmgiCiAKIC8qIENv
bXBhY3QgZmxhZyBPUmVkIHRvIHRoZSBleHRyYSBzaXplIHJldHVybmVkIGJ5IHJlY19nZXRfb2Zm
c2V0cygpICovCiAjZGVmaW5lIFJFQ19PRkZTX0NPTVBBQ1QJKCh1bGludCkgMSA8PCAzMSkKQEAg
LTEwODcsNiArMTA4OCw0NCBAQCByZWNfb2Zmc19hbnlfZXh0ZXJuKAogCXJldHVybihVTklWX1VO
TElLRUxZKCpyZWNfb2Zmc19iYXNlKG9mZnNldHMpICYgUkVDX09GRlNfRVhURVJOQUwpKTsKIH0K
IAorI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJV
RworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKK0RldGVybWluZSBpZiB0aGUgb2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3JkIGNvbnRhaW5p
bmcgbnVsbCBCTE9CIHBvaW50ZXJzLgorQHJldHVybglmaXJzdCBmaWVsZCBjb250YWluaW5nIGEg
bnVsbCBCTE9CIHBvaW50ZXIsIG9yIE5VTEwgaWYgbm9uZSBmb3VuZCAqLworVU5JVl9JTkxJTkUK
K2NvbnN0IGJ5dGUqCityZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4oCisvKj09PT09PT09PT09PT09
PT09PT09PSovCisJY29uc3QgcmVjX3QqCXJlYywJCS8qITwgaW46IHJlY29yZCAqLworCWNvbnN0
IHVsaW50KglvZmZzZXRzKQkvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjKSAqLworeworCXVs
aW50CWk7CisJdXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBOVUxMLCBvZmZzZXRzKSk7CisK
KwlpZiAoIXJlY19vZmZzX2FueV9leHRlcm4ob2Zmc2V0cykpIHsKKwkJcmV0dXJuKE5VTEwpOwor
CX0KKworCWZvciAoaSA9IDA7IGkgPCByZWNfb2Zmc19uX2ZpZWxkcyhvZmZzZXRzKTsgaSsrKSB7
CisJCWlmIChyZWNfb2Zmc19udGhfZXh0ZXJuKG9mZnNldHMsIGkpKSB7CisJCQl1bGludAkJbGVu
OworCQkJY29uc3QgYnl0ZSoJZmllbGQKKwkJCQk9IHJlY19nZXRfbnRoX2ZpZWxkKHJlYywgb2Zm
c2V0cywgaSwgJmxlbik7CisKKwkJCXV0X2EobGVuID49IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJ
WkUpOworCQkJaWYgKCFtZW1jbXAoZmllbGQgKyBsZW4KKwkJCQkgICAgLSBCVFJfRVhURVJOX0ZJ
RUxEX1JFRl9TSVpFLAorCQkJCSAgICBmaWVsZF9yZWZfemVybywKKwkJCQkgICAgQlRSX0VYVEVS
Tl9GSUVMRF9SRUZfU0laRSkpIHsKKwkJCQlyZXR1cm4oZmllbGQpOworCQkJfQorCQl9CisJfQor
CisJcmV0dXJuKE5VTEwpOworfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJ
R0hUX0RFQlVHICovCisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIG5vbnplcm8gaWYgdGhlIGV4dGVybiBiaXQgaXMg
c2V0IGluIG50aCBmaWVsZCBvZiByZWMuCiBAcmV0dXJuCW5vbnplcm8gaWYgZXh0ZXJuYWxseSBz
dG9yZWQgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDphbGV4YW5kZXIu
bm96ZHJpbkBvcmFjbGUuY29tLTIwMTEwNjA5MDkwMzE4LTA2bHJ1cGszZjh3bno5cHMKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTEwNjA5MTEwMDM4LWN2d3hlbzA1cTB4NG5zZGsKQEAgLTEsNiArMSw2IEBACiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioKIAotQ29weXJpZ2h0IChjKSAxOTk2LCAyMDEwLCBJbm5vYmFzZSBP
eS4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KK0NvcHlyaWdodCAoYykgMTk5NiwgMjAxMSwgT3JhY2xl
IGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KIAogVGhpcyBwcm9n
cmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2Rp
ZnkgaXQgdW5kZXIKIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug
YXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlCkBAIC0yMDAsNiArMjAwLDEwIEBAIHJv
d19idWlsZCgKIAkJdXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykp
OwogCX0KIAorI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdI
VF9ERUJVRworCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsK
KyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworCiAJaWYg
KHR5cGUgIT0gUk9XX0NPUFlfUE9JTlRFUlMpIHsKIAkJLyogVGFrZSBhIGNvcHkgb2YgcmVjIHRv
IGhlYXAgKi8KIAkJYnVmID0gbWVtX2hlYXBfYWxsb2MoaGVhcCwgcmVjX29mZnNfc2l6ZShvZmZz
ZXRzKSk7CkBAIC0zODMsNiArMzg3LDEwIEBAIHJvd19yZWNfdG9faW5kZXhfZW50cnkoCiAJCXJl
YyA9IHJlY19jb3B5KGJ1ZiwgcmVjLCBvZmZzZXRzKTsKIAkJLyogQXZvaWQgYSBkZWJ1ZyBhc3Nl
cnRpb24gaW4gcmVjX29mZnNfdmFsaWRhdGUoKS4gKi8KIAkJcmVjX29mZnNfbWFrZV92YWxpZChy
ZWMsIGluZGV4LCBvZmZzZXRzKTsKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBV
TklWX0JMT0JfTElHSFRfREVCVUcKKwl9IGVsc2UgeworCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVs
bF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JM
T0JfTElHSFRfREVCVUcgKi8KIAl9CiAKIAllbnRyeSA9IHJvd19yZWNfdG9faW5kZXhfZW50cnlf
bG93KHJlYywgaW5kZXgsIG9mZnNldHMsIG5fZXh0LCBoZWFwKTsKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwdmVycy5jCXJldmlkOmFsZXhhbmRlci5ub3pkcmluQG9yYWNsZS5jb20tMjAxMTA2
MDkwOTAzMTgtMDZscnVwazNmOHduejlwcworKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
dmVycy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTEwMDM4LWN2d3hl
bzA1cTB4NG5zZGsKQEAgLTU1Nyw2ICs1NTcsMTEgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNp
c3RlbnRfcmVhZCgKIAkJCQkvKiBUaGUgdmlldyBhbHJlYWR5IHNlZXMgdGhpcyB2ZXJzaW9uOiB3
ZSBjYW4KIAkJCQljb3B5IGl0IHRvIGluX2hlYXAgYW5kIHJldHVybiAqLwogCisjaWYgZGVmaW5l
ZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCQkJdXRfYSgh
cmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAorCQkJCQkgICAgIHZlcnNpb24sICpvZmZzZXRzKSk7
CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwogCQkJ
CWJ1ZiA9IG1lbV9oZWFwX2FsbG9jKGluX2hlYXAsCiAJCQkJCQkgICAgIHJlY19vZmZzX3NpemUo
Km9mZnNldHMpKTsKIAkJCQkqb2xkX3ZlcnMgPSByZWNfY29weShidWYsIHZlcnNpb24sICpvZmZz
ZXRzKTsKQEAgLTU5MCw2ICs1OTUsMTAgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRf
cmVhZCgKIAkJKm9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocHJldl92ZXJzaW9uLCBpbmRleCwg
Km9mZnNldHMsCiAJCQkJCSAgIFVMSU5UX1VOREVGSU5FRCwgb2Zmc2V0X2hlYXApOwogCisjaWYg
ZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCXV0
X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihwcmV2X3ZlcnNpb24sICpvZmZzZXRzKSk7Cisj
ZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwogCQl0cnhf
aWQgPSByb3dfZ2V0X3JlY190cnhfaWQocHJldl92ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMpOwog
CiAJCWlmIChyZWFkX3ZpZXdfc2Vlc190cnhfaWQodmlldywgdHJ4X2lkKSkgewpAQCAtNjg0LDYg
KzY5MywxMCBAQCByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25zaXN0ZW50X3JlYWQoCiAJCQkv
KiBXZSBmb3VuZCBhIHZlcnNpb24gdGhhdCBiZWxvbmdzIHRvIGEKIAkJCWNvbW1pdHRlZCB0cmFu
c2FjdGlvbjogcmV0dXJuIGl0LiAqLwogCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmlu
ZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRl
cm4odmVyc2lvbiwgKm9mZnNldHMpKTsKKyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxP
Ql9MSUdIVF9ERUJVRyAqLworCiAJCQlpZiAocmVjID09IHZlcnNpb24pIHsKIAkJCQkqb2xkX3Zl
cnMgPSByZWM7CiAJCQkJZXJyID0gREJfU1VDQ0VTUzsKQEAgLTc0MSw2ICs3NTQsOSBAQCByb3df
dmVyc19idWlsZF9mb3Jfc2VtaV9jb25zaXN0ZW50X3JlYWQoCiAJCXZlcnNpb24gPSBwcmV2X3Zl
cnNpb247CiAJCSpvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHZlcnNpb24sIGluZGV4LCAqb2Zm
c2V0cywKIAkJCQkJICAgVUxJTlRfVU5ERUZJTkVELCBvZmZzZXRfaGVhcCk7CisjaWYgZGVmaW5l
ZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJCXV0X2EoIXJl
Y19vZmZzX2FueV9udWxsX2V4dGVybih2ZXJzaW9uLCAqb2Zmc2V0cykpOworI2VuZGlmIC8qIFVO
SVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCiAJfS8qIGZvciAoOzspICovCiAK
IAlpZiAoaGVhcCkgewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3Ry
eDByZWMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJldmlkOmFsZXhh
bmRlci5ub3pkcmluQG9yYWNsZS5jb20tMjAxMTA2MDkwOTAzMTgtMDZscnVwazNmOHduejlwcwor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA2MDkxMTAwMzgtY3Z3eGVvMDVxMHg0bnNkawpAQCAtMSw2ICsxLDYgQEAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTYsIDIwMTAsIElubm9i
YXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAxOTk2LCAyMDExLCBP
cmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogCiBUaGlz
IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y
IG1vZGlmeSBpdCB1bmRlcgogdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj
ZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTE1NDYsNiArMTU0Niwx
MCBAQCB0cnhfdW5kb19wcmV2X3ZlcnNpb25fYnVpbGQoCiAJdXRfYSh0YWJsZV9pZCA9PSBpbmRl
eC0+dGFibGUtPmlkKTsKIAl1dF9hKHB0cik7CiAKKyMgaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8
IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJdXRfYSghcmVjX29mZnNfYW55X251bGxf
ZXh0ZXJuKHJlYywgb2Zmc2V0cykpOworIyBlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxP
Ql9MSUdIVF9ERUJVRyAqLworCiAJaWYgKHJvd191cGRfY2hhbmdlc19maWVsZF9zaXplX29yX2V4
dGVybmFsKGluZGV4LCBvZmZzZXRzLCB1cGRhdGUpKSB7CiAJCXVsaW50CW5fZXh0OwogCgo=

--===============0625974856==
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-trunk/
# testament_sha1: d0b2a480c0dab75a614c7b4d97fae870b9d73615
# timestamp: 2011-06-09 14:02:22 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: alexander.nozdrin@stripped\
#   06lrupk3f8wnz9ps
# 
# Begin bundle
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


--===============0625974856==--