From: marko.makela
Date: June 30 2010 9:58am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3129 to 3131) Bug#54358
List-Archive: http://lists.mysql.com/commits/112556
X-Bug: 54358
Message-Id: <201006300958.o5U8qhDW017888@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1197928076=="

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

IDMxMzEgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0zMAogICAgICBNZXJnZSBhIEJ1ZyAjNTQzNTgg
ZXJyb3IgaGFuZGxpbmcgY29ycmVjdGlvbiBmcm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIC0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LQogICAgICByZXZubzogMzUzNAogICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA2MzAwOTM4NDctN2drcjFsaDNiaDJ4a3N5MAogICAgICBwYXJlbnQ6IG1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjMwMDkzMTQ5LXdtYzM3dDEyOGdpYzkzM3YKICAgICAg
Y29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAg
IGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAtMDYtMzAg
MTI6Mzg6NDcgKzAzMDAKICAgICAgbWVzc2FnZToKICAgICAgICBCdWcjNTQzNTggZm9sbG93LXVw
OiBDb3JyZWN0IHNvbWUgZXJyb3IgaGFuZGxpbmcuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwogMzEzMCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTMw
CiAgICAgIE1lcmdlIEJ1ZyAjNTQzNTggY29tbWVudCBjb3JyZWN0aW9ucyBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICByZXZubzogMzUzMwogICAgICByZXZpc2lvbi1pZDog
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MzAwOTMxNDktd21jMzd0MTI4Z2ljOTMzdgog
ICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI5MTMxMjE5LXBqYmtw
azVyc3F6dG13MjcKICAgICAgY29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxh
QG9yYWNsZS5jb20+CiAgICAgIGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgIHRpbWVzdGFt
cDogV2VkIDIwMTAtMDYtMzAgMTI6MzE6NDkgKzAzMDAKICAgICAgbWVzc2FnZToKICAgICAgICBD
b3JyZWN0IHNvbWUgY29tbWVudHMgdGhhdCB3ZXJlIGFkZGVkIGluIHRoZSBmaXggb2YgQnVnICM1
NDM1OAogICAgICAgIChSRUFEIFVOQ09NTUlUVEVEIGFjY2VzcyBmYWlsdXJlIG9mIG9mZi1wYWdl
IERZTkFNSUMgb3IgQ09NUFJFU1NFRCBjb2x1bW5zKS4KICAgICAgCiAgICAgICAgUmVjb3JkcyB0
aGF0IGxhY2sgaW5jb21wbGV0ZWx5IHdyaXR0ZW4gZXh0ZXJuYWxseSBzdG9yZWQgY29sdW1ucyBt
YXkKICAgICAgICBiZSBhY2Nlc3NlZCBieSBSRUFEIFVOQ09NTUlUVEVEIHRyYW5zYWN0aW9uIGV2
ZW4gd2l0aG91dCBpbnZvbHZpbmcgYQogICAgICAgIGNyYXNoIGR1cmluZyBhbiBJTlNFUlQgb3Ig
VVBEQVRFIG9wZXJhdGlvbi4gSSB2ZXJpZmllZCB0aGlzIGFzIGZvbGxvd3MuCiAgICAgIAogICAg
ICAgICgxKSBhZGRlZCBhIGRlbGF5IGFmdGVyIHRoZSBtaW5pLXRyYW5zYWN0aW9uIGZvciB3cml0
aW5nIHRoZSBjbHVzdGVyZWQKICAgICAgICBpbmRleCAnc3R1YicgcmVjb3JkIHdhcyBjb21taXR0
ZWQgKHBhdGNoIGF0dGFjaGVkKQogICAgICAgICgyKSBzdGFydGVkIG15c3FsZCBpbiBnZGIsIHNl
dHRpbmcgYnJlYWtwb2ludHMgdG8gdGhlIHdoZXJlIHRoZQogICAgICAgIGFzc2VydGlvbnMgYWJv
dXQgUkVBRCBVTkNPTU1JVFRFRCB3ZXJlIGFkZGVkIGluIHRoZSBidWcgZml4CiAgICAgICAgKDMp
IGludm9rZWQgaWJ0ZXN0MyAtLWNyZWF0ZS1vcHRpb25zPWtleV9ibG9ja19zaXplPTIKICAgICAg
ICB0byBjcmVhdGUgQkxPQnMgaW4gYSBDT01QUkVTU0VEIHRhYmxlCiAgICAgICAgKDQpIGludm9r
ZWQgdGhlIGZvbGxvd2luZzoKICAgICAgICB5ZXMgJ3NldCB0cmFuc2FjdGlvbiBpc29sYXRpb24g
bGV2ZWwgcmVhZCB1bmNvbW1pdHRlZDsKICAgICAgICBjaGVja3N1bSB0YWJsZSBibG9idDM7c2Vs
ZWN0IHNsZWVwKDEpOyd8bXlzcWwgLXVyb290IHRlc3QKICAgICAgICAoNSkgbm90ZWQgdGhhdCBv
bmUgb2YgdGhlIGJyZWFrcG9pbnRzIHdhcyB0cmlnZ2VyZWQKICAgICAgICAocmV0dXJuKE5VTEwp
IGluIGJ0cl9yZWNfY29weV9leHRlcm5hbGx5X3N0b3JlZF9maWVsZCgpKQogICAgICAKICAgICAg
ICA9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwaW5zLmMn
CiAgICAgICAgLS0tIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MGlucy5jCTIwMTAtMDYt
MzAgMDg6MTc6MjUgKzAwMDAKICAgICAgICArKysgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9y
b3cwaW5zLmMJMjAxMC0wNi0zMCAwODoxNzoyNSArMDAwMAogICAgICAgIEBAIC0yMTIwLDYgKzIx
MjAsNyBAQCBmdW5jdGlvbl9leGl0OgogICAgICAgICAJCXJlY190KglyZWM7CiAgICAgICAgIAkJ
dWxpbnQqCW9mZnNldHM7CiAgICAgICAgIAkJbXRyX3N0YXJ0KCZtdHIpOwogICAgICAgICsJCW9z
X3RocmVhZF9zbGVlcCg1MDAwMDAwKTsKICAgICAgICAgCiAgICAgICAgIAkJYnRyX2N1cl9zZWFy
Y2hfdG9fbnRoX2xldmVsKGluZGV4LCAwLCBlbnRyeSwgUEFHRV9DVVJfTEUsCiAgICAgICAgIAkJ
CQkJICAgIEJUUl9NT0RJRllfVFJFRSwgJmN1cnNvciwgMCwKICAgICAgICAKICAgICAgICA9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdXBkLmMnCiAgICAg
ICAgLS0tIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVwZC5jCTIwMTAtMDYtMzAgMDg6
MTE6NTUgKzAwMDAKICAgICAgICArKysgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdXBk
LmMJMjAxMC0wNi0zMCAwODoxMTo1NSArMDAwMAogICAgICAgIEBAIC0xNzYzLDYgKzE3NjMsNyBA
QCByb3dfdXBkX2NsdXN0X3JlYygKICAgICAgICAgCQlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsK
ICAgICAgICAgCiAgICAgICAgIAkJbXRyX3N0YXJ0KG10cik7CiAgICAgICAgKwkJb3NfdGhyZWFk
X3NsZWVwKDUwMDAwMDApOwogICAgICAgICAKICAgICAgICAgCQl1dF9hKGJ0cl9wY3VyX3Jlc3Rv
cmVfcG9zaXRpb24oQlRSX01PRElGWV9UUkVFLCBwY3VyLCBtdHIpKTsKICAgICAgICAgCQlyZWMg
PSBidHJfY3VyX2dldF9yZWMoYnRyX2N1cik7CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2Vs
LmMKIDMxMjkgTWFyayBMZWl0aAkyMDEwLTA2LTMwCiAgICAgIEJ1ZyM1NDcyNiAtIEluY29uc2lz
dGVudCByZXBvcnRpbmcgYmV0d2VlbiBtdXRleCBhbmQgUlcgbG9jayBzcGluIHJvdW5kcwogICAg
ICAgLSBBZGQgcm91bmQgY291bnRzIHRvIHRoZSBvdXRwdXQgZm9yIFJXIHMveCBsb2NrcwoKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBzeW5jLmMKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmsubGVpdGhAb3JhY2xlLmNvbS0yMDEw
MDYzMDA5MTEwNC15eHBqcXUzcnVlYmlmMmpiCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0
cjBjdXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5NTUxMC1nNmZ3
MnowczFtbzhnYXY1CkBAIC00OTY5LDIwICs0OTY5LDEwIEBAIGJ0cl9yZWNfY29weV9leHRlcm5h
bGx5X3N0b3JlZF9maWVsZCgKIAlpZiAoVU5JVl9VTkxJS0VMWQogCSAgICAoIW1lbWNtcChkYXRh
ICsgbG9jYWxfbGVuIC0gQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSwKIAkJICAgICBmaWVsZF9y
ZWZfemVybywgQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSkpKSB7Ci0JCS8qIFRoZSBleHRlcm5h
bGx5IHN0b3JlZCBmaWVsZCB3YXMgbm90IHdyaXR0ZW4KLQkJeWV0LiBUaGlzIGlzIG9ubHkgYSB2
YWxpZCBjb25kaXRpb24gd2hlbiB0aGUgc2VydmVyCi0JCWNyYXNoZWQgYWZ0ZXIgdGhlIHRpbWUg
YSByZWNvcmQgc3R1YiB3YXMgZnJlc2hseQotCQlpbnNlcnRlZCBidXQgYmVmb3JlIGFsbCBpdHMg
Y29sdW1ucyB3ZXJlIHdyaXR0ZW4uIFRoaXMKLQkJcmVjb3JkIHNob3VsZCBvbmx5IGJlIHNlZW4g
YnkKKwkJLyogVGhlIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkIHdhcyBub3Qgd3JpdHRlbiB5ZXQu
CisJCVRoaXMgcmVjb3JkIHNob3VsZCBvbmx5IGJlIHNlZW4gYnkKIAkJcmVjdl9yZWNvdmVyeV9y
b2xsYmFja19hY3RpdmUoKSBvciBhbnkKIAkJVFJYX0lTT19SRUFEX1VOQ09NTUlUVEVEIHRyYW5z
YWN0aW9ucy4gKi8KLQotCQkvKiBUT0RPOiBhc3NlcnQgdGhhdCB0aGVyZSBpcyBhbiBvd25lcl90
cnggd2l0aAotCQlvd25lcl90cngtPmlkID09IERCX1RSWF9JRCBhbmQgb3duZXJfdHJ4LT5pc19y
ZWNvdmVyZWQgKi8KLQotCQkvKiBUT0RPOiBhc3NlcnQgdGhhdCBmb3IgdGhlIGN1cnJlbnQgdHJh
bnNhY3Rpb24gdHJ4LAotCQllaXRoZXIgKHRyeCA9PSBvd25lcl90cnggJiYgdHJ4X2lzX3JlY3Yo
dHJ4KSkgb3IKLQkJdHJ4LT5pc29sYXRpb25fbGV2ZWwgPT0gVFJYX0lTT19SRUFEX1VOQ09NTUlU
VEVELiAqLwogCQlyZXR1cm4oTlVMTCk7CiAJfQogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
c2VsLmMJcmV2aWQ6bWFyay5sZWl0aEBvcmFjbGUuY29tLTIwMTAwNjMwMDkxMTA0LXl4cGpxdTNy
dWViaWYyamIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjMwMDk1NTEwLWc2ZncyejBzMW1vOGdhdjUKQEAgLTQy
NSwxMSArNDI1LDcgQEAgcm93X3NlbF9mZXRjaF9jb2x1bW5zKAogCiAJCQkJLyogZGF0YSA9PSBO
VUxMIG1lYW5zIHRoYXQgdGhlCiAJCQkJZXh0ZXJuYWxseSBzdG9yZWQgZmllbGQgd2FzIG5vdAot
CQkJCXdyaXR0ZW4geWV0LiBUaGlzIGlzIG9ubHkgYSB2YWxpZAotCQkJCWNvbmRpdGlvbiB3aGVu
IHRoZSBzZXJ2ZXIgY3Jhc2hlZAotCQkJCWFmdGVyIHRoZSB0aW1lIGEgcmVjb3JkIHN0dWIgd2Fz
Ci0JCQkJZnJlc2hseSBpbnNlcnRlZCBidXQgYmVmb3JlIGFsbCBpdHMKLQkJCQljb2x1bW5zIHdl
cmUgd3JpdHRlbi4gVGhpcyByZWNvcmQKKwkJCQl3cml0dGVuIHlldC4gVGhpcyByZWNvcmQKIAkJ
CQlzaG91bGQgb25seSBiZSBzZWVuIGJ5CiAJCQkJcmVjdl9yZWNvdmVyeV9yb2xsYmFja19hY3Rp
dmUoKSBvciBhbnkKIAkJCQlUUlhfSVNPX1JFQURfVU5DT01NSVRURUQKQEAgLTI3MzYsMTIgKzI3
MzIsNyBAQCByb3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAogCQkJaWYgKFVOSVZfVU5MSUtFTFko
IWRhdGEpKSB7CiAJCQkJLyogVGhlIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkCi0JCQkJd2FzIG5v
dCB3cml0dGVuIHlldC4gVGhpcyBpcwotCQkJCW9ubHkgYSB2YWxpZCBjb25kaXRpb24gd2hlbgot
CQkJCXRoZSBzZXJ2ZXIgY3Jhc2hlZCBhZnRlciB0aGUKLQkJCQl0aW1lIGEgcmVjb3JkIHN0dWIg
d2FzIGZyZXNobHkKLQkJCQlpbnNlcnRlZCBidXQgYmVmb3JlIGFsbCBpdHMKLQkJCQljb2x1bW5z
IHdlcmUgd3JpdHRlbi4gVGhpcworCQkJCXdhcyBub3Qgd3JpdHRlbiB5ZXQuIFRoaXMKIAkJCQly
ZWNvcmQgc2hvdWxkIG9ubHkgYmUgc2VlbiBieQogCQkJCXJlY3ZfcmVjb3Zlcnlfcm9sbGJhY2tf
YWN0aXZlKCkKIAkJCQlvciBhbnkgVFJYX0lTT19SRUFEX1VOQ09NTUlUVEVECkBAIC0zNjE1LDgg
KzM2MDYsNyBAQCByb3dfc2VhcmNoX2Zvcl9teXNxbCgKIAogCQkJCWlmICghcm93X3NlbF9zdG9y
ZV9teXNxbF9yZWMoYnVmLCBwcmVidWlsdCwKIAkJCQkJCQkgICAgIHJlYywgb2Zmc2V0cykpIHsK
LQkJCQkJLyogT25seSBmcmVzaCBpbnNlcnRzIGF0Ci0JCQkJCXNlcnZlciBjcmFzaCB0aW1lIG1h
eSBjb250YWluCisJCQkJCS8qIE9ubHkgZnJlc2ggaW5zZXJ0cyBtYXkgY29udGFpbgogCQkJCQlp
bmNvbXBsZXRlIGV4dGVybmFsbHkgc3RvcmVkCiAJCQkJCWNvbHVtbnMuIFByZXRlbmQgdGhhdCBz
dWNoCiAJCQkJCXJlY29yZHMgZG8gbm90IGV4aXN0LiBTdWNoCkBAIC0zNjI4LDE2ICszNjE4LDkg
QEAgcm93X3NlYXJjaF9mb3JfbXlzcWwoCiAJCQkJCWF0IGEgbG93ZXIgbGV2ZWwsIG5vdCBoZXJl
LiAqLwogCQkJCQl1dF9hKHRyeC0+aXNvbGF0aW9uX2xldmVsCiAJCQkJCSAgICAgPT0gVFJYX0lT
T19SRUFEX1VOQ09NTUlUVEVEKTsKLQkJCQkJLyogVE9ETzogYXNzZXJ0IHRoYXQgdGhlcmUgaXMK
LQkJCQkJYW4gb3duZXJfdHJ4IHdpdGgKLQkJCQkJb3duZXJfdHJ4LT5pZCA9PSBEQl9UUlhfSUQg
YW5kCi0JCQkJCW93bmVyX3RyeC0+aXNfcmVjb3ZlcmVkICovCi0KLQkJCQkJZXJyID0gREJfVE9P
X0JJR19SRUNPUkQ7Ci0KLQkJCQkJLyogV2UgbGV0IHRoZSBtYWluIGxvb3AgdG8gZG8gdGhlCi0J
CQkJCWVycm9yIGhhbmRsaW5nICovCi0JCQkJCWdvdG8gc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19y
ZWM7CisKKwkJCQkJLyogUHJvY2VlZCBhcyBpbiBjYXNlIFNFTF9SRVRSWS4gKi8KKwkJCQkJYnJl
YWs7CiAJCQkJfQogCiAJCQkJbXRyX2NvbW1pdCgmbXRyKTsKQEAgLTM2NzcsNyArMzY2MCw3IEBA
IHJlbGVhc2Vfc2VhcmNoX2xhdGNoX2lmX25lZWRlZDoKIAkJCWRlZmF1bHQ6CiAJCQkJdXRfYWQo
MCk7CiAJCQl9Ci1zaG9ydGN1dF9mYWlsc190b29fYmlnX3JlYzoKKwogCQkJbXRyX2NvbW1pdCgm
bXRyKTsKIAkJCW10cl9zdGFydCgmbXRyKTsKIAkJfQpAQCAtNDQxNCwxNiArNDM5NywxNCBAQCBy
ZXF1aXJlc19jbHVzdF9yZWM6CiAKIAkJaWYgKCFyb3dfc2VsX3B1c2hfY2FjaGVfcm93X2Zvcl9t
eXNxbChwcmVidWlsdCwgcmVzdWx0X3JlYywKIAkJCQkJCSAgICAgIG9mZnNldHMpKSB7Ci0JCQkv
KiBPbmx5IGZyZXNoIGluc2VydHMgYXQgc2VydmVyIGNyYXNoIHRpbWUgbWF5IGNvbnRhaW4KLQkJ
CWluY29tcGxldGUgZXh0ZXJuYWxseSBzdG9yZWQgY29sdW1ucy4gUHJldGVuZCB0aGF0Ci0JCQlz
dWNoIHJlY29yZHMgZG8gbm90IGV4aXN0LiBTdWNoIHJlY29yZHMgbWF5IG9ubHkgYmUKLQkJCWFj
Y2Vzc2VkIGF0IHRoZSBSRUFEIFVOQ09NTUlUVEVEIGlzb2xhdGlvbiBsZXZlbCBvcgotCQkJd2hl
biByb2xsaW5nIGJhY2sgYSByZWNvdmVyZWQgdHJhbnNhY3Rpb24uIFJvbGxiYWNrCi0JCQloYXBw
ZW5zIGF0IGEgbG93ZXIgbGV2ZWwsIG5vdCBoZXJlLiAqLworCQkJLyogT25seSBmcmVzaCBpbnNl
cnRzIG1heSBjb250YWluIGluY29tcGxldGUKKwkJCWV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMu
IFByZXRlbmQgdGhhdCBzdWNoCisJCQlyZWNvcmRzIGRvIG5vdCBleGlzdC4gU3VjaCByZWNvcmRz
IG1heSBvbmx5IGJlCisJCQlhY2Nlc3NlZCBhdCB0aGUgUkVBRCBVTkNPTU1JVFRFRCBpc29sYXRp
b24KKwkJCWxldmVsIG9yIHdoZW4gcm9sbGluZyBiYWNrIGEgcmVjb3ZlcmVkCisJCQl0cmFuc2Fj
dGlvbi4gUm9sbGJhY2sgaGFwcGVucyBhdCBhIGxvd2VyCisJCQlsZXZlbCwgbm90IGhlcmUuICov
CiAJCQl1dF9hKHRyeC0+aXNvbGF0aW9uX2xldmVsID09IFRSWF9JU09fUkVBRF9VTkNPTU1JVFRF
RCk7Ci0JCQkvKiBUT0RPOiBhc3NlcnQgdGhhdCB0aGVyZSBpcyBhbiBvd25lcl90cngKLQkJCXdp
dGggb3duZXJfdHJ4LT5pZCA9PSBEQl9UUlhfSUQgYW5kCi0JCQlvd25lcl90cngtPmlzX3JlY292
ZXJlZCAqLwogCQl9IGVsc2UgaWYgKHByZWJ1aWx0LT5uX2ZldGNoX2NhY2hlZAogCQkJICAgPT0g
TVlTUUxfRkVUQ0hfQ0FDSEVfU0laRSkgewogCkBAIC00NDQxLDE5ICs0NDIyLDE2IEBAIHJlcXVp
cmVzX2NsdXN0X3JlYzoKIAkJfSBlbHNlIHsKIAkJCWlmICghcm93X3NlbF9zdG9yZV9teXNxbF9y
ZWMoYnVmLCBwcmVidWlsdCwKIAkJCQkJCSAgICAgcmVzdWx0X3JlYywgb2Zmc2V0cykpIHsKLQkJ
CQkvKiBPbmx5IGZyZXNoIGluc2VydHMgYXQgc2VydmVyIGNyYXNoCi0JCQkJdGltZSBtYXkgY29u
dGFpbiBpbmNvbXBsZXRlIGV4dGVybmFsbHkKLQkJCQlzdG9yZWQgY29sdW1ucy4gUHJldGVuZCB0
aGF0IHN1Y2gKLQkJCQlyZWNvcmRzIGRvIG5vdCBleGlzdC4gU3VjaCByZWNvcmRzIG1heQotCQkJ
CW9ubHkgYmUgYWNjZXNzZWQgYXQgdGhlIFJFQUQgVU5DT01NSVRURUQKKwkJCQkvKiBPbmx5IGZy
ZXNoIGluc2VydHMgbWF5IGNvbnRhaW4KKwkJCQlpbmNvbXBsZXRlIGV4dGVybmFsbHkgc3RvcmVk
CisJCQkJY29sdW1ucy4gUHJldGVuZCB0aGF0IHN1Y2ggcmVjb3JkcyBkbworCQkJCW5vdCBleGlz
dC4gU3VjaCByZWNvcmRzIG1heSBvbmx5IGJlCisJCQkJYWNjZXNzZWQgYXQgdGhlIFJFQUQgVU5D
T01NSVRURUQKIAkJCQlpc29sYXRpb24gbGV2ZWwgb3Igd2hlbiByb2xsaW5nIGJhY2sgYQotCQkJ
CXJlY292ZXJlZCB0cmFuc2FjdGlvbi4gUm9sbGJhY2sgaGFwcGVucwotCQkJCWF0IGEgbG93ZXIg
bGV2ZWwsIG5vdCBoZXJlLiAqLworCQkJCXJlY292ZXJlZCB0cmFuc2FjdGlvbi4gUm9sbGJhY2sK
KwkJCQloYXBwZW5zIGF0IGEgbG93ZXIgbGV2ZWwsIG5vdCBoZXJlLiAqLwogCQkJCXV0X2EodHJ4
LT5pc29sYXRpb25fbGV2ZWwKIAkJCQkgICAgID09IFRSWF9JU09fUkVBRF9VTkNPTU1JVFRFRCk7
Ci0JCQkJLyogVE9ETzogYXNzZXJ0IHRoYXQgdGhlcmUgaXMgYW4gb3duZXJfdHJ4Ci0JCQkJd2l0
aCBvd25lcl90cngtPmlkID09IERCX1RSWF9JRCBhbmQKLQkJCQlvd25lcl90cngtPmlzX3JlY292
ZXJlZCAqLwogCQkJCWdvdG8gbmV4dF9yZWM7CiAJCQl9CiAJCX0KCg==

--===============1197928076==
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.5-innodb/
# testament_sha1: b3d97a895b64c46fdd68d1d0285cff21d2bd1ad2
# timestamp: 2010-06-30 12:58:15 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: mark.leith@stripped\
#   yxpjqu3ruebif2jb
# 
# Begin bundle
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
kJ5gHlo=


--===============1197928076==--