From: marko.makela
Date: June 9 2011 11:04am
Subject: bzr push into mysql-5.5 branch (marko.makela:3432 to 3433)
List-Archive: http://lists.mysql.com/commits/138947
Message-Id: <201106091104.p59B4mXH014831@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1544437084=="

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

IDM0MzMgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0wOSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzByb3cuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5j
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwogMzQzMiBEbWl0cnkgU2h1bGdh
CTIwMTEtMDYtMDgKICAgICAgQWRkZWQgcmVncmVzc2lvbiB0ZXN0IGZvciBidWcjMTE3NjM3NTcg
IjU2NTEwOiBFUlJPUiA0MjAwMDoKICAgICAgRlVOQ1RJT04gRE9FUyBOT1QgRVhJU1QgSUYgTk9U
LVBSSVYgVVNFUiBSRUNPTk5FQ1RTIi4KICAgICAgCiAgICAgIFRoZSBidWcgaXRzZWxmIHdhcyBm
aXhlZCBieSB0aGUgc2FtZSBwYXRjaCBhcyBidWdAMTE3NDcxMzcKICAgICAgIjMwOTc3OiBDT05D
VVJSRU5UIFNUQVRFTUVOVCBVU0lORyBTVE9SRUQgRlVOQ1RJT04gQU5EIERST1AKICAgICAgRlVO
Q1RJT04gQlJFQUtTIFNCUiIuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9zcF9u
b3RlbWJlZGRlZC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L3NwX25vdGVtYmVkZGVkLnRlc3QK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xl
LmNvbS0yMDExMDYwODEzNDQ1MC0xZDBvcGFicGd6cDM2emE2CisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2UvYnRyL2J0cjBjdXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYwOTEw
NTkwMi1wcGJ2ZDZzMmV5YXZkazJnCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqCiAKLUNvcHlyaWdodCAoYykgMTk5NCwgMjAxMCwgSW5ub2Jhc2UgT3kuIEFsbCBSaWdodHMg
UmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTQsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFm
ZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiBDb3B5cmlnaHQgKGMpIDIwMDgsIEdvb2ds
ZSBJbmMuCiAKIFBvcnRpb25zIG9mIHRoaXMgZmlsZSBjb250YWluIG1vZGlmaWNhdGlvbnMgY29u
dHJpYnV0ZWQgYW5kIGNvcHlyaWdodGVkIGJ5CkBAIC0xOTg5LDYgKzE5ODksOSBAQCBidHJfY3Vy
X29wdGltaXN0aWNfdXBkYXRlKAogCiAJaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgxMDI0KTsKIAlv
ZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgsIE5VTEwsIFVMSU5UX1VOREVGSU5F
RCwgJmhlYXApOworI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9M
SUdIVF9ERUJVRworCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMp
KTsKKyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLwogCiAj
aWZkZWYgVU5JVl9ERUJVRwogCWlmIChidHJfY3VyX3ByaW50X3JlY29yZF9vcHMgJiYgdGhyKSB7
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaCcK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaAlyZXZpZDpkbWl0cnkuc2h1
bGdhQG9yYWNsZS5jb20tMjAxMTA2MDgxMzQ0NTAtMWQwb3BhYnBnenAzNnphNgorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTEwNjA5MTA1OTAyLXBwYnZkNnMyZXlhdmRrMmcKQEAgLTEsNiArMSw2IEBACiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioKIAotQ29weXJpZ2h0IChjKSAxOTk0LCAyMDA5LCBJbm5vYmFzZSBP
eS4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KK0NvcHlyaWdodCAoYykgMTk5NCwgMjAxMSwgT3JhY2xl
IGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KIAogVGhpcyBwcm9n
cmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2Rp
ZnkgaXQgdW5kZXIKIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug
YXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlCkBAIC00ODAsNiArNDgwLDE4IEBAIHVs
aW50CiByZWNfb2Zmc19hbnlfZXh0ZXJuKAogLyo9PT09PT09PT09PT09PT09Ki8KIAljb25zdCB1
bGludCoJb2Zmc2V0cyk7LyohPCBpbjogYXJyYXkgcmV0dXJuZWQgYnkgcmVjX2dldF9vZmZzZXRz
KCkgKi8KKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCitEZXRlcm1pbmUgaWYgdGhlIG9mZnNldHMgYXJlIGZvciBhIHJlY29yZCBjb250
YWluaW5nIG51bGwgQkxPQiBwb2ludGVycy4KK0ByZXR1cm4JZmlyc3QgZmllbGQgY29udGFpbmlu
ZyBhIG51bGwgQkxPQiBwb2ludGVyLCBvciBOVUxMIGlmIG5vbmUgZm91bmQgKi8KK1VOSVZfSU5M
SU5FCitjb25zdCBieXRlKgorcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAorLyo9PT09PT09PT09
PT09PT09PT09PT0qLworCWNvbnN0IHJlY190KglyZWMsCQkvKiE8IGluOiByZWNvcmQgKi8KKwlj
b25zdCB1bGludCoJb2Zmc2V0cykJLyohPCBpbjogcmVjX2dldF9vZmZzZXRzKHJlYykgKi8KKwlf
X2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsKKyNlbmRpZiAvKiBV
TklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLwogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgbm9uemVy
byBpZiB0aGUgZXh0ZXJuIGJpdCBpcyBzZXQgaW4gbnRoIGZpZWxkIG9mIHJlYy4KIEByZXR1cm4J
bm9uemVybyBpZiBleHRlcm5hbGx5IHN0b3JlZCAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcmVtMHJlYy5pYwlyZXZpZDpkbWl0cnkuc2h1bGdhQG9yYWNsZS5jb20tMjAxMTA2MDgx
MzQ0NTAtMWQwb3BhYnBnenAzNnphNgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVt
MHJlYy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYwOTEwNTkwMi1wcGJ2
ZDZzMmV5YXZkazJnCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNv
cHlyaWdodCAoYykgMTk5NCwgMjAwOSwgSW5ub2Jhc2UgT3kuIEFsbCBSaWdodHMgUmVzZXJ2ZWQu
CitDb3B5cmlnaHQgKGMpIDE5OTQsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMu
IEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5
b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMg
b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJl
ZSBTb2Z0d2FyZQpAQCAtMjYsNiArMjYsNyBAQCBDcmVhdGVkIDUvMzAvMTk5NCBIZWlra2kgVHV1
cmkKICNpbmNsdWRlICJtYWNoMGRhdGEuaCIKICNpbmNsdWRlICJ1dDBieXRlLmgiCiAjaW5jbHVk
ZSAiZGljdDBkaWN0LmgiCisjaW5jbHVkZSAiYnRyMHR5cGVzLmgiCiAKIC8qIENvbXBhY3QgZmxh
ZyBPUmVkIHRvIHRoZSBleHRyYSBzaXplIHJldHVybmVkIGJ5IHJlY19nZXRfb2Zmc2V0cygpICov
CiAjZGVmaW5lIFJFQ19PRkZTX0NPTVBBQ1QJKCh1bGludCkgMSA8PCAzMSkKQEAgLTEwODcsNiAr
MTA4OCw0NCBAQCByZWNfb2Zmc19hbnlfZXh0ZXJuKAogCXJldHVybihVTklWX1VOTElLRUxZKCpy
ZWNfb2Zmc19iYXNlKG9mZnNldHMpICYgUkVDX09GRlNfRVhURVJOQUwpKTsKIH0KIAorI2lmIGRl
ZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0Rl
dGVybWluZSBpZiB0aGUgb2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3JkIGNvbnRhaW5pbmcgbnVsbCBC
TE9CIHBvaW50ZXJzLgorQHJldHVybglmaXJzdCBmaWVsZCBjb250YWluaW5nIGEgbnVsbCBCTE9C
IHBvaW50ZXIsIG9yIE5VTEwgaWYgbm9uZSBmb3VuZCAqLworVU5JVl9JTkxJTkUKK2NvbnN0IGJ5
dGUqCityZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4oCisvKj09PT09PT09PT09PT09PT09PT09PSov
CisJY29uc3QgcmVjX3QqCXJlYywJCS8qITwgaW46IHJlY29yZCAqLworCWNvbnN0IHVsaW50Kglv
ZmZzZXRzKQkvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVjKSAqLworeworCXVsaW50CWk7CisJ
dXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBOVUxMLCBvZmZzZXRzKSk7CisKKwlpZiAoIXJl
Y19vZmZzX2FueV9leHRlcm4ob2Zmc2V0cykpIHsKKwkJcmV0dXJuKE5VTEwpOworCX0KKworCWZv
ciAoaSA9IDA7IGkgPCByZWNfb2Zmc19uX2ZpZWxkcyhvZmZzZXRzKTsgaSsrKSB7CisJCWlmIChy
ZWNfb2Zmc19udGhfZXh0ZXJuKG9mZnNldHMsIGkpKSB7CisJCQl1bGludAkJbGVuOworCQkJY29u
c3QgYnl0ZSoJZmllbGQKKwkJCQk9IHJlY19nZXRfbnRoX2ZpZWxkKHJlYywgb2Zmc2V0cywgaSwg
Jmxlbik7CisKKwkJCXV0X2EobGVuID49IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkUpOworCQkJ
aWYgKCFtZW1jbXAoZmllbGQgKyBsZW4KKwkJCQkgICAgLSBCVFJfRVhURVJOX0ZJRUxEX1JFRl9T
SVpFLAorCQkJCSAgICBmaWVsZF9yZWZfemVybywKKwkJCQkgICAgQlRSX0VYVEVSTl9GSUVMRF9S
RUZfU0laRSkpIHsKKwkJCQlyZXR1cm4oZmllbGQpOworCQkJfQorCQl9CisJfQorCisJcmV0dXJu
KE5VTEwpOworfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
ICovCisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCiBSZXR1cm5zIG5vbnplcm8gaWYgdGhlIGV4dGVybiBiaXQgaXMgc2V0IGluIG50
aCBmaWVsZCBvZiByZWMuCiBAcmV0dXJuCW5vbnplcm8gaWYgZXh0ZXJuYWxseSBzdG9yZWQgKi8K
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDpkbWl0cnkuc2h1bGdhQG9yYWNs
ZS5jb20tMjAxMTA2MDgxMzQ0NTAtMWQwb3BhYnBnenAzNnphNgorKysgYi9zdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwcm93LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MDkx
MDU5MDItcHBidmQ2czJleWF2ZGsyZwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTYsIDIwMTAsIElubm9iYXNlIE95LiBBbGwgUmlnaHRz
IFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAxOTk2LCAyMDExLCBPcmFjbGUgYW5kL29yIGl0cyBh
ZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogCiBUaGlzIHByb2dyYW0gaXMgZnJlZSBz
b2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRlcgog
dGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQg
YnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTIwMCw2ICsyMDAsMTAgQEAgcm93X2J1aWxkKAogCQl1
dF9hZChyZWNfb2Zmc192YWxpZGF0ZShyZWMsIGluZGV4LCBvZmZzZXRzKSk7CiAJfQogCisjaWYg
ZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisJdXRf
YSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOworI2VuZGlmIC8qIFVO
SVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisKIAlpZiAodHlwZSAhPSBST1df
Q09QWV9QT0lOVEVSUykgewogCQkvKiBUYWtlIGEgY29weSBvZiByZWMgdG8gaGVhcCAqLwogCQli
dWYgPSBtZW1faGVhcF9hbGxvYyhoZWFwLCByZWNfb2Zmc19zaXplKG9mZnNldHMpKTsKQEAgLTM4
Myw2ICszODcsMTAgQEAgcm93X3JlY190b19pbmRleF9lbnRyeSgKIAkJcmVjID0gcmVjX2NvcHko
YnVmLCByZWMsIG9mZnNldHMpOwogCQkvKiBBdm9pZCBhIGRlYnVnIGFzc2VydGlvbiBpbiByZWNf
b2Zmc192YWxpZGF0ZSgpLiAqLwogCQlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywgaW5kZXgsIG9m
ZnNldHMpOworI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdI
VF9ERUJVRworCX0gZWxzZSB7CisJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMs
IG9mZnNldHMpKTsKKyNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJV
RyAqLwogCX0KIAogCWVudHJ5ID0gcm93X3JlY190b19pbmRleF9lbnRyeV9sb3cocmVjLCBpbmRl
eCwgb2Zmc2V0cywgbl9leHQsIGhlYXApOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzB2ZXJzLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJz
LmMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNjA4MTM0NDUwLTFkMG9wYWJw
Z3pwMzZ6YTYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYwOTEwNTkwMi1wcGJ2ZDZzMmV5YXZkazJnCkBAIC0x
LDYgKzEsNiBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNvcHlyaWdodCAoYykgMTk5Nywg
MjAwOSwgSW5ub2Jhc2UgT3kuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5
OTcsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2
ZWQuCiAKIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0
ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFs
IFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtNTUw
LDYgKzU1MCwxMSBAQCByb3dfdmVyc19idWlsZF9mb3JfY29uc2lzdGVudF9yZWFkKAogCQkJCS8q
IFRoZSB2aWV3IGFscmVhZHkgc2VlcyB0aGlzIHZlcnNpb246IHdlIGNhbgogCQkJCWNvcHkgaXQg
dG8gaW5faGVhcCBhbmQgcmV0dXJuICovCiAKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVm
aW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKwkJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9l
eHRlcm4oCisJCQkJCSAgICAgdmVyc2lvbiwgKm9mZnNldHMpKTsKKyNlbmRpZiAvKiBVTklWX0RF
QlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworCiAJCQkJYnVmID0gbWVtX2hlYXBfYWxs
b2MoaW5faGVhcCwKIAkJCQkJCSAgICAgcmVjX29mZnNfc2l6ZSgqb2Zmc2V0cykpOwogCQkJCSpv
bGRfdmVycyA9IHJlY19jb3B5KGJ1ZiwgdmVyc2lvbiwgKm9mZnNldHMpOwpAQCAtNTgzLDYgKzU4
OCwxMCBAQCByb3dfdmVyc19idWlsZF9mb3JfY29uc2lzdGVudF9yZWFkKAogCQkqb2Zmc2V0cyA9
IHJlY19nZXRfb2Zmc2V0cyhwcmV2X3ZlcnNpb24sIGluZGV4LCAqb2Zmc2V0cywKIAkJCQkJICAg
VUxJTlRfVU5ERUZJTkVELCBvZmZzZXRfaGVhcCk7CiAKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcg
fHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKwkJdXRfYSghcmVjX29mZnNfYW55X251
bGxfZXh0ZXJuKHByZXZfdmVyc2lvbiwgKm9mZnNldHMpKTsKKyNlbmRpZiAvKiBVTklWX0RFQlVH
IHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworCiAJCXRyeF9pZCA9IHJvd19nZXRfcmVjX3Ry
eF9pZChwcmV2X3ZlcnNpb24sIGluZGV4LCAqb2Zmc2V0cyk7CiAKIAkJaWYgKHJlYWRfdmlld19z
ZWVzX3RyeF9pZCh2aWV3LCB0cnhfaWQpKSB7CkBAIC02ODIsNiArNjkxLDEwIEBAIHJvd192ZXJz
X2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVhZCgKIAkJCS8qIFdlIGZvdW5kIGEgdmVyc2lv
biB0aGF0IGJlbG9uZ3MgdG8gYQogCQkJY29tbWl0dGVkIHRyYW5zYWN0aW9uOiByZXR1cm4gaXQu
ICovCiAKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKKwkJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybih2ZXJzaW9uLCAqb2Zmc2V0
cykpOworI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisK
IAkJCWlmIChyZWMgPT0gdmVyc2lvbikgewogCQkJCSpvbGRfdmVycyA9IHJlYzsKIAkJCQllcnIg
PSBEQl9TVUNDRVNTOwpAQCAtNzM5LDYgKzc1Miw5IEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9zZW1p
X2NvbnNpc3RlbnRfcmVhZCgKIAkJdmVyc2lvbiA9IHByZXZfdmVyc2lvbjsKIAkJKm9mZnNldHMg
PSByZWNfZ2V0X29mZnNldHModmVyc2lvbiwgaW5kZXgsICpvZmZzZXRzLAogCQkJCQkgICBVTElO
VF9VTkRFRklORUQsIG9mZnNldF9oZWFwKTsKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVm
aW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKwkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0
ZXJuKHZlcnNpb24sICpvZmZzZXRzKSk7CisjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JM
T0JfTElHSFRfREVCVUcgKi8KIAl9LyogZm9yICg7OykgKi8KIAogCWlmIChoZWFwKSB7Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29t
LTIwMTEwNjA4MTM0NDUwLTFkMG9wYWJwZ3pwMzZ6YTYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90
cngvdHJ4MHJlYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTA1OTAy
LXBwYnZkNnMyZXlhdmRrMmcKQEAgLTEsNiArMSw2IEBACiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioK
IAotQ29weXJpZ2h0IChjKSAxOTk2LCAyMDEwLCBJbm5vYmFzZSBPeS4gQWxsIFJpZ2h0cyBSZXNl
cnZlZC4KK0NvcHlyaWdodCAoYykgMTk5NiwgMjAxMSwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxp
YXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KIAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdh
cmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRoZSB0
ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRo
ZSBGcmVlIFNvZnR3YXJlCkBAIC0xNTkzLDYgKzE1OTMsMTAgQEAgdHJ4X3VuZG9fcHJldl92ZXJz
aW9uX2J1aWxkKAogCQlyZXR1cm4oREJfRVJST1IpOwogCX0KIAorIyBpZiBkZWZpbmVkIFVOSVZf
REVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKwl1dF9hKCFyZWNfb2Zmc19h
bnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7CisjIGVuZGlmIC8qIFVOSVZfREVCVUcgfHwg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisKIAlpZiAocm93X3VwZF9jaGFuZ2VzX2ZpZWxkX3Np
emVfb3JfZXh0ZXJuYWwoaW5kZXgsIG9mZnNldHMsIHVwZGF0ZSkpIHsKIAkJdWxpbnQJbl9leHQ7
CiAKCg==

