From: marko.makela
Date: June 15 2011 7:37am
Subject: bzr push into mysql-5.5 branch (marko.makela:3450 to 3451)
List-Archive: http://lists.mysql.com/commits/139227
Message-Id: <201106150737.p5F7buIk004739@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0840552785=="

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

IDM0NTEgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS91bml2LmkKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5j
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS90cngvdHJ4MHJlYy5jCiAzNDUwIEFuaXRoYSBHb3BpCTIwMTEtMDYtMTUKICAgICAgQnVn
IzEyNTYxMjk3IDogRGlzYWJsZSB0ZXN0IG1haW4ubXlzcWxfZW1iZWRkZWQgc2luY2UgaXQgaXMg
ZmFpbGluZyBvbiBhbGwgcGxhdGZvcm1zCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qv
dC9kaXNhYmxlZC5kZWYKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0
cjBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOmFuaXRo
YS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzAzMTMtbW04NXF1NGFtcXp4NzJ1dQorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTA2MTUwNzMwMTktaG9ieW15Y3ZydTEyOXQ5YQpAQCAtMTk4OSw5ICsxOTg5LDkgQEAg
YnRyX2N1cl9vcHRpbWlzdGljX3VwZGF0ZSgKIAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMTAy
NCk7CiAJb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4LCBOVUxMLCBVTElOVF9V
TkRFRklORUQsICZoZWFwKTsKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklW
X0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCXV0X2EoIXJl
Y19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RF
QlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxM
X0RFQlVHICovCiAKICNpZmRlZiBVTklWX0RFQlVHCiAJaWYgKGJ0cl9jdXJfcHJpbnRfcmVjb3Jk
X29wcyAmJiB0aHIpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvcmVtMHJlYy5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJl
dmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzAzMTMtbW04NXF1NGFtcXp4NzJ1
dQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMDE5LWhvYnlteWN2cnUxMjl0OWEKQEAgLTQ4MCw3
ICs0ODAsNyBAQCB1bGludAogcmVjX29mZnNfYW55X2V4dGVybigKIC8qPT09PT09PT09PT09PT09
PSovCiAJY29uc3QgdWxpbnQqCW9mZnNldHMpOy8qITwgaW46IGFycmF5IHJldHVybmVkIGJ5IHJl
Y19nZXRfb2Zmc2V0cygpICovCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5J
Vl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBEZXRl
cm1pbmUgaWYgdGhlIG9mZnNldHMgYXJlIGZvciBhIHJlY29yZCBjb250YWluaW5nIG51bGwgQkxP
QiBwb2ludGVycy4KIEByZXR1cm4JZmlyc3QgZmllbGQgY29udGFpbmluZyBhIG51bGwgQkxPQiBw
b2ludGVyLCBvciBOVUxMIGlmIG5vbmUgZm91bmQgKi8KQEAgLTQ5MSw3ICs0OTEsNyBAQCByZWNf
b2Zmc19hbnlfbnVsbF9leHRlcm4oCiAJY29uc3QgcmVjX3QqCXJlYywJCS8qITwgaW46IHJlY29y
ZCAqLwogCWNvbnN0IHVsaW50KglvZmZzZXRzKQkvKiE8IGluOiByZWNfZ2V0X29mZnNldHMocmVj
KSAqLwogCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwotI2Vu
ZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyog
VU5JVl9CTE9CX05VTExfREVCVUcgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIG5vbnplcm8gaWYgdGhlIGV4dGVy
biBiaXQgaXMgc2V0IGluIG50aCBmaWVsZCBvZiByZWMuCiBAcmV0dXJuCW5vbnplcm8gaWYgZXh0
ZXJuYWxseSBzdG9yZWQgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcmVtMHJlYy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMu
aWMJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAzMDMxMy1tbTg1cXU0YW1x
eng3MnV1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMDE5LWhvYnlteWN2cnUxMjl0OWEKQEAg
LTEwODgsNyArMTA4OCw3IEBAIHJlY19vZmZzX2FueV9leHRlcm4oCiAJcmV0dXJuKFVOSVZfVU5M
SUtFTFkoKnJlY19vZmZzX2Jhc2Uob2Zmc2V0cykgJiBSRUNfT0ZGU19FWFRFUk5BTCkpOwogfQog
Ci0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
CisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBEZXRlcm1pbmUgaWYgdGhlIG9mZnNl
dHMgYXJlIGZvciBhIHJlY29yZCBjb250YWluaW5nIG51bGwgQkxPQiBwb2ludGVycy4KIEByZXR1
cm4JZmlyc3QgZmllbGQgY29udGFpbmluZyBhIG51bGwgQkxPQiBwb2ludGVyLCBvciBOVUxMIGlm
IG5vbmUgZm91bmQgKi8KQEAgLTExMjQsNyArMTEyNCw3IEBAIHJlY19vZmZzX2FueV9udWxsX2V4
dGVybigKIAogCXJldHVybihOVUxMKTsKIH0KLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZf
QkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
LyoqCiBSZXR1cm5zIG5vbnplcm8gaWYgdGhlIGV4dGVybiBiaXQgaXMgc2V0IGluIG50aCBmaWVs
ZCBvZiByZWMuCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Vu
aXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDphbml0aGEu
Z29waUBvcmFjbGUuY29tLTIwMTEwNjE1MDMwMzEzLW1tODVxdTRhbXF6eDcydXUKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDExMDYxNTA3MzAxOS1ob2J5bXljdnJ1MTI5dDlhCkBAIC0xODYsNiArMTg2LDggQEAgY29t
bWFuZC4gTm90IHRlc3RlZCBvbiBXaW5kb3dzLiAqLwogCQkJCQkJZGVidWdnaW5nIHdpdGhvdXQg
VU5JVl9ERUJVRyAqLwogI2RlZmluZSBVTklWX0JMT0JfTElHSFRfREVCVUcJCQkvKiBFbmFibGUg
b2ZmLXBhZ2UgY29sdW1uCiAJCQkJCQlkZWJ1Z2dpbmcgd2l0aG91dCBVTklWX0RFQlVHICovCisj
ZGVmaW5lIFVOSVZfQkxPQl9OVUxMX0RFQlVHCQkJLyogRW5hYmxlIGRlZXAgb2ZmLXBhZ2UKKwkJ
CQkJCWNvbHVtbiBkZWJ1Z2dpbmcgKi8KICNkZWZpbmUgVU5JVl9ERUJVRwkJCQkvKiBFbmFibGUg
dXRfYWQoKSBhc3NlcnRpb25zCiAJCQkJCQlhbmQgZGlzYWJsZSBVTklWX0lOTElORSAqLwogI2Rl
ZmluZSBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUJCS8qIEVuYWJsZQoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHJvdy5jCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzAz
MTMtbW04NXF1NGFtcXp4NzJ1dQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzMwMTktaG9ieW15Y3ZydTEy
OXQ5YQpAQCAtMjAwLDEzICsyMDAsMTMgQEAgcm93X2J1aWxkKAogCQl1dF9hZChyZWNfb2Zmc192
YWxpZGF0ZShyZWMsIGluZGV4LCBvZmZzZXRzKSk7CiAJfQogCi0jaWYgMCAvKiBkZWZpbmVkIFVO
SVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNpZiAwICYmIGRl
ZmluZWQgVU5JVl9CTE9CX05VTExfREVCVUcKIAkvKiBUaGlzIG9uZSBjYW4gZmFpbCBpbiB0cnhf
cm9sbGJhY2tfYWN0aXZlKCkgaWYKIAl0aGUgc2VydmVyIGNyYXNoZWQgZHVyaW5nIGFuIGluc2Vy
dCBiZWZvcmUgdGhlCiAJYnRyX3N0b3JlX2JpZ19yZWNfZXh0ZXJuX2ZpZWxkcygpIGRpZCBtdHJf
Y29tbWl0KCkKIAlhbGwgQkxPQiBwb2ludGVycyB0byB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29y
ZC4gKi8KIAl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7Ci0j
ZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAv
KiAwICYmIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKIAlpZiAodHlwZSAhPSBST1dfQ09QWV9Q
T0lOVEVSUykgewogCQkvKiBUYWtlIGEgY29weSBvZiByZWMgdG8gaGVhcCAqLwpAQCAtMzkxLDEw
ICszOTEsMTAgQEAgcm93X3JlY190b19pbmRleF9lbnRyeSgKIAkJcmVjID0gcmVjX2NvcHkoYnVm
LCByZWMsIG9mZnNldHMpOwogCQkvKiBBdm9pZCBhIGRlYnVnIGFzc2VydGlvbiBpbiByZWNfb2Zm
c192YWxpZGF0ZSgpLiAqLwogCQlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywgaW5kZXgsIG9mZnNl
dHMpOwotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9E
RUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJfSBlbHNlIHsKIAkJdXRfYSghcmVj
X29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVC
VUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExf
REVCVUcgKi8KIAl9CiAKIAllbnRyeSA9IHJvd19yZWNfdG9faW5kZXhfZW50cnlfbG93KHJlYywg
aW5kZXgsIG9mZnNldHMsIG5fZXh0LCBoZWFwKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
dmVycy5jCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzAzMTMtbW04NXF1
NGFtcXp4NzJ1dQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMDE5LWhvYnlteWN2cnUxMjl0OWEKQEAg
LTU1MCwxMCArNTUwLDEwIEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50X3JlYWQoCiAJ
CQkJLyogVGhlIHZpZXcgYWxyZWFkeSBzZWVzIHRoaXMgdmVyc2lvbjogd2UgY2FuCiAJCQkJY29w
eSBpdCB0byBpbl9oZWFwIGFuZCByZXR1cm4gKi8KIAotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8
fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RF
QlVHCiAJCQkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAogCQkJCQkgICAgIHZlcnNp
b24sICpvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRf
REVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAJCQkJYnVmID0g
bWVtX2hlYXBfYWxsb2MoaW5faGVhcCwKIAkJCQkJCSAgICAgcmVjX29mZnNfc2l6ZSgqb2Zmc2V0
cykpOwpAQCAtNTg4LDkgKzU4OCw5IEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50X3Jl
YWQoCiAJCSpvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHByZXZfdmVyc2lvbiwgaW5kZXgsICpv
ZmZzZXRzLAogCQkJCQkgICBVTElOVF9VTkRFRklORUQsIG9mZnNldF9oZWFwKTsKIAotI2lmIGRl
ZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVm
IFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihw
cmV2X3ZlcnNpb24sICpvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JM
T0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAJ
CXRyeF9pZCA9IHJvd19nZXRfcmVjX3RyeF9pZChwcmV2X3ZlcnNpb24sIGluZGV4LCAqb2Zmc2V0
cyk7CiAKQEAgLTY5MSw5ICs2OTEsOSBAQCByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25zaXN0
ZW50X3JlYWQoCiAJCQkvKiBXZSBmb3VuZCBhIHZlcnNpb24gdGhhdCBiZWxvbmdzIHRvIGEKIAkJ
CWNvbW1pdHRlZCB0cmFuc2FjdGlvbjogcmV0dXJuIGl0LiAqLwogCi0jaWYgZGVmaW5lZCBVTklW
X0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9C
X05VTExfREVCVUcKIAkJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybih2ZXJzaW9uLCAq
b2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVH
ICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCQkJaWYgKHJlYyA9PSB2
ZXJzaW9uKSB7CiAJCQkJKm9sZF92ZXJzID0gcmVjOwpAQCAtNzUyLDkgKzc1Miw5IEBAIHJvd192
ZXJzX2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVhZCgKIAkJdmVyc2lvbiA9IHByZXZfdmVy
c2lvbjsKIAkJKm9mZnNldHMgPSByZWNfZ2V0X29mZnNldHModmVyc2lvbiwgaW5kZXgsICpvZmZz
ZXRzLAogCQkJCQkgICBVTElOVF9VTkRFRklORUQsIG9mZnNldF9oZWFwKTsKLSNpZiBkZWZpbmVk
IFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklW
X0JMT0JfTlVMTF9ERUJVRwogCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4odmVyc2lv
biwgKm9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9E
RUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAJfS8qIGZvciAoOzsp
ICovCiAKIAlpZiAoaGVhcCkgewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
dHJ4L3RyeDByZWMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJldmlk
OmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzAzMTMtbW04NXF1NGFtcXp4NzJ1dQor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA2MTUwNzMwMTktaG9ieW15Y3ZydTEyOXQ5YQpAQCAtMTU5Myw5ICsxNTkz
LDkgQEAgdHJ4X3VuZG9fcHJldl92ZXJzaW9uX2J1aWxkKAogCQlyZXR1cm4oREJfRVJST1IpOwog
CX0KIAotIyBpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKKyMgaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIAl1dF9hKCFyZWNfb2Zmc19hbnlf
bnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7Ci0jIGVuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5J
Vl9CTE9CX0xJR0hUX0RFQlVHICovCisjIGVuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICov
CiAKIAlpZiAocm93X3VwZF9jaGFuZ2VzX2ZpZWxkX3NpemVfb3JfZXh0ZXJuYWwoaW5kZXgsIG9m
ZnNldHMsIHVwZGF0ZSkpIHsKIAkJdWxpbnQJbl9leHQ7Cgo=

--===============0840552785==
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:37:49 +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==


--===============0840552785==--