From: marko.makela
Date: June 15 2011 7:36am
Subject: bzr push into mysql-trunk branch (marko.makela:3201 to 3202)
List-Archive: http://lists.mysql.com/commits/139211
Message-Id: <201106150737.p5F7bjIv004569@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2061432068=="

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

IDMyMDIgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3VuaXYuaQogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93
LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3RyeC90cngwcmVjLmMKIDMyMDEgQW5pdGhhIEdvcGkJMjAxMS0wNi0xNSBbbWVyZ2Vd
CiAgICAgIE1lcmdlIGZyb20gbXlzcWwtNS41CgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRl
c3QvdC9kaXNhYmxlZC5kZWYKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRy
L2J0cjBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOmFu
aXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzA2MTAtMXhsZjM5ZzNhMzV2ZTFtZgorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA2MTUwNzMzMDItcTlrdDNxMjR6MGVia3AwdQpAQCAtMTk4Nyw5ICsxOTg3LDkg
QEAgYnRyX2N1cl9vcHRpbWlzdGljX3VwZGF0ZSgKIAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUo
MTAyNCk7CiAJb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyhyZWMsIGluZGV4LCBOVUxMLCBVTElO
VF9VTkRFRklORUQsICZoZWFwKTsKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBV
TklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCXV0X2Eo
IXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklW
X0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9O
VUxMX0RFQlVHICovCiAKICNpZmRlZiBVTklWX0RFQlVHCiAJaWYgKGJ0cl9jdXJfcHJpbnRfcmVj
b3JkX29wcyAmJiB0aHIpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcmVtMHJlYy5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5o
CXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzA2MTAtMXhsZjM5ZzNhMzV2
ZTFtZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMzAyLXE5a3QzcTI0ejBlYmtwMHUKQEAgLTQ4
MCw3ICs0ODAsNyBAQCB1bGludAogcmVjX29mZnNfYW55X2V4dGVybigKIC8qPT09PT09PT09PT09
PT09PSovCiAJY29uc3QgdWxpbnQqCW9mZnNldHMpOy8qITwgaW46IGFycmF5IHJldHVybmVkIGJ5
IHJlY19nZXRfb2Zmc2V0cygpICovCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQg
VU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIC8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBE
ZXRlcm1pbmUgaWYgdGhlIG9mZnNldHMgYXJlIGZvciBhIHJlY29yZCBjb250YWluaW5nIG51bGwg
QkxPQiBwb2ludGVycy4KIEByZXR1cm4JZmlyc3QgZmllbGQgY29udGFpbmluZyBhIG51bGwgQkxP
QiBwb2ludGVyLCBvciBOVUxMIGlmIG5vbmUgZm91bmQgKi8KQEAgLTQ5MSw3ICs0OTEsNyBAQCBy
ZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4oCiAJY29uc3QgcmVjX3QqCXJlYywJCS8qITwgaW46IHJl
Y29yZCAqLwogCWNvbnN0IHVsaW50KglvZmZzZXRzKQkvKiE8IGluOiByZWNfZ2V0X29mZnNldHMo
cmVjKSAqLwogCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwot
I2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYg
LyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIG5vbnplcm8gaWYgdGhlIGV4
dGVybiBiaXQgaXMgc2V0IGluIG50aCBmaWVsZCBvZiByZWMuCiBAcmV0dXJuCW5vbnplcm8gaWYg
ZXh0ZXJuYWxseSBzdG9yZWQgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvcmVtMHJlYy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTBy
ZWMuaWMJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAzMDYxMC0xeGxmMzln
M2EzNXZlMW1mCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMzAyLXE5a3QzcTI0ejBlYmtwMHUK
QEAgLTEwODgsNyArMTA4OCw3IEBAIHJlY19vZmZzX2FueV9leHRlcm4oCiAJcmV0dXJuKFVOSVZf
VU5MSUtFTFkoKnJlY19vZmZzX2Jhc2Uob2Zmc2V0cykgJiBSRUNfT0ZGU19FWFRFUk5BTCkpOwog
fQogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIC8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBEZXRlcm1pbmUgaWYgdGhlIG9m
ZnNldHMgYXJlIGZvciBhIHJlY29yZCBjb250YWluaW5nIG51bGwgQkxPQiBwb2ludGVycy4KIEBy
ZXR1cm4JZmlyc3QgZmllbGQgY29udGFpbmluZyBhIG51bGwgQkxPQiBwb2ludGVyLCBvciBOVUxM
IGlmIG5vbmUgZm91bmQgKi8KQEAgLTExMjQsNyArMTEyNCw3IEBAIHJlY19vZmZzX2FueV9udWxs
X2V4dGVybigKIAogCXJldHVybihOVUxMKTsKIH0KLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVO
SVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICov
CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCiBSZXR1cm5zIG5vbnplcm8gaWYgdGhlIGV4dGVybiBiaXQgaXMgc2V0IGluIG50aCBm
aWVsZCBvZiByZWMuCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDphbml0
aGEuZ29waUBvcmFjbGUuY29tLTIwMTEwNjE1MDMwNjEwLTF4bGYzOWczYTM1dmUxbWYKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDYxNTA3MzMwMi1xOWt0M3EyNHowZWJrcDB1CkBAIC0xOTEsNiArMTkxLDggQEAg
Y29tbWFuZC4gTm90IHRlc3RlZCBvbiBXaW5kb3dzLiAqLwogCQkJCQkJZGVidWdnaW5nIHdpdGhv
dXQgVU5JVl9ERUJVRyAqLwogI2RlZmluZSBVTklWX0JMT0JfTElHSFRfREVCVUcJCQkvKiBFbmFi
bGUgb2ZmLXBhZ2UgY29sdW1uCiAJCQkJCQlkZWJ1Z2dpbmcgd2l0aG91dCBVTklWX0RFQlVHICov
CisjZGVmaW5lIFVOSVZfQkxPQl9OVUxMX0RFQlVHCQkJLyogRW5hYmxlIGRlZXAgb2ZmLXBhZ2UK
KwkJCQkJCWNvbHVtbiBkZWJ1Z2dpbmcgKi8KICNkZWZpbmUgVU5JVl9ERUJVRwkJCQkvKiBFbmFi
bGUgdXRfYWQoKSBhc3NlcnRpb25zCiAJCQkJCQlhbmQgZGlzYWJsZSBVTklWX0lOTElORSAqLwog
I2RlZmluZSBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUJCS8qIEVuYWJsZQoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUw
MzA2MTAtMXhsZjM5ZzNhMzV2ZTFtZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzMzMDItcTlrdDNxMjR6
MGVia3AwdQpAQCAtMjAwLDEzICsyMDAsMTMgQEAgcm93X2J1aWxkKAogCQl1dF9hZChyZWNfb2Zm
c192YWxpZGF0ZShyZWMsIGluZGV4LCBvZmZzZXRzKSk7CiAJfQogCi0jaWYgMCAvKiBkZWZpbmVk
IFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNpZiAwICYm
IGRlZmluZWQgVU5JVl9CTE9CX05VTExfREVCVUcKIAkvKiBUaGlzIG9uZSBjYW4gZmFpbCBpbiB0
cnhfcm9sbGJhY2tfYWN0aXZlKCkgaWYKIAl0aGUgc2VydmVyIGNyYXNoZWQgZHVyaW5nIGFuIGlu
c2VydCBiZWZvcmUgdGhlCiAJYnRyX3N0b3JlX2JpZ19yZWNfZXh0ZXJuX2ZpZWxkcygpIGRpZCBt
dHJfY29tbWl0KCkKIAlhbGwgQkxPQiBwb2ludGVycyB0byB0aGUgY2x1c3RlcmVkIGluZGV4IHJl
Y29yZC4gKi8KIAl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7
Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRp
ZiAvKiAwICYmIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAKIAlpZiAodHlwZSAhPSBST1dfQ09Q
WV9QT0lOVEVSUykgewogCQkvKiBUYWtlIGEgY29weSBvZiByZWMgdG8gaGVhcCAqLwpAQCAtMzkx
LDEwICszOTEsMTAgQEAgcm93X3JlY190b19pbmRleF9lbnRyeSgKIAkJcmVjID0gcmVjX2NvcHko
YnVmLCByZWMsIG9mZnNldHMpOwogCQkvKiBBdm9pZCBhIGRlYnVnIGFzc2VydGlvbiBpbiByZWNf
b2Zmc192YWxpZGF0ZSgpLiAqLwogCQlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywgaW5kZXgsIG9m
ZnNldHMpOwotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdI
VF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJfSBlbHNlIHsKIAkJdXRfYSgh
cmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZf
REVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05V
TExfREVCVUcgKi8KIAl9CiAKIAllbnRyeSA9IHJvd19yZWNfdG9faW5kZXhfZW50cnlfbG93KHJl
YywgaW5kZXgsIG9mZnNldHMsIG5fZXh0LCBoZWFwKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwdmVycy5jCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzA2MTAtMXhs
ZjM5ZzNhMzV2ZTFtZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMzAyLXE5a3QzcTI0ejBlYmtwMHUK
QEAgLTU1NywxMCArNTU3LDEwIEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50X3JlYWQo
CiAJCQkJLyogVGhlIHZpZXcgYWxyZWFkeSBzZWVzIHRoaXMgdmVyc2lvbjogd2UgY2FuCiAJCQkJ
Y29weSBpdCB0byBpbl9oZWFwIGFuZCByZXR1cm4gKi8KIAotI2lmIGRlZmluZWQgVU5JVl9ERUJV
RyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxM
X0RFQlVHCiAJCQkJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAogCQkJCQkgICAgIHZl
cnNpb24sICpvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElH
SFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAJCQkJYnVm
ID0gbWVtX2hlYXBfYWxsb2MoaW5faGVhcCwKIAkJCQkJCSAgICAgcmVjX29mZnNfc2l6ZSgqb2Zm
c2V0cykpOwpAQCAtNTk1LDkgKzU5NSw5IEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50
X3JlYWQoCiAJCSpvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHByZXZfdmVyc2lvbiwgaW5kZXgs
ICpvZmZzZXRzLAogCQkJCQkgICBVTElOVF9VTkRFRklORUQsIG9mZnNldF9oZWFwKTsKIAotI2lm
IGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lm
ZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVy
bihwcmV2X3ZlcnNpb24sICpvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklW
X0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwog
CiAJCXRyeF9pZCA9IHJvd19nZXRfcmVjX3RyeF9pZChwcmV2X3ZlcnNpb24sIGluZGV4LCAqb2Zm
c2V0cyk7CiAKQEAgLTY5Myw5ICs2OTMsOSBAQCByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25z
aXN0ZW50X3JlYWQoCiAJCQkvKiBXZSBmb3VuZCBhIHZlcnNpb24gdGhhdCBiZWxvbmdzIHRvIGEK
IAkJCWNvbW1pdHRlZCB0cmFuc2FjdGlvbjogcmV0dXJuIGl0LiAqLwogCi0jaWYgZGVmaW5lZCBV
TklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9C
TE9CX05VTExfREVCVUcKIAkJCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybih2ZXJzaW9u
LCAqb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCQkJaWYgKHJlYyA9
PSB2ZXJzaW9uKSB7CiAJCQkJKm9sZF92ZXJzID0gcmVjOwpAQCAtNzU0LDkgKzc1NCw5IEBAIHJv
d192ZXJzX2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVhZCgKIAkJdmVyc2lvbiA9IHByZXZf
dmVyc2lvbjsKIAkJKm9mZnNldHMgPSByZWNfZ2V0X29mZnNldHModmVyc2lvbiwgaW5kZXgsICpv
ZmZzZXRzLAogCQkJCQkgICBVTElOVF9VTkRFRklORUQsIG9mZnNldF9oZWFwKTsKLSNpZiBkZWZp
bmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBV
TklWX0JMT0JfTlVMTF9ERUJVRwogCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4odmVy
c2lvbiwgKm9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdI
VF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RFQlVHICovCiAJfS8qIGZvciAo
OzspICovCiAKIAlpZiAoaGVhcCkgewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvdHJ4L3RyeDByZWMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJl
dmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzA2MTAtMXhsZjM5ZzNhMzV2ZTFt
ZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMTA2MTUwNzMzMDItcTlrdDNxMjR6MGVia3AwdQpAQCAtMTU0Niw5ICsx
NTQ2LDkgQEAgdHJ4X3VuZG9fcHJldl92ZXJzaW9uX2J1aWxkKAogCXV0X2EodGFibGVfaWQgPT0g
aW5kZXgtPnRhYmxlLT5pZCk7CiAJdXRfYShwdHIpOwogCi0jIGlmIGRlZmluZWQgVU5JVl9ERUJV
RyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworIyBpZmRlZiBVTklWX0JMT0JfTlVM
TF9ERUJVRwogCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsK
LSMgZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyMgZW5k
aWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCWlmIChyb3dfdXBkX2NoYW5nZXNfZmll
bGRfc2l6ZV9vcl9leHRlcm5hbChpbmRleCwgb2Zmc2V0cywgdXBkYXRlKSkgewogCQl1bGludAlu
X2V4dDsKCg==

--===============2061432068==
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: 3f26a2ec3b430678fbab866f9e55f8c7b11af123
# timestamp: 2011-06-15 10:37:38 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   1xlf39g3a35ve1mf
# 
# Begin bundle
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
2OTsF/CqXev8XckU4UJAzzvKNA==


--===============2061432068==--