From: marko.makela
Date: June 30 2010 9:41am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3532 to 3534) Bug#54358
List-Archive: http://lists.mysql.com/commits/112547
X-Bug: 54358
Message-Id: <201006300942.o5U95nfM023726@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0811836695=="

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

IDM1MzQgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0zMAogICAgICBCdWcjNTQzNTggZm9sbG93LXVw
OiBDb3JyZWN0IHNvbWUgZXJyb3IgaGFuZGxpbmcuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCiAzNTMzIE1hcmtvIE3DpGtlbMOkCTIwMTAt
MDYtMzAKICAgICAgQ29ycmVjdCBzb21lIGNvbW1lbnRzIHRoYXQgd2VyZSBhZGRlZCBpbiB0aGUg
Zml4IG9mIEJ1ZyAjNTQzNTgKICAgICAgKFJFQUQgVU5DT01NSVRURUQgYWNjZXNzIGZhaWx1cmUg
b2Ygb2ZmLXBhZ2UgRFlOQU1JQyBvciBDT01QUkVTU0VEIGNvbHVtbnMpLgogICAgICAKICAgICAg
UmVjb3JkcyB0aGF0IGxhY2sgaW5jb21wbGV0ZWx5IHdyaXR0ZW4gZXh0ZXJuYWxseSBzdG9yZWQg
Y29sdW1ucyBtYXkKICAgICAgYmUgYWNjZXNzZWQgYnkgUkVBRCBVTkNPTU1JVFRFRCB0cmFuc2Fj
dGlvbiBldmVuIHdpdGhvdXQgaW52b2x2aW5nIGEKICAgICAgY3Jhc2ggZHVyaW5nIGFuIElOU0VS
VCBvciBVUERBVEUgb3BlcmF0aW9uLiBJIHZlcmlmaWVkIHRoaXMgYXMgZm9sbG93cy4KICAgICAg
CiAgICAgICgxKSBhZGRlZCBhIGRlbGF5IGFmdGVyIHRoZSBtaW5pLXRyYW5zYWN0aW9uIGZvciB3
cml0aW5nIHRoZSBjbHVzdGVyZWQKICAgICAgaW5kZXggJ3N0dWInIHJlY29yZCB3YXMgY29tbWl0
dGVkIChwYXRjaCBhdHRhY2hlZCkKICAgICAgKDIpIHN0YXJ0ZWQgbXlzcWxkIGluIGdkYiwgc2V0
dGluZyBicmVha3BvaW50cyB0byB0aGUgd2hlcmUgdGhlCiAgICAgIGFzc2VydGlvbnMgYWJvdXQg
UkVBRCBVTkNPTU1JVFRFRCB3ZXJlIGFkZGVkIGluIHRoZSBidWcgZml4CiAgICAgICgzKSBpbnZv
a2VkIGlidGVzdDMgLS1jcmVhdGUtb3B0aW9ucz1rZXlfYmxvY2tfc2l6ZT0yCiAgICAgIHRvIGNy
ZWF0ZSBCTE9CcyBpbiBhIENPTVBSRVNTRUQgdGFibGUKICAgICAgKDQpIGludm9rZWQgdGhlIGZv
bGxvd2luZzoKICAgICAgeWVzICdzZXQgdHJhbnNhY3Rpb24gaXNvbGF0aW9uIGxldmVsIHJlYWQg
dW5jb21taXR0ZWQ7CiAgICAgIGNoZWNrc3VtIHRhYmxlIGJsb2J0MztzZWxlY3Qgc2xlZXAoMSk7
J3xteXNxbCAtdXJvb3QgdGVzdAogICAgICAoNSkgbm90ZWQgdGhhdCBvbmUgb2YgdGhlIGJyZWFr
cG9pbnRzIHdhcyB0cmlnZ2VyZWQKICAgICAgKHJldHVybihOVUxMKSBpbiBidHJfcmVjX2NvcHlf
ZXh0ZXJuYWxseV9zdG9yZWRfZmllbGQoKSkKICAgICAgCiAgICAgID09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBpbnMuYycKICAgICAgLS0tIHN0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9yb3cvcm93MGlucy5jCTIwMTAtMDYtMzAgMDg6MTc6MjUgKzAwMDAKICAg
ICAgKysrIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MGlucy5jCTIwMTAtMDYtMzAgMDg6
MTc6MjUgKzAwMDAKICAgICAgQEAgLTIxMjAsNiArMjEyMCw3IEBAIGZ1bmN0aW9uX2V4aXQ6CiAg
ICAgICAJCXJlY190KglyZWM7CiAgICAgICAJCXVsaW50KglvZmZzZXRzOwogICAgICAgCQltdHJf
c3RhcnQoJm10cik7CiAgICAgICsJCW9zX3RocmVhZF9zbGVlcCg1MDAwMDAwKTsKICAgICAgIAog
ICAgICAgCQlidHJfY3VyX3NlYXJjaF90b19udGhfbGV2ZWwoaW5kZXgsIDAsIGVudHJ5LCBQQUdF
X0NVUl9MRSwKICAgICAgIAkJCQkJICAgIEJUUl9NT0RJRllfVFJFRSwgJmN1cnNvciwgMCwKICAg
ICAgCiAgICAgID09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3Jv
dzB1cGQuYycKICAgICAgLS0tIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVwZC5jCTIw
MTAtMDYtMzAgMDg6MTE6NTUgKzAwMDAKICAgICAgKysrIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9y
b3cvcm93MHVwZC5jCTIwMTAtMDYtMzAgMDg6MTE6NTUgKzAwMDAKICAgICAgQEAgLTE3NjMsNiAr
MTc2Myw3IEBAIHJvd191cGRfY2x1c3RfcmVjKAogICAgICAgCQlyZWNfb2Zmc19pbml0KG9mZnNl
dHNfKTsKICAgICAgIAogICAgICAgCQltdHJfc3RhcnQobXRyKTsKICAgICAgKwkJb3NfdGhyZWFk
X3NsZWVwKDUwMDAwMDApOwogICAgICAgCiAgICAgICAJCXV0X2EoYnRyX3BjdXJfcmVzdG9yZV9w
b3NpdGlvbihCVFJfTU9ESUZZX1RSRUUsIHBjdXIsIG10cikpOwogICAgICAgCQlyZWMgPSBidHJf
Y3VyX2dldF9yZWMoYnRyX2N1cik7CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93
MHNlbC5jCiAzNTMyIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMjkKICAgICAgQ2hhbmdlTG9nIGVu
dHJ5IGZvciBCdWcgIzU0NDA4CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9i
dHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTIxOS1wamJrcGs1cnNxenRt
dzI3CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjMwMDkzODQ3LTdna3IxbGgzYmgyeGtzeTAKQEAgLTQ4
NDksMjAgKzQ4NDksMTAgQEAgYnRyX3JlY19jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkKAog
CWlmIChVTklWX1VOTElLRUxZCiAJICAgICghbWVtY21wKGRhdGEgKyBsb2NhbF9sZW4gLSBCVFJf
RVhURVJOX0ZJRUxEX1JFRl9TSVpFLAogCQkgICAgIGZpZWxkX3JlZl96ZXJvLCBCVFJfRVhURVJO
X0ZJRUxEX1JFRl9TSVpFKSkpIHsKLQkJLyogVGhlIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkIHdh
cyBub3Qgd3JpdHRlbgotCQl5ZXQuIFRoaXMgaXMgb25seSBhIHZhbGlkIGNvbmRpdGlvbiB3aGVu
IHRoZSBzZXJ2ZXIKLQkJY3Jhc2hlZCBhZnRlciB0aGUgdGltZSBhIHJlY29yZCBzdHViIHdhcyBm
cmVzaGx5Ci0JCWluc2VydGVkIGJ1dCBiZWZvcmUgYWxsIGl0cyBjb2x1bW5zIHdlcmUgd3JpdHRl
bi4gVGhpcwotCQlyZWNvcmQgc2hvdWxkIG9ubHkgYmUgc2VlbiBieQorCQkvKiBUaGUgZXh0ZXJu
YWxseSBzdG9yZWQgZmllbGQgd2FzIG5vdCB3cml0dGVuIHlldC4KKwkJVGhpcyByZWNvcmQgc2hv
dWxkIG9ubHkgYmUgc2VlbiBieQogCQlyZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgpIG9y
IGFueQogCQlUUlhfSVNPX1JFQURfVU5DT01NSVRURUQgdHJhbnNhY3Rpb25zLiAqLwotCi0JCS8q
IFRPRE86IGFzc2VydCB0aGF0IHRoZXJlIGlzIGFuIG93bmVyX3RyeCB3aXRoCi0JCW93bmVyX3Ry
eC0+aWQgPT0gREJfVFJYX0lEIGFuZCBvd25lcl90cngtPmlzX3JlY292ZXJlZCAqLwotCi0JCS8q
IFRPRE86IGFzc2VydCB0aGF0IGZvciB0aGUgY3VycmVudCB0cmFuc2FjdGlvbiB0cngsCi0JCWVp
dGhlciAodHJ4ID09IG93bmVyX3RyeCAmJiB0cnhfaXNfcmVjdih0cngpKSBvcgotCQl0cngtPmlz
b2xhdGlvbl9sZXZlbCA9PSBUUlhfSVNPX1JFQURfVU5DT01NSVRURUQuICovCiAJCXJldHVybihO
VUxMKTsKIAl9CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93
L3JvdzBzZWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjkxMzEyMTktcGpia3BrNXJzcXp0bXcy
NworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5Mzg0Ny03Z2tyMWxoM2JoMnhrc3kwCkBAIC00Mjcs
MTEgKzQyNyw3IEBAIHJvd19zZWxfZmV0Y2hfY29sdW1ucygKIAogCQkJCS8qIGRhdGEgPT0gTlVM
TCBtZWFucyB0aGF0IHRoZQogCQkJCWV4dGVybmFsbHkgc3RvcmVkIGZpZWxkIHdhcyBub3QKLQkJ
CQl3cml0dGVuIHlldC4gVGhpcyBpcyBvbmx5IGEgdmFsaWQKLQkJCQljb25kaXRpb24gd2hlbiB0
aGUgc2VydmVyIGNyYXNoZWQKLQkJCQlhZnRlciB0aGUgdGltZSBhIHJlY29yZCBzdHViIHdhcwot
CQkJCWZyZXNobHkgaW5zZXJ0ZWQgYnV0IGJlZm9yZSBhbGwgaXRzCi0JCQkJY29sdW1ucyB3ZXJl
IHdyaXR0ZW4uIFRoaXMgcmVjb3JkCisJCQkJd3JpdHRlbiB5ZXQuIFRoaXMgcmVjb3JkCiAJCQkJ
c2hvdWxkIG9ubHkgYmUgc2VlbiBieQogCQkJCXJlY3ZfcmVjb3Zlcnlfcm9sbGJhY2tfYWN0aXZl
KCkgb3IgYW55CiAJCQkJVFJYX0lTT19SRUFEX1VOQ09NTUlUVEVECkBAIC0yNzQ0LDEyICsyNzQw
LDcgQEAgcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAKIAkJCWlmIChVTklWX1VOTElLRUxZKCFk
YXRhKSkgewogCQkJCS8qIFRoZSBleHRlcm5hbGx5IHN0b3JlZCBmaWVsZAotCQkJCXdhcyBub3Qg
d3JpdHRlbiB5ZXQuIFRoaXMgaXMKLQkJCQlvbmx5IGEgdmFsaWQgY29uZGl0aW9uIHdoZW4KLQkJ
CQl0aGUgc2VydmVyIGNyYXNoZWQgYWZ0ZXIgdGhlCi0JCQkJdGltZSBhIHJlY29yZCBzdHViIHdh
cyBmcmVzaGx5Ci0JCQkJaW5zZXJ0ZWQgYnV0IGJlZm9yZSBhbGwgaXRzCi0JCQkJY29sdW1ucyB3
ZXJlIHdyaXR0ZW4uIFRoaXMKKwkJCQl3YXMgbm90IHdyaXR0ZW4geWV0LiBUaGlzCiAJCQkJcmVj
b3JkIHNob3VsZCBvbmx5IGJlIHNlZW4gYnkKIAkJCQlyZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2Fj
dGl2ZSgpCiAJCQkJb3IgYW55IFRSWF9JU09fUkVBRF9VTkNPTU1JVFRFRApAQCAtMzYyMyw4ICsz
NjE0LDcgQEAgcm93X3NlYXJjaF9mb3JfbXlzcWwoCiAKIAkJCQlpZiAoIXJvd19zZWxfc3RvcmVf
bXlzcWxfcmVjKGJ1ZiwgcHJlYnVpbHQsCiAJCQkJCQkJICAgICByZWMsIG9mZnNldHMpKSB7Ci0J
CQkJCS8qIE9ubHkgZnJlc2ggaW5zZXJ0cyBhdAotCQkJCQlzZXJ2ZXIgY3Jhc2ggdGltZSBtYXkg
Y29udGFpbgorCQkJCQkvKiBPbmx5IGZyZXNoIGluc2VydHMgbWF5IGNvbnRhaW4KIAkJCQkJaW5j
b21wbGV0ZSBleHRlcm5hbGx5IHN0b3JlZAogCQkJCQljb2x1bW5zLiBQcmV0ZW5kIHRoYXQgc3Vj
aAogCQkJCQlyZWNvcmRzIGRvIG5vdCBleGlzdC4gU3VjaApAQCAtMzYzNiwxNiArMzYyNiw5IEBA
IHJvd19zZWFyY2hfZm9yX215c3FsKAogCQkJCQlhdCBhIGxvd2VyIGxldmVsLCBub3QgaGVyZS4g
Ki8KIAkJCQkJdXRfYSh0cngtPmlzb2xhdGlvbl9sZXZlbAogCQkJCQkgICAgID09IFRSWF9JU09f
UkVBRF9VTkNPTU1JVFRFRCk7Ci0JCQkJCS8qIFRPRE86IGFzc2VydCB0aGF0IHRoZXJlIGlzCi0J
CQkJCWFuIG93bmVyX3RyeCB3aXRoCi0JCQkJCW93bmVyX3RyeC0+aWQgPT0gREJfVFJYX0lEIGFu
ZAotCQkJCQlvd25lcl90cngtPmlzX3JlY292ZXJlZCAqLwotCi0JCQkJCWVyciA9IERCX1RPT19C
SUdfUkVDT1JEOwotCi0JCQkJCS8qIFdlIGxldCB0aGUgbWFpbiBsb29wIHRvIGRvIHRoZQotCQkJ
CQllcnJvciBoYW5kbGluZyAqLwotCQkJCQlnb3RvIHNob3J0Y3V0X2ZhaWxzX3Rvb19iaWdfcmVj
OworCisJCQkJCS8qIFByb2NlZWQgYXMgaW4gY2FzZSBTRUxfUkVUUlkuICovCisJCQkJCWJyZWFr
OwogCQkJCX0KIAogCQkJCW10cl9jb21taXQoJm10cik7CkBAIC0zNjg1LDcgKzM2NjgsNyBAQCBy
ZWxlYXNlX3NlYXJjaF9sYXRjaF9pZl9uZWVkZWQ6CiAJCQlkZWZhdWx0OgogCQkJCXV0X2FkKDAp
OwogCQkJfQotc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM6CisKIAkJCW10cl9jb21taXQoJm10
cik7CiAJCQltdHJfc3RhcnQoJm10cik7CiAJCX0KQEAgLTQ0MjIsMTYgKzQ0MDUsMTQgQEAgcmVx
dWlyZXNfY2x1c3RfcmVjOgogCiAJCWlmICghcm93X3NlbF9wdXNoX2NhY2hlX3Jvd19mb3JfbXlz
cWwocHJlYnVpbHQsIHJlc3VsdF9yZWMsCiAJCQkJCQkgICAgICBvZmZzZXRzKSkgewotCQkJLyog
T25seSBmcmVzaCBpbnNlcnRzIGF0IHNlcnZlciBjcmFzaCB0aW1lIG1heSBjb250YWluCi0JCQlp
bmNvbXBsZXRlIGV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMuIFByZXRlbmQgdGhhdAotCQkJc3Vj
aCByZWNvcmRzIGRvIG5vdCBleGlzdC4gU3VjaCByZWNvcmRzIG1heSBvbmx5IGJlCi0JCQlhY2Nl
c3NlZCBhdCB0aGUgUkVBRCBVTkNPTU1JVFRFRCBpc29sYXRpb24gbGV2ZWwgb3IKLQkJCXdoZW4g
cm9sbGluZyBiYWNrIGEgcmVjb3ZlcmVkIHRyYW5zYWN0aW9uLiBSb2xsYmFjawotCQkJaGFwcGVu
cyBhdCBhIGxvd2VyIGxldmVsLCBub3QgaGVyZS4gKi8KKwkJCS8qIE9ubHkgZnJlc2ggaW5zZXJ0
cyBtYXkgY29udGFpbiBpbmNvbXBsZXRlCisJCQlleHRlcm5hbGx5IHN0b3JlZCBjb2x1bW5zLiBQ
cmV0ZW5kIHRoYXQgc3VjaAorCQkJcmVjb3JkcyBkbyBub3QgZXhpc3QuIFN1Y2ggcmVjb3JkcyBt
YXkgb25seSBiZQorCQkJYWNjZXNzZWQgYXQgdGhlIFJFQUQgVU5DT01NSVRURUQgaXNvbGF0aW9u
CisJCQlsZXZlbCBvciB3aGVuIHJvbGxpbmcgYmFjayBhIHJlY292ZXJlZAorCQkJdHJhbnNhY3Rp
b24uIFJvbGxiYWNrIGhhcHBlbnMgYXQgYSBsb3dlcgorCQkJbGV2ZWwsIG5vdCBoZXJlLiAqLwog
CQkJdXRfYSh0cngtPmlzb2xhdGlvbl9sZXZlbCA9PSBUUlhfSVNPX1JFQURfVU5DT01NSVRURUQp
OwotCQkJLyogVE9ETzogYXNzZXJ0IHRoYXQgdGhlcmUgaXMgYW4gb3duZXJfdHJ4Ci0JCQl3aXRo
IG93bmVyX3RyeC0+aWQgPT0gREJfVFJYX0lEIGFuZAotCQkJb3duZXJfdHJ4LT5pc19yZWNvdmVy
ZWQgKi8KIAkJfSBlbHNlIGlmIChwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWQKIAkJCSAgID09IE1Z
U1FMX0ZFVENIX0NBQ0hFX1NJWkUpIHsKIApAQCAtNDQ0OSwxOSArNDQzMCwxNiBAQCByZXF1aXJl
c19jbHVzdF9yZWM6CiAJCX0gZWxzZSB7CiAJCQlpZiAoIXJvd19zZWxfc3RvcmVfbXlzcWxfcmVj
KGJ1ZiwgcHJlYnVpbHQsCiAJCQkJCQkgICAgIHJlc3VsdF9yZWMsIG9mZnNldHMpKSB7Ci0JCQkJ
LyogT25seSBmcmVzaCBpbnNlcnRzIGF0IHNlcnZlciBjcmFzaAotCQkJCXRpbWUgbWF5IGNvbnRh
aW4gaW5jb21wbGV0ZSBleHRlcm5hbGx5Ci0JCQkJc3RvcmVkIGNvbHVtbnMuIFByZXRlbmQgdGhh
dCBzdWNoCi0JCQkJcmVjb3JkcyBkbyBub3QgZXhpc3QuIFN1Y2ggcmVjb3JkcyBtYXkKLQkJCQlv
bmx5IGJlIGFjY2Vzc2VkIGF0IHRoZSBSRUFEIFVOQ09NTUlUVEVECisJCQkJLyogT25seSBmcmVz
aCBpbnNlcnRzIG1heSBjb250YWluCisJCQkJaW5jb21wbGV0ZSBleHRlcm5hbGx5IHN0b3JlZAor
CQkJCWNvbHVtbnMuIFByZXRlbmQgdGhhdCBzdWNoIHJlY29yZHMgZG8KKwkJCQlub3QgZXhpc3Qu
IFN1Y2ggcmVjb3JkcyBtYXkgb25seSBiZQorCQkJCWFjY2Vzc2VkIGF0IHRoZSBSRUFEIFVOQ09N
TUlUVEVECiAJCQkJaXNvbGF0aW9uIGxldmVsIG9yIHdoZW4gcm9sbGluZyBiYWNrIGEKLQkJCQly
ZWNvdmVyZWQgdHJhbnNhY3Rpb24uIFJvbGxiYWNrIGhhcHBlbnMKLQkJCQlhdCBhIGxvd2VyIGxl
dmVsLCBub3QgaGVyZS4gKi8KKwkJCQlyZWNvdmVyZWQgdHJhbnNhY3Rpb24uIFJvbGxiYWNrCisJ
CQkJaGFwcGVucyBhdCBhIGxvd2VyIGxldmVsLCBub3QgaGVyZS4gKi8KIAkJCQl1dF9hKHRyeC0+
aXNvbGF0aW9uX2xldmVsCiAJCQkJICAgICA9PSBUUlhfSVNPX1JFQURfVU5DT01NSVRURUQpOwot
CQkJCS8qIFRPRE86IGFzc2VydCB0aGF0IHRoZXJlIGlzIGFuIG93bmVyX3RyeAotCQkJCXdpdGgg
b3duZXJfdHJ4LT5pZCA9PSBEQl9UUlhfSUQgYW5kCi0JCQkJb3duZXJfdHJ4LT5pc19yZWNvdmVy
ZWQgKi8KIAkJCQlnb3RvIG5leHRfcmVjOwogCQkJfQogCQl9Cgo=

--===============0811836695==
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/5.1-innodb/
# testament_sha1: 77595e8fd599bcac19a4a1be34e15bbd6fcc4e6e
# timestamp: 2010-06-30 12:41:51 +0300
# base_revision_id: marko.makela@stripped\
#   pjbkpk5rsqztmw27
# 
# Begin bundle
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
AYbh/F3JFOFCQaxu7NA=


--===============0811836695==--