From: marko.makela
Date: June 15 2011 7:31am
Subject: bzr commit into mysql-5.5 branch (marko.makela:3451)
List-Archive: http://lists.mysql.com/commits/139209
Message-Id: <201106150731.p5F7VqVZ026262@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0821287832=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzAzMTMtbW04NXF1
NGFtcXp4NzJ1dQoKIDM0NTEgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0xNSBbbWVyZ2VdCiAgICAg
IE1lcmdlIG15c3FsLTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
cmVtMHJlYy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHJvdy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBj
dXIuYwlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUuY29tLTIwMTEwNjE1MDMwMzEzLW1tODVxdTRh
bXF6eDcydXUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMDE5LWhvYnlteWN2cnUxMjl0OWEKQEAgLTE5
ODksOSArMTk4OSw5IEBAIGJ0cl9jdXJfb3B0aW1pc3RpY191cGRhdGUoCiAKIAloZWFwID0gbWVt
X2hlYXBfY3JlYXRlKDEwMjQpOwogCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRl
eCwgTlVMTCwgVUxJTlRfVU5ERUZJTkVELCAmaGVhcCk7Ci0jaWYgZGVmaW5lZCBVTklWX0RFQlVH
IHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExf
REVCVUcKIAl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7Ci0j
ZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAv
KiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAjaWZkZWYgVU5JVl9ERUJVRwogCWlmIChidHJf
Y3VyX3ByaW50X3JlY29yZF9vcHMgJiYgdGhyKSB7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3JlbTByZWMuaAlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUuY29tLTIwMTEwNjE1MDMwMzEz
LW1tODVxdTRhbXF6eDcydXUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMu
aAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNTA3MzAxOS1ob2J5bXljdnJ1
MTI5dDlhCkBAIC00ODAsNyArNDgwLDcgQEAgdWxpbnQKIHJlY19vZmZzX2FueV9leHRlcm4oCiAv
Kj09PT09PT09PT09PT09PT0qLwogCWNvbnN0IHVsaW50KglvZmZzZXRzKTsvKiE8IGluOiBhcnJh
eSByZXR1cm5lZCBieSByZWNfZ2V0X29mZnNldHMoKSAqLwotI2lmIGRlZmluZWQgVU5JVl9ERUJV
RyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxM
X0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgogRGV0ZXJtaW5lIGlmIHRoZSBvZmZzZXRzIGFyZSBmb3IgYSByZWNvcmQgY29u
dGFpbmluZyBudWxsIEJMT0IgcG9pbnRlcnMuCiBAcmV0dXJuCWZpcnN0IGZpZWxkIGNvbnRhaW5p
bmcgYSBudWxsIEJMT0IgcG9pbnRlciwgb3IgTlVMTCBpZiBub25lIGZvdW5kICovCkBAIC00OTEs
NyArNDkxLDcgQEAgcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAogCWNvbnN0IHJlY190KglyZWMs
CQkvKiE8IGluOiByZWNvcmQgKi8KIAljb25zdCB1bGludCoJb2Zmc2V0cykJLyohPCBpbjogcmVj
X2dldF9vZmZzZXRzKHJlYykgKi8KIAlfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNl
ZF9yZXN1bHQpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJV
RyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAvKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyBub256
ZXJvIGlmIHRoZSBleHRlcm4gYml0IGlzIHNldCBpbiBudGggZmllbGQgb2YgcmVjLgogQHJldHVy
bglub256ZXJvIGlmIGV4dGVybmFsbHkgc3RvcmVkICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9yZW0wcmVjLmljCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUw
MzAzMTMtbW04NXF1NGFtcXp4NzJ1dQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVt
MHJlYy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNTA3MzAxOS1ob2J5
bXljdnJ1MTI5dDlhCkBAIC0xMDg4LDcgKzEwODgsNyBAQCByZWNfb2Zmc19hbnlfZXh0ZXJuKAog
CXJldHVybihVTklWX1VOTElLRUxZKCpyZWNfb2Zmc19iYXNlKG9mZnNldHMpICYgUkVDX09GRlNf
RVhURVJOQUwpKTsKIH0KIAotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZf
QkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAvKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogRGV0ZXJt
aW5lIGlmIHRoZSBvZmZzZXRzIGFyZSBmb3IgYSByZWNvcmQgY29udGFpbmluZyBudWxsIEJMT0Ig
cG9pbnRlcnMuCiBAcmV0dXJuCWZpcnN0IGZpZWxkIGNvbnRhaW5pbmcgYSBudWxsIEJMT0IgcG9p
bnRlciwgb3IgTlVMTCBpZiBub25lIGZvdW5kICovCkBAIC0xMTI0LDcgKzExMjQsNyBAQCByZWNf
b2Zmc19hbnlfbnVsbF9leHRlcm4oCiAKIAlyZXR1cm4oTlVMTCk7CiB9Ci0jZW5kaWYgLyogVU5J
Vl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0Jf
TlVMTF9ERUJVRyAqLwogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyBub256ZXJvIGlmIHRoZSBleHRlcm4gYml0IGlz
IHNldCBpbiBudGggZmllbGQgb2YgcmVjLgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2
LmkJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAzMDMxMy1tbTg1cXU0YW1x
eng3MnV1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzMwMTktaG9ieW15Y3ZydTEyOXQ5YQpAQCAtMTg2
LDYgKzE4Niw4IEBAIGNvbW1hbmQuIE5vdCB0ZXN0ZWQgb24gV2luZG93cy4gKi8KIAkJCQkJCWRl
YnVnZ2luZyB3aXRob3V0IFVOSVZfREVCVUcgKi8KICNkZWZpbmUgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHCQkJLyogRW5hYmxlIG9mZi1wYWdlIGNvbHVtbgogCQkJCQkJZGVidWdnaW5nIHdpdGhvdXQg
VU5JVl9ERUJVRyAqLworI2RlZmluZSBVTklWX0JMT0JfTlVMTF9ERUJVRwkJCS8qIEVuYWJsZSBk
ZWVwIG9mZi1wYWdlCisJCQkJCQljb2x1bW4gZGVidWdnaW5nICovCiAjZGVmaW5lIFVOSVZfREVC
VUcJCQkJLyogRW5hYmxlIHV0X2FkKCkgYXNzZXJ0aW9ucwogCQkJCQkJYW5kIGRpc2FibGUgVU5J
Vl9JTkxJTkUgKi8KICNkZWZpbmUgVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFCQkvKiBFbmFibGUK
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUu
Y29tLTIwMTEwNjE1MDMwMzEzLW1tODVxdTRhbXF6eDcydXUKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDcz
MDE5LWhvYnlteWN2cnUxMjl0OWEKQEAgLTIwMCwxMyArMjAwLDEzIEBAIHJvd19idWlsZCgKIAkJ
dXRfYWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwgb2Zmc2V0cykpOwogCX0KIAotI2lm
IDAgLyogZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
ICovCisjaWYgMCAmJiBkZWZpbmVkIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJLyogVGhpcyBvbmUg
Y2FuIGZhaWwgaW4gdHJ4X3JvbGxiYWNrX2FjdGl2ZSgpIGlmCiAJdGhlIHNlcnZlciBjcmFzaGVk
IGR1cmluZyBhbiBpbnNlcnQgYmVmb3JlIHRoZQogCWJ0cl9zdG9yZV9iaWdfcmVjX2V4dGVybl9m
aWVsZHMoKSBkaWQgbXRyX2NvbW1pdCgpCiAJYWxsIEJMT0IgcG9pbnRlcnMgdG8gdGhlIGNsdXN0
ZXJlZCBpbmRleCByZWNvcmQuICovCiAJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJl
Yywgb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHICovCisjZW5kaWYgLyogMCAmJiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAJaWYgKHR5
cGUgIT0gUk9XX0NPUFlfUE9JTlRFUlMpIHsKIAkJLyogVGFrZSBhIGNvcHkgb2YgcmVjIHRvIGhl
YXAgKi8KQEAgLTM5MSwxMCArMzkxLDEwIEBAIHJvd19yZWNfdG9faW5kZXhfZW50cnkoCiAJCXJl
YyA9IHJlY19jb3B5KGJ1ZiwgcmVjLCBvZmZzZXRzKTsKIAkJLyogQXZvaWQgYSBkZWJ1ZyBhc3Nl
cnRpb24gaW4gcmVjX29mZnNfdmFsaWRhdGUoKS4gKi8KIAkJcmVjX29mZnNfbWFrZV92YWxpZChy
ZWMsIGluZGV4LCBvZmZzZXRzKTsKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBV
TklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCX0gZWxz
ZSB7CiAJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsKLSNl
bmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8q
IFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAJfQogCiAJZW50cnkgPSByb3dfcmVjX3RvX2luZGV4
X2VudHJ5X2xvdyhyZWMsIGluZGV4LCBvZmZzZXRzLCBuX2V4dCwgaGVhcCk7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHZlcnMuYwlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUuY29tLTIwMTEw
NjE1MDMwMzEzLW1tODVxdTRhbXF6eDcydXUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHZlcnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNTA3MzAxOS1ob2J5
bXljdnJ1MTI5dDlhCkBAIC01NTAsMTAgKzU1MCwxMCBAQCByb3dfdmVyc19idWlsZF9mb3JfY29u
c2lzdGVudF9yZWFkKAogCQkJCS8qIFRoZSB2aWV3IGFscmVhZHkgc2VlcyB0aGlzIHZlcnNpb246
IHdlIGNhbgogCQkJCWNvcHkgaXQgdG8gaW5faGVhcCBhbmQgcmV0dXJuICovCiAKLSNpZiBkZWZp
bmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBV
TklWX0JMT0JfTlVMTF9ERUJVRwogCQkJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybigK
IAkJCQkJICAgICB2ZXJzaW9uLCAqb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcg
Ki8KIAogCQkJCWJ1ZiA9IG1lbV9oZWFwX2FsbG9jKGluX2hlYXAsCiAJCQkJCQkgICAgIHJlY19v
ZmZzX3NpemUoKm9mZnNldHMpKTsKQEAgLTU4OCw5ICs1ODgsOSBAQCByb3dfdmVyc19idWlsZF9m
b3JfY29uc2lzdGVudF9yZWFkKAogCQkqb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyhwcmV2X3Zl
cnNpb24sIGluZGV4LCAqb2Zmc2V0cywKIAkJCQkJICAgVUxJTlRfVU5ERUZJTkVELCBvZmZzZXRf
aGVhcCk7CiAKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElH
SFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCQl1dF9hKCFyZWNfb2Zmc19h
bnlfbnVsbF9leHRlcm4ocHJldl92ZXJzaW9uLCAqb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZf
REVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05V
TExfREVCVUcgKi8KIAogCQl0cnhfaWQgPSByb3dfZ2V0X3JlY190cnhfaWQocHJldl92ZXJzaW9u
LCBpbmRleCwgKm9mZnNldHMpOwogCkBAIC02OTEsOSArNjkxLDkgQEAgcm93X3ZlcnNfYnVpbGRf
Zm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAogCQkJLyogV2UgZm91bmQgYSB2ZXJzaW9uIHRoYXQg
YmVsb25ncyB0byBhCiAJCQljb21taXR0ZWQgdHJhbnNhY3Rpb246IHJldHVybiBpdC4gKi8KIAot
I2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRwor
I2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9l
eHRlcm4odmVyc2lvbiwgKm9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZf
QkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAK
IAkJCWlmIChyZWMgPT0gdmVyc2lvbikgewogCQkJCSpvbGRfdmVycyA9IHJlYzsKQEAgLTc1Miw5
ICs3NTIsOSBAQCByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25zaXN0ZW50X3JlYWQoCiAJCXZl
cnNpb24gPSBwcmV2X3ZlcnNpb247CiAJCSpvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHZlcnNp
b24sIGluZGV4LCAqb2Zmc2V0cywKIAkJCQkJICAgVUxJTlRfVU5ERUZJTkVELCBvZmZzZXRfaGVh
cCk7Ci0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIAkJdXRfYSghcmVjX29mZnNfYW55X251
bGxfZXh0ZXJuKHZlcnNpb24sICpvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBV
TklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAq
LwogCX0vKiBmb3IgKDs7KSAqLwogCiAJaWYgKGhlYXApIHsKCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4
L3RyeDByZWMuYwlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUuY29tLTIwMTEwNjE1MDMwMzEzLW1t
ODVxdTRhbXF6eDcydXUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMDE5LWhvYnlteWN2cnUxMjl0OWEK
QEAgLTE1OTMsOSArMTU5Myw5IEBAIHRyeF91bmRvX3ByZXZfdmVyc2lvbl9idWlsZCgKIAkJcmV0
dXJuKERCX0VSUk9SKTsKIAl9CiAKLSMgaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjIGlmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJdXRf
YSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOwotIyBlbmRpZiAvKiBV
TklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworIyBlbmRpZiAvKiBVTklWX0JM
T0JfTlVMTF9ERUJVRyAqLwogCiAJaWYgKHJvd191cGRfY2hhbmdlc19maWVsZF9zaXplX29yX2V4
dGVybmFsKGluZGV4LCBvZmZzZXRzLCB1cGRhdGUpKSB7CiAJCXVsaW50CW5fZXh0OwoK

--===============0821287832==
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: 9c9ce3b7a8b80e8ac56d35c461b3887391a9440a
# timestamp: 2011-06-15 10:31:42 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: anitha.gopi@stripped\
#   mm85qu4amqzx72uu
# 
# Begin bundle
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
symTWvIJHWeYu5IpwoSD7UbbKA==


--===============0821287832==--