From: marko.makela
Date: June 15 2011 7:34am
Subject: bzr commit into mysql-trunk branch (marko.makela:3202)
List-Archive: http://lists.mysql.com/commits/139210
Message-Id: <201106150734.p5F7YaLs028192@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1427560116=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAzMDYxMC0xeGxm
MzlnM2EzNXZlMW1mCgogMzIwMiBNYXJrbyBNw6RrZWzDpAkyMDExLTA2LTE1IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41IHRvIG15c3FsLXRydW5rLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3JlbTByZWMuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5pYwog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzByb3cuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J0ci9i
dHIwY3VyLmMJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAzMDYxMC0xeGxm
MzlnM2EzNXZlMW1mCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNTA3MzMwMi1xOWt0M3EyNHowZWJrcDB1CkBA
IC0xOTg3LDkgKzE5ODcsOSBAQCBidHJfY3VyX29wdGltaXN0aWNfdXBkYXRlKAogCiAJaGVhcCA9
IG1lbV9oZWFwX2NyZWF0ZSgxMDI0KTsKIAlvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywg
aW5kZXgsIE5VTEwsIFVMSU5UX1VOREVGSU5FRCwgJmhlYXApOwotI2lmIGRlZmluZWQgVU5JVl9E
RUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9O
VUxMX0RFQlVHCiAJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykp
OwotI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5k
aWYgLyogVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogI2lmZGVmIFVOSVZfREVCVUcKIAlpZiAo
YnRyX2N1cl9wcmludF9yZWNvcmRfb3BzICYmIHRocikgewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9yZW0wcmVjLmgJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAz
MDYxMC0xeGxmMzlnM2EzNXZlMW1mCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0w
cmVjLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzMzMDItcTlrdDNx
MjR6MGVia3AwdQpAQCAtNDgwLDcgKzQ4MCw3IEBAIHVsaW50CiByZWNfb2Zmc19hbnlfZXh0ZXJu
KAogLyo9PT09PT09PT09PT09PT09Ki8KIAljb25zdCB1bGludCoJb2Zmc2V0cyk7LyohPCBpbjog
YXJyYXkgcmV0dXJuZWQgYnkgcmVjX2dldF9vZmZzZXRzKCkgKi8KLSNpZiBkZWZpbmVkIFVOSVZf
REVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0Jf
TlVMTF9ERUJVRwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIERldGVybWluZSBpZiB0aGUgb2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3Jk
IGNvbnRhaW5pbmcgbnVsbCBCTE9CIHBvaW50ZXJzLgogQHJldHVybglmaXJzdCBmaWVsZCBjb250
YWluaW5nIGEgbnVsbCBCTE9CIHBvaW50ZXIsIG9yIE5VTEwgaWYgbm9uZSBmb3VuZCAqLwpAQCAt
NDkxLDcgKzQ5MSw3IEBAIHJlY19vZmZzX2FueV9udWxsX2V4dGVybigKIAljb25zdCByZWNfdCoJ
cmVjLAkJLyohPCBpbjogcmVjb3JkICovCiAJY29uc3QgdWxpbnQqCW9mZnNldHMpCS8qITwgaW46
IHJlY19nZXRfb2Zmc2V0cyhyZWMpICovCiAJX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fybl91
bnVzZWRfcmVzdWx0KSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRf
REVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMg
bm9uemVybyBpZiB0aGUgZXh0ZXJuIGJpdCBpcyBzZXQgaW4gbnRoIGZpZWxkIG9mIHJlYy4KIEBy
ZXR1cm4Jbm9uemVybyBpZiBleHRlcm5hbGx5IHN0b3JlZCAqLwoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmljJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvcmVtMHJlYy5pYwlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUuY29tLTIwMTEw
NjE1MDMwNjEwLTF4bGYzOWczYTM1dmUxbWYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3JlbTByZWMuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzMzMDIt
cTlrdDNxMjR6MGVia3AwdQpAQCAtMTA4OCw3ICsxMDg4LDcgQEAgcmVjX29mZnNfYW55X2V4dGVy
bigKIAlyZXR1cm4oVU5JVl9VTkxJS0VMWSgqcmVjX29mZnNfYmFzZShvZmZzZXRzKSAmIFJFQ19P
RkZTX0VYVEVSTkFMKSk7CiB9CiAKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBV
TklWX0JMT0JfTElHSFRfREVCVUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIERl
dGVybWluZSBpZiB0aGUgb2Zmc2V0cyBhcmUgZm9yIGEgcmVjb3JkIGNvbnRhaW5pbmcgbnVsbCBC
TE9CIHBvaW50ZXJzLgogQHJldHVybglmaXJzdCBmaWVsZCBjb250YWluaW5nIGEgbnVsbCBCTE9C
IHBvaW50ZXIsIG9yIE5VTEwgaWYgbm9uZSBmb3VuZCAqLwpAQCAtMTEyNCw3ICsxMTI0LDcgQEAg
cmVjX29mZnNfYW55X251bGxfZXh0ZXJuKAogCiAJcmV0dXJuKE5VTEwpOwogfQotI2VuZGlmIC8q
IFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9C
TE9CX05VTExfREVCVUcgKi8KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgbm9uemVybyBpZiB0aGUgZXh0ZXJuIGJp
dCBpcyBzZXQgaW4gbnRoIGZpZWxkIG9mIHJlYy4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
dW5pdi5pCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA2MTUwMzA2MTAtMXhsZjM5
ZzNhMzV2ZTFtZgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjE1MDczMzAyLXE5a3QzcTI0ejBlYmtwMHUKQEAg
LTE5MSw2ICsxOTEsOCBAQCBjb21tYW5kLiBOb3QgdGVzdGVkIG9uIFdpbmRvd3MuICovCiAJCQkJ
CQlkZWJ1Z2dpbmcgd2l0aG91dCBVTklWX0RFQlVHICovCiAjZGVmaW5lIFVOSVZfQkxPQl9MSUdI
VF9ERUJVRwkJCS8qIEVuYWJsZSBvZmYtcGFnZSBjb2x1bW4KIAkJCQkJCWRlYnVnZ2luZyB3aXRo
b3V0IFVOSVZfREVCVUcgKi8KKyNkZWZpbmUgVU5JVl9CTE9CX05VTExfREVCVUcJCQkvKiBFbmFi
bGUgZGVlcCBvZmYtcGFnZQorCQkJCQkJY29sdW1uIGRlYnVnZ2luZyAqLwogI2RlZmluZSBVTklW
X0RFQlVHCQkJCS8qIEVuYWJsZSB1dF9hZCgpIGFzc2VydGlvbnMKIAkJCQkJCWFuZCBkaXNhYmxl
IFVOSVZfSU5MSU5FICovCiAjZGVmaW5lIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQkJLyogRW5h
YmxlCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJcmV2aWQ6YW5pdGhhLmdvcGlAb3Jh
Y2xlLmNvbS0yMDExMDYxNTAzMDYxMC0xeGxmMzlnM2EzNXZlMW1mCisrKyBiL3N0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYx
NTA3MzMwMi1xOWt0M3EyNHowZWJrcDB1CkBAIC0yMDAsMTMgKzIwMCwxMyBAQCByb3dfYnVpbGQo
CiAJCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9mZnNldHMpKTsKIAl9CiAK
LSNpZiAwIC8qIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9E
RUJVRyAqLworI2lmIDAgJiYgZGVmaW5lZCBVTklWX0JMT0JfTlVMTF9ERUJVRwogCS8qIFRoaXMg
b25lIGNhbiBmYWlsIGluIHRyeF9yb2xsYmFja19hY3RpdmUoKSBpZgogCXRoZSBzZXJ2ZXIgY3Jh
c2hlZCBkdXJpbmcgYW4gaW5zZXJ0IGJlZm9yZSB0aGUKIAlidHJfc3RvcmVfYmlnX3JlY19leHRl
cm5fZmllbGRzKCkgZGlkIG10cl9jb21taXQoKQogCWFsbCBCTE9CIHBvaW50ZXJzIHRvIHRoZSBj
bHVzdGVyZWQgaW5kZXggcmVjb3JkLiAqLwogCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4dGVy
bihyZWMsIG9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdI
VF9ERUJVRyAqLworI2VuZGlmIC8qIDAgJiYgVU5JVl9CTE9CX05VTExfREVCVUcgKi8KIAogCWlm
ICh0eXBlICE9IFJPV19DT1BZX1BPSU5URVJTKSB7CiAJCS8qIFRha2UgYSBjb3B5IG9mIHJlYyB0
byBoZWFwICovCkBAIC0zOTEsMTAgKzM5MSwxMCBAQCByb3dfcmVjX3RvX2luZGV4X2VudHJ5KAog
CQlyZWMgPSByZWNfY29weShidWYsIHJlYywgb2Zmc2V0cyk7CiAJCS8qIEF2b2lkIGEgZGVidWcg
YXNzZXJ0aW9uIGluIHJlY19vZmZzX3ZhbGlkYXRlKCkuICovCiAJCXJlY19vZmZzX21ha2VfdmFs
aWQocmVjLCBpbmRleCwgb2Zmc2V0cyk7Ci0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmlu
ZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIAl9
IGVsc2UgewogCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRzKSk7
Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRp
ZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCX0KIAogCWVudHJ5ID0gcm93X3JlY190b19p
bmRleF9lbnRyeV9sb3cocmVjLCBpbmRleCwgb2Zmc2V0cywgbl9leHQsIGhlYXApOwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0y
MDExMDYxNTAzMDYxMC0xeGxmMzlnM2EzNXZlMW1mCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzB2ZXJzLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MTUwNzMzMDIt
cTlrdDNxMjR6MGVia3AwdQpAQCAtNTU3LDEwICs1NTcsMTAgQEAgcm93X3ZlcnNfYnVpbGRfZm9y
X2NvbnNpc3RlbnRfcmVhZCgKIAkJCQkvKiBUaGUgdmlldyBhbHJlYWR5IHNlZXMgdGhpcyB2ZXJz
aW9uOiB3ZSBjYW4KIAkJCQljb3B5IGl0IHRvIGluX2hlYXAgYW5kIHJldHVybiAqLwogCi0jaWYg
ZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWZk
ZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIAkJCQl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRl
cm4oCiAJCQkJCSAgICAgdmVyc2lvbiwgKm9mZnNldHMpKTsKLSNlbmRpZiAvKiBVTklWX0RFQlVH
IHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxPQl9OVUxMX0RF
QlVHICovCiAKIAkJCQlidWYgPSBtZW1faGVhcF9hbGxvYyhpbl9oZWFwLAogCQkJCQkJICAgICBy
ZWNfb2Zmc19zaXplKCpvZmZzZXRzKSk7CkBAIC01OTUsOSArNTk1LDkgQEAgcm93X3ZlcnNfYnVp
bGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgKIAkJKm9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocHJl
dl92ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMsCiAJCQkJCSAgIFVMSU5UX1VOREVGSU5FRCwgb2Zm
c2V0X2hlYXApOwogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9C
X0xJR0hUX0RFQlVHCisjaWZkZWYgVU5JVl9CTE9CX05VTExfREVCVUcKIAkJdXRfYSghcmVjX29m
ZnNfYW55X251bGxfZXh0ZXJuKHByZXZfdmVyc2lvbiwgKm9mZnNldHMpKTsKLSNlbmRpZiAvKiBV
TklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLworI2VuZGlmIC8qIFVOSVZfQkxP
Ql9OVUxMX0RFQlVHICovCiAKIAkJdHJ4X2lkID0gcm93X2dldF9yZWNfdHJ4X2lkKHByZXZfdmVy
c2lvbiwgaW5kZXgsICpvZmZzZXRzKTsKIApAQCAtNjkzLDkgKzY5Myw5IEBAIHJvd192ZXJzX2J1
aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVhZCgKIAkJCS8qIFdlIGZvdW5kIGEgdmVyc2lvbiB0
aGF0IGJlbG9uZ3MgdG8gYQogCQkJY29tbWl0dGVkIHRyYW5zYWN0aW9uOiByZXR1cm4gaXQuICov
CiAKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVC
VUcKKyNpZmRlZiBVTklWX0JMT0JfTlVMTF9ERUJVRwogCQkJdXRfYSghcmVjX29mZnNfYW55X251
bGxfZXh0ZXJuKHZlcnNpb24sICpvZmZzZXRzKSk7Ci0jZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBV
TklWX0JMT0JfTElHSFRfREVCVUcgKi8KKyNlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAq
LwogCiAJCQlpZiAocmVjID09IHZlcnNpb24pIHsKIAkJCQkqb2xkX3ZlcnMgPSByZWM7CkBAIC03
NTQsOSArNzU0LDkgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAog
CQl2ZXJzaW9uID0gcHJldl92ZXJzaW9uOwogCQkqb2Zmc2V0cyA9IHJlY19nZXRfb2Zmc2V0cyh2
ZXJzaW9uLCBpbmRleCwgKm9mZnNldHMsCiAJCQkJCSAgIFVMSU5UX1VOREVGSU5FRCwgb2Zmc2V0
X2hlYXApOwotI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9MSUdI
VF9ERUJVRworI2lmZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJCXV0X2EoIXJlY19vZmZzX2Fu
eV9udWxsX2V4dGVybih2ZXJzaW9uLCAqb2Zmc2V0cykpOwotI2VuZGlmIC8qIFVOSVZfREVCVUcg
fHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCisjZW5kaWYgLyogVU5JVl9CTE9CX05VTExfREVC
VUcgKi8KIAl9LyogZm9yICg7OykgKi8KIAogCWlmIChoZWFwKSB7Cgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwcmVjLmMJcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDYxNTAzMDYx
MC0xeGxmMzlnM2EzNXZlMW1mCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYxNTA3MzMwMi1xOWt0M3EyNHowZWJr
cDB1CkBAIC0xNTQ2LDkgKzE1NDYsOSBAQCB0cnhfdW5kb19wcmV2X3ZlcnNpb25fYnVpbGQoCiAJ
dXRfYSh0YWJsZV9pZCA9PSBpbmRleC0+dGFibGUtPmlkKTsKIAl1dF9hKHB0cik7CiAKLSMgaWYg
ZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjIGlm
ZGVmIFVOSVZfQkxPQl9OVUxMX0RFQlVHCiAJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJu
KHJlYywgb2Zmc2V0cykpOwotIyBlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdI
VF9ERUJVRyAqLworIyBlbmRpZiAvKiBVTklWX0JMT0JfTlVMTF9ERUJVRyAqLwogCiAJaWYgKHJv
d191cGRfY2hhbmdlc19maWVsZF9zaXplX29yX2V4dGVybmFsKGluZGV4LCBvZmZzZXRzLCB1cGRh
dGUpKSB7CiAJCXVsaW50CW5fZXh0OwoK

--===============1427560116==
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:34:28 +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==


--===============1427560116==--