--===============1544437084==
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 14:04:40 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: dmitry.shulga@stripped\
#   1d0opabpgzp36za6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeK+3nMAFKD/lHAwIAB7f///
f+ff+r////4EAAgAYBmfeC7TZ7o+x5ffe8FZaeVJQoHQANfQ0SUH0YeK+YTb3s9M9jQHrJT0a1FS
nrWlttqKaOjidYJREk8iepkPaoPFGhoAbU9EDINNB6gAAAAlBACAmhCMmlNG09FPSaYIMQGgDQNA
NBE9AmkpkAATNAAAAEwABGAAAJNSKYgho1R5R5qTTwmp6nimgAADQ0NqAAZAioQjQ1PUxNNGmjKe
m1TyE8plMEzKYh6IaANNNPTUBUkgIDQTSYE00p4map4lNpqZpPU0AaADQNGhcmKlFEpQGER6US3E
os/a4rXKBEQQd/lSg678rYSYHcUZFykLwVoURESICIMLmcPEf4ajiOQ8ZgY7wYmJnLFpYRPKflj1
aJMoiYmJMpkUVKU4MCR7/NzL53P0WuvRfp3ewTlTUMrSS0soLcKSUgVnxx9Wn87H3Tyd1SkF41Gk
uax3IbfPLnDs4S+Jwo+bE4KUpb6ZcduPJsj1md0ydSwtaxNB59jJXDs4sr47Lxm1e2VBPEuduR9f
IHEQqqGGsCgmoY1V01MhNG9iZszlzhz5EJzb+RqEbjFxXdFVVvDAzKbzyeTNGwolIyVp7EYxI0dr
EXW1ows81k59eXhx9UeYR1rBPc3ZeDuPhD1AJ7wnybI3Nb/OXJxdly7j5p7JIt61yrMxcxSPhCHO
ScZoQERpKKBVFjIqsUgooosWLJFgLs3zpkDhSbuYmAkxHAsfxhgmAQWMJImthpk4QJCqs0ODhLI3
AhZo4txLBEDcSDBa91tG0ruzwZVdYqqv32CIQEUhRkSFMlh3oaApEbJSDpJSm5lWBTEESGwMUmsL
MlSilMUEnc1qNGOIOlTK7ExCYoIFAgmxwJFNSqRYOThRAYTBzZCcQ5VF9kCtisXZSzJFs3/6Ay4z
zHdyFyewkFsC7WahujKn0xpzineKXM3pzEQiIh75iQZsJw7PYTq4kfGRe07OAzKkmAffbMRDMRCt
/aL8hp/162DkZoiHaZ6DhX/HQcKL7CIopkfoCAPVsrHzgLE+SOfs9A5wJ85o5dXP5xF/qLv9z1la
d+ccCeOqzTn4uG+Iz1ciqLe13nW2yxoWw2OeuSPpu04su/PJEc7tfQ6Y8ly8pY+Vg65Umzt0npnl
lNEodQRDYD5UPh+NQYRMM0bNrYnea9OqjLb0z9uRrXV0hBQS0qMFQFYrEbK7tqs6eWXqlqqb7xhr
iigisNzVhodfo8GfXwZ7WtEd2FyM9gqFW5Ed8gKmMJEAU+ZtQwjUWEolIdRKh0S55tbySpxD/niv
PdVqs9+drpkm5ZaZvXdrUUZLDJipVi+YOutaKmPmeivwexnB9lMoVeyfXYzkLMGTcpPcsfgJ+NKp
JcP1uNKiFi4sjRo4HycHcu0wcB6/bVPh25PanX7OvfRWH2diyNFOj1FSjd3NYCa91R1ubn7/IgJL
5gJUGx2ARWciUzYSJcxEdr3PTh1uDUHCRF/e1GeG3DDTx7SYeCwp6TFJenHExQ0cnZtTPLFhlpaW
lirDYtVrWq1uHTJGIAGN7xiRfNFHkIY6k96I+nx+CR+tYfFeOL2vgqqqiBBDctomDfvYFYxiOIYG
8bbZi4asng05NE+6qnGoLVDOoZYWkjCotQuy1Y6m/26tMZhIlK1Ua62ZLrrvm8F2WxgVayXN9WkI
wEblyF8XXK2YsjxLSWIBAmfN6rzoEsyLIiIfF8dh7FBqlN5SgiCbfOiCTg9rOaFU03ORoWQyNTFQ
Riw1UFVTmvWcNMEDLbZg3OK5luulMoGCY1CBtSjxGSQ9IF10MNNEERTHppYtZEExjo1sVzB0XMmT
cuucnFoyd6ObLRexcplsYtzBm6dNbe3MHUIubvl8lp3IuI70coUQ9Zamy8+ognSBwHDv2usUBlSU
Or1VlB+vmly58rIkMq9SyII75sHRR5h1dH/BqiCEWUmL3CphgHK6Au5N26y/5OpixeBx8WLDSqkI
18q98acNjCIIaG7yMzACHWictmW0dyDVubogmUEy/ESfRcdG2gWlo8ebQcjiPLWMZinlrWZDqNQh
dJarzFPK6IJwaikNkBJhCe7onXoVlRSId3xHaYJaIggpLbZ8btdKTdhUHFKGQMudeXU7T6TApDrZ
adnhIlN1adGw06Y6XcFOdR3PLW3Nrp2O0p1NTqSIIlB9dS6ipVBC5qTiAhcY4SZD7fCQNChM8MYI
EiRzDamiWJ9PFqqb6Ki9aw2FYchERS3JoUaceTwuTJM8JVpImgD+w9dyvb1DUSAnkwIgO6w0McF9
u40KneKhuSZtl78oThxYhmSiOlhcuClPXXsJiVRBMzMbhrxIxRTYuPdSMSnaPyKN27NTEBoQXEaF
ovewghuaDF7vy078okJmOASIiJEREEYsFVViqKv6QEElU4RBOFMzI2ORwYORUU+xaE5EctpesAif
AAeHliHGOvYEWyhfiLIm5TlWa0IsqoloNRZNO1qRsDkbE2pBNjg7iZM5k/Mea8pXuaIghTKQ8+lD
zB542ta1SBEqpoSIHLZ51y5PnUkjJEiKFhyatFT2cRKmFJJChVokiB7qPHfBkAhg0zMQmLbkOZjE
eCxFihE03DUFBAtMWxwZd1qQLlsAsrESRNBEcO41YiYMzJEEiXME6kaD7z1EI+kW9IP0zarxhDWu
5JSLMKjjIqIJCVR7o6InoFEIlijjk5oIikGu4xwxmNKZZZkRXJkFGKvkqJBMR4uRfBmXIDAiQKqX
nhFPduciJNKFe5EEocHWutZ1wLQzNSsueqIJIvYzpRciEDVMb4I3F2zaAUYwq6jZ5s5U3M58Yprk
jW6uSsqVzd4jBe0WdOLkwZNSw5uYME+BfbsMNgXt1iZB4nhI5hznlo1Ijr1HrNXa1V6MqujM33VK
RSKl2+McslKV5EKolXArE5XRWSxj6Gz7Gj9myefpMldc8xkiSvlM7DvDbuN5LkQRBNGMRNaHnLm5
KpJDQmiGzHZ7VvA7xtjMNTdSBZFLnOFDNPRRiOaAhJR5wLj9MrygtKMzIA4rFrR2JG5UmVOZyNjQ
RDqaDTCBpE2LyCAzUsYOi7c1CMmTs3tTW0antkRqs26dFL9jWzaO0TEldniysjttWVQChVkRKBjd
rhFHURESy62IkTcbUXIuDlYSUs9u2zlS0eRYtsRHOhmb5GxWthjRN1JLRNbGpV7tkaaaGZACLTB0
rHrsqmLg5OFpzahLkTkvdTe5s0RtcnN1KXqcd08ajUpTN2z08JxD64zq7efNpzxPnvKTShDh5Slu
iCUpIrQmiCX5jHTq2OpV5CzR00GJDZFxwEICjkEyTA5m4sipsSJF7qY3KjsVDBhwuqq7dS5eyWwx
XsHJoiPDF9NNCx3FhkwYK7UJQJCFBSxgoRHKjsTNCEDtN0BGTkaYJinPnY2JmxGNkgaaB2mme+l9
uNYxkajLB2nKclAQcvJ5EnKnYAhRJH3qaWshQfBoV54rSsVNTfeGepGisQ61wKQnN2OFHzMEhQgw
cxeCxgMQJ3wbmrG5LoZpIclke/MxCpGLSTCHOZWCKMqauWaRLMlirTylWJrWBKSNYNrZJ1hCRJlT
aLTg0uwBC0FoRECMzqdwz4RBEcUakktBhdUsNEkiCUPOKlAEIKyrSKQyFlwRRrjilTIoZFyGIGAt
Z5U69YkjYrm5Y0gvZeFukiWmpUwYMHFbvdimxdKdzq65E1rmxza2DRwamC46KZqbNMp1M82Sm3V7
+zb+aPR7B3TTa6Uq4922rN9JjTfTBxdVLmqYLL5RTkq9hOaRzZ4SRmzXwlKl62UkakStV8tqxLlZ
KggrGIIggqCxEFWKM3t0Q7wyeZAWBpE8YG09eSCfICfYe+a5xHfgd5LUBBqLBESKIMN2SWSVcFZj
+A/I+kRsfB3O0h50J+SW+2o+NQiABsMv4PIVIP6yG+GaEUYyIAsbnPAD2ipDGQDvPWCpbFSUYE5+
xvUjI6YAqexCQd/xCA1gqV/JD4oYEKUKCrGSTSFkhP3EkZJI/tSRxhohMjeCfuhwmz+jGG2GSSMj
ZD+KEnGdk1N5gCUWP7pTnDZCT/hZcnY2w3Q0v6QpJfCn+T98OEP+kkX86uJI5wsSRqOABvF5D/SS
HESKu4VPod5fRSUIIpgQqQiG4KnIhxIZMG0EsUao7PhMbTt89Mff4gfw/cokTQZHiJlqEQQQQRFQ
QRFut23Im0uakTGBY2Y2Pt364z2ZYojON0MA18YdqdIeJYRL7hAvF8oOEpFBQyJAR4VBD6TBQUgx
qwCHzHT5Z3U+YwRMH01GJFcGhTvP3z8fwubGLcy3HFe8fMnlKiSanW3eL9k9TW6no1YbIiNbubzq
djvw7nY9ro5mSmSbXsbkT2kn1/p7UEMfK6rso0yvzIkm4fmRWcDW2ONRu92rH2bLRyCf+shD43y2
umneUlnBu3h4cXV5CPCRPh4q2rKfY96/14+9mz83sWYMpE7/KxAgPA855iOD3CZgqZHhcqZmofVd
qGwxUBDYzHK4Pe96m5I704MGCKnb/P7SFkT2oFVEwn6mYV+HXnDDl8ABUDhhZBRcCEhVRjIIyVU6
9ucn8qUYUwpFKSTo7BHE5ubVro6na73qa3crubWxc29y54CLZyJ6u7U2OJk1ti7hi0aN6hHlIl7n
kSOrdrchGbJwCCmRuYOCBoClTU4PCpcUsfyz8AEU5m58FbXOtqejzxddRlZURFiTydr4PKd8hGGi
lzFXl+ZRSVaF1aIrwkR5daMO73sOJsLmpJFFxaWXOPFcUvsqF6d72cO92vhwmPKvm83t4qWKe2m9
cs82DbmxclnrZvW63Ll0bXNv6hPmGDnCabnKsVOumLtYuRI97FLr+LFqcjLNXqdTgwcOjNyVEnkI
3yI23sJ+Qk00bWCza7P34P2vKJGzrd4jc4tFl6QciIKRgEiU21yMjJZ8GzEQTLAJV2Rw+PIIQhiX
0eeGGGbK6yX35sWodnr9LgyRs1kJcgUJHoDHnj33kQ1RBKuKS5zKQKnibjkSBM8xUwenLLx6OSdu
nic3FWqrlXLU8BhzrY9RApyMHIa1rjR90RnEew28KtItQt1y7tSLInqepsd7j+n+rW63JjETm3tV
ySMVI8SR529XTk3iIx2FDvsU9SIIZml0QR/Y53S9m55X7DwKC97FeE9biudC9wWcUkV1tWvw1NL7
Ors/wXH+kIfAjb9i5uI83Z4jC98llIVyXSR4snrTD5zoMq21wE0zbSrTE5bZ5q5gQnGCWkGSQ6CM
NnDUtyyTGL5c/QmPFhT45aa+5Mp+BdEL0eKiTk6Zkj6dcSXd4ZNzhIn8lJJ8/ZsEdr6Pc8n0Pa8p
EzyZLl74/H6vlrUxcnyb2CnmOZmg5Q8iRUyJkyp5DjkioxYiWmExSK9rcVyI2ZtylynGEzX9JZzZ
L3VJG1JhQLj1HlOEchE+BIkfJE40SSJWO4KlmbxtZUmS+07lRikFWfZIjdmrvWFllsJRHE4zIcHI
UO/pcZogTMBG5gG9aRs6TC6nxhXBSB4QhqFT3svJADTYZJWkwqJ12sE7Wjdb2YEeM0EiI0ZiD/PM
aDXXPDjGFLKCwjxk3oPEkWWdxGGLVHokfcNFEoWkj0xTd4x02KJJ5QvImuAA5dU1YZIY2sPDBS+e
oEtPvRK9W1vKJHj2jq9dtkjPuHpHfUeX5XubHJzjqkhVV935zid2+XyJi5rndy8l8vSpc7pQiYMP
LPN6cD0HNj6ue2Ctm6AbZiYqQQ7jMRPJEOJH4DDu5j8/VJG2BRksi8VLIloQ5fbZF6jKyyb0skcL
SSFohgwhb0DlPMdphsTP1TOTXKAUD7yWqWegRJZdWCrXcFbyTxlPvvZMsJCLEe778/qwe3pAQ6uV
T1noAIKxEgRWAx8RnSovlaJ+1vZOZ6pl35TUYPdOEz4y+a5m2tTGSMXqwZzpIQrMuz55uG6Y7mgb
FVegoGiAWKIdkGVeLlyR71MP2X2bIjHevVJYk4V+Ni4XEl6RmvuWKKokU4Zdy8mSeiwx1Zzwskk6
pa9ji0B0OWY4FooAxrdQRBPeZITCQJKYAisYCNoSmYRuTjRs89BuqPVk8qp4/S3YXiGOmd7DLaux
0dnCBYo+U6XJ/qiCWsFjr7okPCc80sAgsmbVpSELG8F6CaUGZRo5mDVLsHEnaXGIQ5hi2KoYhG0i
61RpZPJv8MDTz2NGuhJ4d0xaznMZEXLjb0GoiiQQawDOFKpQaUo6XQZLRaOygTVsDD2PW8Md29m5
XDX9fq9PgMZikqVJttbwhY3osFj9S0vq+2r+9LQidm+dcnTZgiiq5RzPeUT3JJ0T6zMoiy8wWY4W
kZ3CJf6x6myIxYyLwAz0WFx9hxBfKi0qU5VFWHq115J2bkQ4xkXKiVFQXUMPfjlnNdckOiLlk5zn
ZLS2i9TYknmVI03AWIwhQoxNtE6UihfN2Ny1rdLsuXMISYUXLYrqXJSKH2h8X8ePSRMVGVNjNr83
ZZn19uQyTlqiF8RmpjEfdMtsOKqkiqU1sIj9O9yqQqjTuGk/RHhLcuvYNpdY6gxBMg1EE5RIYWA6
oKE9SqHMSF7vEC6m+1samPhsuMeTEpTgrWzURsuiM0pm/FEWRZTHJgtLJl+VktfwzypnFy4xSS6q
jBOMiNq4sO6tP1MMXK/Y0czlbFgs7t0gl1MNKjuDYg62GCRMVCrnQtwHO5961W8IwHfRC5fnQdk7
hy1W10JTnNtGQF6zL7jGN91BUF8CyCLAq6eTEVPP4AzZTLQKt7tu0BLMS2SKtJqvab25fPyuKFuf
jMO6PCa97EPEM+Kbk4XZvFGbV91qrrLrbbasiTnFvTg2IT4/KyZHO7ZCHbp4AhsqnUyED5pCG23D
mOLrqkuzklOrS+RPpNgb8pEbfzOf4PKN6bch0cB8fFsmxHNhajGzZBTjMhA0nQdl/gDa7L1KGc+g
KRBTUsiB/waD3H/i7kinChIcV9vOYA==


--===============1544437084==--