From: marko.makela
Date: May 4 2011 11:29am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3619) Bug#12424846
List-Archive: http://lists.mysql.com/commits/136637
X-Bug: 12424846
Message-Id: <201105041129.p44BThK7029201@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1162999200=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTA1MDQwNzI5NTEtNmhwcXJh
ZGpkbjByMzl3dwoKIDM2MTkgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0wNAogICAgICBCdWcgIzEy
NDI0ODQ2IE1VTFRJLVZFUlNJT05JTkcgVU5ORUNFU1NBUklMWSBIT0xESU5HIFBVUkdFX1NZUy0+
TEFUQ0gKICAgICAgCiAgICAgIE11bHRpLXZlcnNpb25pbmcgY29uY3VycmVuY3kgY29udHJvbCAo
TVZDQykgY29kZSBhY3F1aXJlcwogICAgICBwdXJnZV9zeXMtPmxhdGNoIGluIFMgbW9kZS4gVGhp
cyBhcHBlYXJzIHRvIGJlIHVubmVjZXNzYXJ5LiBXaGVuIE1WQ0MKICAgICAgaXMgaG9sZGluZyB0
aGUgY2x1c3RlcmVkIGluZGV4IHBhZ2UgbGF0Y2gsIG90aGVyIHRyYW5zYWN0aW9ucyBvciBwdXJn
ZQogICAgICBjYW5ub3QgbW9kaWZ5IHRoYXQgcGFnZS4gQSByb2xsaW5nIGJhY2sgdHJhbnNhY3Rp
b24gY2Fubm90IHJlbW92ZSBpdHMKICAgICAgdXBkYXRlX3VuZG8gbG9nIGJlZm9yZSB1bmRvaW5n
IGFsbCBjaGFuZ2VzLiBBIGNvbW1pdHRpbmcgdHJhbnNhY3Rpb24KICAgICAgd2lsbCBub3QgcmVt
b3ZlIGl0cyB1cGRhdGVfdW5kbyBsb2cgKHB1cmdlIHdpbGwpLiBQdXJnZSBjYW5ub3QgcmVtb3Zl
CiAgICAgIHRoZSB1cGRhdGVfdW5kbyBsb2cgaWYgdGhlcmUgYXJlIHRyYW5zYWN0aW9ucyB0aGF0
IGNvdWxkIHNlZSB0aGUKICAgICAgY2hhbmdlcyBjb3ZlcmVkIGJ5IGl0LiBNVkNDIHN0b3BzIHdo
ZW4gcmVhY2hpbmcgdGhlIG9sZGVzdCB2ZXJzaW9uCiAgICAgIHRoYXQgaXQgaXMgYWxsb3dlZCB0
byBzZWUuIFRodXMsIHRoZXJlIGlzIG5vIHJvb20gZm9yIGNvbGxpc2lvbgogICAgICBiZXR3ZWVu
IE1WQ0MgYW5kIGFjdGl2ZSB0cmFuc2FjdGlvbnMgb3IgcHVyZ2UuCiAgICAgIAogICAgICB0cnhf
dW5kb19wcmV2X3ZlcnNpb25fYnVpbGQoKTogQXNzZXJ0IHRoYXQgdGhlIHB1cmdlX3N5cy0+bGF0
Y2ggaXMgbm90CiAgICAgIGJlaW5nIGhlbGQgYnkgdGhlIGNhbGxlci4gVGhpcyBpcyBleGFjdGx5
IHRoZSBvcHBvc2l0ZSBmcm9tIGJlZm9yZS4KICAgICAgCiAgICAgIHRyeF91bmRvX2dldF91bmRv
X3JlYygpOiBTaG9ydGx5IGFjcXVpcmUgdGhlIHB1cmdlX3N5cy0+bGF0Y2ggZm9yCiAgICAgIGNo
ZWNraW5nIHRoZSBwdXJnZV9zeXMtPnZpZXcuCiAgICAgIAogICAgICB0cnhfcHVyZ2VfdXBkYXRl
X3VuZG9fbXVzdF9leGlzdCgpOiBSZXBsYWNlZCB3aXRoIGlubGluZSBjYWxscyB0bwogICAgICAh
cmVhZF92aWV3X3NlZXNfdHJ4X2lkKCkuCiAgICAgIAogICAgICByb3dfdmVyc19vbGRfaGFzX2lu
ZGV4X2VudHJ5KCksIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50X3JlYWQoKSwKICAgICAg
cm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKCk6IE5vIGxvbmdlciBhY3F1
aXJlCiAgICAgIHB1cmdlX3N5cy0+bGF0Y2guCiAgICAgIAogICAgICBUaGUgcHVyZ2Vfc3lzLT5s
YXRjaCBzZWVtcyB0byBiZSBuZWNlc3NhcnkgaW4gc29tZSBjYXNlcywgYW5kIGJlY2F1c2UKICAg
ICAgUy1sb2NrZXJzIHJlbWFpbiwgaXQgY2Fubm90IGJlIHR1cm5lZCBpbnRvIGEgbXV0ZXguCiAg
ICAgIAogICAgICByYjo2NTQgYXBwcm92ZWQgYnkgU3VubnkgQmFpbnMKCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDBwdXJnZS5oCiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS90cngwcmVjLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHZlcnMuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcHVyZ2UuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS90cngwcHVyZ2UuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3RyeDBwdXJnZS5oCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDExMDUwNDA3Mjk1MS02
aHBxcmFkamRuMHIzOXd3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcHVyZ2Uu
aAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUwNDExMjkyOS0zenFocHkyOW5s
eWwwc2MwCkBAIC01MiwxNyArNTIsNiBAQCB0cnhfcHVyZ2VfZ2V0X2xvZ19mcm9tX2hpc3QoCiAv
Kj09PT09PT09PT09PT09PT09PT09PT09PSovCiAJZmlsX2FkZHJfdAlub2RlX2FkZHIpOwkvKiE8
IGluOiBmaWxlIGFkZHJlc3Mgb2YgdGhlIGhpc3RvcnkKIAkJCQkJbGlzdCBub2RlIG9mIHRoZSBs
b2cgKi8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKLUNoZWNrcyBpZiB0cnhfaWQgaXMgPj0gcHVyZ2Vfdmlldzog
dGhlbiBpdCBpcyBndWFyYW50ZWVkIHRoYXQgaXRzIHVwZGF0ZQotdW5kbyBsb2cgc3RpbGwgZXhp
c3RzIGluIHRoZSBzeXN0ZW0uCi1AcmV0dXJuIFRSVUUgaWYgaXMgc3VyZSB0aGF0IGl0IGlzIHBy
ZXNlcnZlZCwgYWxzbyBpZiB0aGUgZnVuY3Rpb24KLXJldHVybnMgRkFMU0UsIGl0IGlzIHBvc3Np
YmxlIHRoYXQgdGhlIHVuZG8gbG9nIHN0aWxsIGV4aXN0cyBpbiB0aGUKLXN5c3RlbSAqLwotVU5J
Vl9JTlRFUk4KLWlib29sCi10cnhfcHVyZ2VfdXBkYXRlX3VuZG9fbXVzdF9leGlzdCgKLS8qPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCXRyeF9pZF90CXRyeF9pZCk7LyohPCBpbjog
dHJhbnNhY3Rpb24gaWQgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIENyZWF0ZXMgdGhlIGdsb2JhbCBw
dXJnZSBzeXN0ZW0gY29udHJvbCBzdHJ1Y3R1cmUgYW5kIGluaXRzIHRoZSBoaXN0b3J5CiBtdXRl
eC4gKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHJl
Yy5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHJlYy5oCXJldmlkOmppbW15
LnlhbmdAb3JhY2xlLmNvbS0yMDExMDUwNDA3Mjk1MS02aHBxcmFkamRuMHIzOXd3CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcmVjLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA1MDQxMTI5MjktM3pxaHB5MjlubHlsMHNjMApAQCAtMjQwLDEwICsyNDAsMTAg
QEAgdHJ4X3VuZG9fZ2V0X3VuZG9fcmVjX2xvdygKIAlyb2xsX3B0cl90CXJvbGxfcHRyLAkvKiE8
IGluOiByb2xsIHBvaW50ZXIgdG8gcmVjb3JkICovCiAJbWVtX2hlYXBfdCoJaGVhcCk7CQkvKiE8
IGluOiBtZW1vcnkgaGVhcCB3aGVyZSBjb3BpZWQgKi8KIC8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotQnVpbGQg
YSBwcmV2aW91cyB2ZXJzaW9uIG9mIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4gVGhpcyBmdW5j
dGlvbiBjaGVja3MKLXRoYXQgdGhlIGNhbGxlciBoYXMgYSBsYXRjaCBvbiB0aGUgaW5kZXggcGFn
ZSBvZiB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZAotYW5kIGFuIHMtbGF0Y2ggb24gdGhlIHB1
cmdlX3ZpZXcuIFRoaXMgZ3VhcmFudGVlcyB0aGF0IHRoZSBzdGFjayBvZiB2ZXJzaW9ucwotaXMg
bG9ja2VkLgorQnVpbGQgYSBwcmV2aW91cyB2ZXJzaW9uIG9mIGEgY2x1c3RlcmVkIGluZGV4IHJl
Y29yZC4gVGhlIGNhbGxlciBtdXN0Citob2xkIGEgbGF0Y2ggb24gdGhlIGluZGV4IHBhZ2Ugb2Yg
dGhlIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQsIHRvCitndWFyYW50ZWUgdGhhdCB0aGUgc3RhY2sg
b2YgdmVyc2lvbnMgaXMgbG9ja2VkIGFsbCB0aGUgd2F5IGRvd24gdG8gdGhlCitwdXJnZV9zeXMt
PnZpZXcuCiBAcmV0dXJuIERCX1NVQ0NFU1MsIG9yIERCX01JU1NJTkdfSElTVE9SWSBpZiB0aGUg
cHJldmlvdXMgdmVyc2lvbiBpcwogZWFybGllciB0aGFuIHB1cmdlX3ZpZXcsIHdoaWNoIG1lYW5z
IHRoYXQgaXQgbWF5IGhhdmUgYmVlbiByZW1vdmVkICovCiBVTklWX0lOVEVSTgoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2Uvcm93L3JvdzB2ZXJzLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTEw
NTA0MDcyOTUxLTZocHFyYWRqZG4wcjM5d3cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHZlcnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUwNDExMjkyOS0zenFo
cHkyOW5seWwwc2MwCkBAIC0xMTMsOCArMTEzLDYgQEAgcm93X3ZlcnNfaW1wbF94X2xvY2tlZF9s
b3coCiAJbW9kaWZ5IHJlYywgYW5kIGRvZXMgbm90IG5lY2Vzc2FyaWx5IGhhdmUgYW4gaW1wbGlj
aXQgeC1sb2NrCiAJb24gcmVjLiAqLwogCi0JbXRyX3NfbG9jaygmcHVyZ2Vfc3lzLT5sYXRjaCwg
bXRyKTsKLQogCWZvciAodmVyc2lvbiA9IGNsdXN0X3JlYzs7IHZlcnNpb24gPSBwcmV2X3ZlcnNp
b24pIHsKIAkJdWxpbnQJCWVycjsKIAkJcm93X2V4dF90KglleHQ7CkBAIC0xODksOSArMTg3LDkg
QEAgcm93X3ZlcnNfaW1wbF94X2xvY2tlZF9sb3coCiAJCXdvdWxkIHJlcXVpcmUgcmVjIHRvIGJl
IGluIGEgZGlmZmVyZW50IHN0YXRlLiAqLwogCiAJCS8qIFRoZSBwcmV2aW91cyB2ZXJzaW9uIG9m
IGNsdXN0X3JlYyBtdXN0IGJlCi0JCWFjY2Vzc2libGUsIGJlY2F1c2UgY2x1c3RfcmVjIHdhcyBu
b3QgYSBmcmVzaCBpbnNlcnQKLQkJYW5kIHdlIGFyZSBob2xkaW5nIHB1cmdlX3N5cy0+bGF0Y2gu
IFRoZXJlIGlzIG5vCi0JCWd1YXJhbnRlZSB0aGF0IHRoZSB0cmFuc2FjdGlvbiBpcyBzdGlsbCBh
Y3RpdmUuICovCisJCWFjY2Vzc2libGUsIGJlY2F1c2UgY2x1c3RfcmVjIHdhcyBub3QgYSBmcmVz
aCBpbnNlcnQuCisJCVRoZXJlIGlzIG5vIGd1YXJhbnRlZSB0aGF0IHRoZSB0cmFuc2FjdGlvbiBp
cyBzdGlsbAorCQlhY3RpdmUuICovCiAKIAkJdXRfYWQoZXJyID09IERCX1NVQ0NFU1MpOwogCkBA
IC0yODUsOCArMjgzLDEwIEBAIHJvd192ZXJzX2ltcGxfeF9sb2NrZWQoCiAKIAkvKiBTZWFyY2gg
Zm9yIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLiBUaGUgbGF0Y2ggb24gdGhlCiAJcGFnZSBv
ZiBjbHVzdF9yZWMgbG9ja3MgdGhlIHRvcCBvZiB0aGUgc3RhY2sgb2YgdmVyc2lvbnMuIFRoZQot
CWJvdHRvbSBvZiB0aGUgdmVyc2lvbiBzdGFjayB3aWxsIGJlIGxvY2tlZCBieQotCXB1cmdlX3N5
cy0+bGF0Y2guICovCisJYm90dG9tIG9mIHRoZSB2ZXJzaW9uIHN0YWNrIGlzIG5vdCBsb2NrZWQ7
IG9sZGVzdCB2ZXJzaW9ucyBtYXkKKwlkaXNhcHBlYXIgYnkgdGhlIGZhY3QgdGhhdCB0cmFuc2Fj
dGlvbnMgbWF5IGJlIGNvbW1pdHRlZCBhbmQKKwljb2xsZWN0ZWQgYnkgdGhlIHB1cmdlLiBUaGlz
IGlzIG5vdCBhIHByb2JsZW0sIGJlY2F1c2Ugd2UgYXJlCisJb25seSBpbnRlcmVzdGVkIGluIGFj
dGl2ZSB0cmFuc2FjdGlvbnMuICovCiAKIAljbHVzdF9yZWMgPSByb3dfZ2V0X2NsdXN0X3JlYygK
IAkJQlRSX1NFQVJDSF9MRUFGLCByZWMsIGluZGV4LCAmY2x1c3RfaW5kZXgsICZtdHIpOwpAQCAt
MzM0LDE1ICszMzQsNyBAQCByb3dfdmVyc19tdXN0X3ByZXNlcnZlX2RlbF9tYXJrZWQoCiAKIAlt
dHJfc19sb2NrKCYocHVyZ2Vfc3lzLT5sYXRjaCksIG10cik7CiAKLQlpZiAodHJ4X3B1cmdlX3Vw
ZGF0ZV91bmRvX211c3RfZXhpc3QodHJ4X2lkKSkgewotCi0JCS8qIEEgcHVyZ2Ugb3BlcmF0aW9u
IGlzIG5vdCB5ZXQgYWxsb3dlZCB0byByZW1vdmUgdGhpcwotCQlkZWxldGUgbWFya2VkIHJlY29y
ZCAqLwotCi0JCXJldHVybihUUlVFKTsKLQl9Ci0KLQlyZXR1cm4oRkFMU0UpOworCXJldHVybigh
cmVhZF92aWV3X3NlZXNfdHJ4X2lkKHB1cmdlX3N5cy0+dmlldywgdHJ4X2lkKSk7CiB9CiAKIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKQEAgLTM4Miw3ICszNzQsNiBAQCByb3dfdmVyc19vbGRfaGFzX2luZGV4X2Vu
dHJ5KAogI2lmZGVmIFVOSVZfU1lOQ19ERUJVRwogCXV0X2FkKCFyd19sb2NrX293bigmKHB1cmdl
X3N5cy0+bGF0Y2gpLCBSV19MT0NLX1NIQVJFRCkpOwogI2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJV
RyAqLwotCW10cl9zX2xvY2soJihwdXJnZV9zeXMtPmxhdGNoKSwgbXRyKTsKIAogCWNsdXN0X2lu
ZGV4ID0gZGljdF90YWJsZV9nZXRfZmlyc3RfaW5kZXgoaW5kZXgtPnRhYmxlKTsKIApAQCAtMzk1
LDcgKzM4NiwxMSBAQCByb3dfdmVyc19vbGRfaGFzX2luZGV4X2VudHJ5KAogCWlmIChhbHNvX2N1
cnIgJiYgIXJlY19nZXRfZGVsZXRlZF9mbGFnKHJlYywgY29tcCkpIHsKIAkJcm93X2V4dF90Kgll
eHQ7CiAKLQkJLyogVGhlIHN0YWNrIG9mIHZlcnNpb25zIGlzIGxvY2tlZCBieSBtdHIuCisJCS8q
IFRoZSB0b3Agb2YgdGhlIHN0YWNrIG9mIHZlcnNpb25zIGlzIGxvY2tlZCBieSB0aGUKKwkJbXRy
IGhvbGRpbmcgYSBsYXRjaCBvbiB0aGUgcGFnZSBjb250YWluaW5nIHRoZQorCQljbHVzdGVyZWQg
aW5kZXggcmVjb3JkLiBUaGUgYm90dG9tIG9mIHRoZSBzdGFjayBpcworCQlsb2NrZWQgYnkgdGhl
IGZhY3QgdGhhdCB0aGUgcHVyZ2Vfc3lzLT52aWV3IG11c3QKKwkJJ292ZXJ0YWtlJyBhbnkgcmVh
ZCB2aWV3IG9mIGFuIGFjdGl2ZSB0cmFuc2FjdGlvbi4KIAkJVGh1cywgaXQgaXMgc2FmZSB0byBm
ZXRjaCB0aGUgcHJlZml4ZXMgZm9yCiAJCWV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbnMuICovCiAJ
CXJvdyA9IHJvd19idWlsZChST1dfQ09QWV9QT0lOVEVSUywgY2x1c3RfaW5kZXgsCkBAIC01MzUs
NyArNTMwLDYgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2NvbnNpc3RlbnRfcmVhZCgKIAogCXV0X2Fk
KCFyZWFkX3ZpZXdfc2Vlc190cnhfaWQodmlldywgdHJ4X2lkKSk7CiAKLQlyd19sb2NrX3NfbG9j
aygmKHB1cmdlX3N5cy0+bGF0Y2gpKTsKIAl2ZXJzaW9uID0gcmVjOwogCiAJZm9yICg7OykgewpA
QCAtNjE1LDcgKzYwOSw2IEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50X3JlYWQoCiAJ
fS8qIGZvciAoOzspICovCiAKIAltZW1faGVhcF9mcmVlKGhlYXApOwotCXJ3X2xvY2tfc191bmxv
Y2soJihwdXJnZV9zeXMtPmxhdGNoKSk7CiAKIAlyZXR1cm4oZXJyKTsKIH0KQEAgLTY2MSwxMiAr
NjU0LDYgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAogCiAJdXRf
YWQocmVjX29mZnNfdmFsaWRhdGUocmVjLCBpbmRleCwgKm9mZnNldHMpKTsKIAotCXJ3X2xvY2tf
c19sb2NrKCYocHVyZ2Vfc3lzLT5sYXRjaCkpOwotCS8qIFRoZSBTLWxhdGNoIG9uIHB1cmdlX3N5
cyBwcmV2ZW50cyB0aGUgcHVyZ2UgdmlldyBmcm9tCi0JY2hhbmdpbmcuICBUaHVzLCBpZiB3ZSBo
YXZlIGFuIHVuY29tbWl0dGVkIHRyYW5zYWN0aW9uIGF0Ci0JdGhpcyBwb2ludCwgdGhlbiBwdXJn
ZSBjYW5ub3QgcmVtb3ZlIGl0cyB1bmRvIGxvZyBldmVuIGlmCi0JdGhlIHRyYW5zYWN0aW9uIGNv
dWxkIGNvbW1pdCBub3cuICovCi0KIAl2ZXJzaW9uID0gcmVjOwogCiAJZm9yICg7OykgewpAQCAt
NzU5LDcgKzc0Niw2IEBAIHJvd192ZXJzX2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVhZCgK
IAlpZiAoaGVhcCkgewogCQltZW1faGVhcF9mcmVlKGhlYXApOwogCX0KLQlyd19sb2NrX3NfdW5s
b2NrKCYocHVyZ2Vfc3lzLT5sYXRjaCkpOwogCiAJcmV0dXJuKGVycik7CiB9Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHB1cmdlLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvdHJ4L3RyeDBwdXJnZS5jCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEx
MDUwNDA3Mjk1MS02aHBxcmFkamRuMHIzOXd3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3Ry
eDBwdXJnZS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTA0MTEyOTI5LTN6
cWhweTI5bmx5bDBzYzAKQEAgLTgwLDI1ICs4MCw2IEBAIHRyeF9wdXJnZV9mZXRjaF9uZXh0X3Jl
YygKIAkJCQkJaGFuZGxlZCAqLwogCW1lbV9oZWFwX3QqCWhlYXApOwkJLyohPCBpbjogbWVtb3J5
IGhlYXAgd2hlcmUgY29waWVkICovCiAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLUNoZWNrcyBpZiB0cnhfaWQg
aXMgPj0gcHVyZ2VfdmlldzogdGhlbiBpdCBpcyBndWFyYW50ZWVkIHRoYXQgaXRzIHVwZGF0ZQot
dW5kbyBsb2cgc3RpbGwgZXhpc3RzIGluIHRoZSBzeXN0ZW0uCi1AcmV0dXJuIFRSVUUgaWYgaXMg
c3VyZSB0aGF0IGl0IGlzIHByZXNlcnZlZCwgYWxzbyBpZiB0aGUgZnVuY3Rpb24KLXJldHVybnMg
RkFMU0UsIGl0IGlzIHBvc3NpYmxlIHRoYXQgdGhlIHVuZG8gbG9nIHN0aWxsIGV4aXN0cyBpbiB0
aGUKLXN5c3RlbSAqLwotVU5JVl9JTlRFUk4KLWlib29sCi10cnhfcHVyZ2VfdXBkYXRlX3VuZG9f
bXVzdF9leGlzdCgKLS8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCXRyeF9pZF90
CXRyeF9pZCkJLyohPCBpbjogdHJhbnNhY3Rpb24gaWQgKi8KLXsKLSNpZmRlZiBVTklWX1NZTkNf
REVCVUcKLQl1dF9hZChyd19sb2NrX293bigmKHB1cmdlX3N5cy0+bGF0Y2gpLCBSV19MT0NLX1NI
QVJFRCkpOwotI2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAqLwotCi0JcmV0dXJuKCFyZWFkX3Zp
ZXdfc2Vlc190cnhfaWQocHVyZ2Vfc3lzLT52aWV3LCB0cnhfaWQpKTsKLX0KLQogLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
LyoqCiBCdWlsZHMgYSBwdXJnZSAncXVlcnknIGdyYXBoLiBUaGUgYWN0dWFsIHB1cmdlIGlzIHBl
cmZvcm1lZCBieSBleGVjdXRpbmcKIHRoaXMgcXVlcnkgZ3JhcGguCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwcmVjLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTEwNTA0MDcyOTUx
LTZocHFyYWRqZG4wcjM5d3cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTA0MTEyOTI5LTN6cWhweTI5bmx5bDBz
YzAKQEAgLTM2LDYgKzM2LDcgQEAgQ3JlYXRlZCAzLzI2LzE5OTYgSGVpa2tpIFR1dXJpCiAjaWZu
ZGVmIFVOSVZfSE9UQkFDS1VQCiAjaW5jbHVkZSAiZGljdDBkaWN0LmgiCiAjaW5jbHVkZSAidXQw
bWVtLmgiCisjaW5jbHVkZSAicmVhZDByZWFkLmgiCiAjaW5jbHVkZSAicm93MGV4dC5oIgogI2lu
Y2x1ZGUgInJvdzB1cGQuaCIKICNpbmNsdWRlICJxdWUwcXVlLmgiCkBAIC0xMzgzLDExICsxMzg0
LDEzIEBAIHRyeF91bmRvX2dldF91bmRvX3JlYygKIAl0cnhfdW5kb19yZWNfdCoqIHVuZG9fcmVj
LAkvKiE8IG91dCwgb3duOiBjb3B5IG9mIHRoZSByZWNvcmQgKi8KIAltZW1faGVhcF90KgloZWFw
KQkJLyohPCBpbjogbWVtb3J5IGhlYXAgd2hlcmUgY29waWVkICovCiB7Ci0jaWZkZWYgVU5JVl9T
WU5DX0RFQlVHCi0JdXRfYWQocndfbG9ja19vd24oJihwdXJnZV9zeXMtPmxhdGNoKSwgUldfTE9D
S19TSEFSRUQpKTsKLSNlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcgKi8KKwlpYm9vbAkJbWlzc2lu
Z19oaXN0b3J5OworCisJcndfbG9ja19zX2xvY2soJnB1cmdlX3N5cy0+bGF0Y2gpOworCW1pc3Np
bmdfaGlzdG9yeSA9IHJlYWRfdmlld19zZWVzX3RyeF9pZChwdXJnZV9zeXMtPnZpZXcsIHRyeF9p
ZCk7CisJcndfbG9ja19zX3VubG9jaygmcHVyZ2Vfc3lzLT5sYXRjaCk7CiAKLQlpZiAoIXRyeF9w
dXJnZV91cGRhdGVfdW5kb19tdXN0X2V4aXN0KHRyeF9pZCkpIHsKKwlpZiAoVU5JVl9VTkxJS0VM
WShtaXNzaW5nX2hpc3RvcnkpKSB7CiAKIAkJLyogSXQgbWF5IGJlIHRoYXQgdGhlIG5lY2Vzc2Fy
eSB1bmRvIGxvZyBoYXMgYWxyZWFkeSBiZWVuCiAJCWRlbGV0ZWQgKi8KQEAgLTE0MDcsMTAgKzE0
MTAsMTAgQEAgdHJ4X3VuZG9fZ2V0X3VuZG9fcmVjKAogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8K
IAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCi1CdWlsZCBhIHByZXZpb3VzIHZlcnNpb24gb2YgYSBjbHVzdGVy
ZWQgaW5kZXggcmVjb3JkLiBUaGlzIGZ1bmN0aW9uIGNoZWNrcwotdGhhdCB0aGUgY2FsbGVyIGhh
cyBhIGxhdGNoIG9uIHRoZSBpbmRleCBwYWdlIG9mIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3Jk
Ci1hbmQgYW4gcy1sYXRjaCBvbiB0aGUgcHVyZ2Vfdmlldy4gVGhpcyBndWFyYW50ZWVzIHRoYXQg
dGhlIHN0YWNrIG9mIHZlcnNpb25zCi1pcyBsb2NrZWQgYWxsIHRoZSB3YXkgZG93biB0byB0aGUg
cHVyZ2Vfdmlldy4KK0J1aWxkIGEgcHJldmlvdXMgdmVyc2lvbiBvZiBhIGNsdXN0ZXJlZCBpbmRl
eCByZWNvcmQuIFRoZSBjYWxsZXIgbXVzdAoraG9sZCBhIGxhdGNoIG9uIHRoZSBpbmRleCBwYWdl
IG9mIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLCB0bworZ3VhcmFudGVlIHRoYXQgdGhlIHN0
YWNrIG9mIHZlcnNpb25zIGlzIGxvY2tlZCBhbGwgdGhlIHdheSBkb3duIHRvIHRoZQorcHVyZ2Vf
c3lzLT52aWV3LgogQHJldHVybiBEQl9TVUNDRVNTLCBvciBEQl9NSVNTSU5HX0hJU1RPUlkgaWYg
dGhlIHByZXZpb3VzIHZlcnNpb24gaXMKIGVhcmxpZXIgdGhhbiBwdXJnZV92aWV3LCB3aGljaCBt
ZWFucyB0aGF0IGl0IG1heSBoYXZlIGJlZW4gcmVtb3ZlZCAqLwogVU5JVl9JTlRFUk4KQEAgLTE0
NTEsNyArMTQ1NCw3IEBAIHRyeF91bmRvX3ByZXZfdmVyc2lvbl9idWlsZCgKIAlieXRlKgkJYnVm
OwogCXVsaW50CQllcnI7CiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCi0JdXRfYWQocndfbG9ja19v
d24oJihwdXJnZV9zeXMtPmxhdGNoKSwgUldfTE9DS19TSEFSRUQpKTsKKwl1dF9hZCghcndfbG9j
a19vd24oJnB1cmdlX3N5cy0+bGF0Y2gsIFJXX0xPQ0tfU0hBUkVEKSk7CiAjZW5kaWYgLyogVU5J
Vl9TWU5DX0RFQlVHICovCiAJdXRfYWQobXRyX21lbW9fY29udGFpbnNfcGFnZShpbmRleF9tdHIs
IGluZGV4X3JlYywgTVRSX01FTU9fUEFHRV9TX0ZJWCkKIAkgICAgICB8fCBtdHJfbWVtb19jb250
YWluc19wYWdlKGluZGV4X210ciwgaW5kZXhfcmVjLAoK

--===============1162999200==
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.6-innodb/
# testament_sha1: 672733c5a7ec6204b7bde4bc93a7138107c10361
# timestamp: 2011-05-04 14:29:37 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   6hpqradjdn0r39ww
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ/sa70ABX9flAAwe/f//3/v
36C////4BAAIAGALXWzbSe63xvGuQUb30+42305fd7ms7OUltrYV3vMJIgSamTU/SmDGplM1PakG
gaBo00aHo1NA00BJIJiNGgjJNKek9QHqGQAADQABkBEoep+qeUZPUDQAaA0ZAGgAMgBpo0BIimJq
aaE9TTJoSPTSPUxGgDQGgDQ0AAikgTVPaMptKfqNTGhDQ9TR6mhtTTQ0AAAARSCAgjCZMEap5R6T
TJo0GgeoaAADQ0vvcIbYNsaPVx5uFfR6ny+v+vBl4a9kzDPNrrn2uPZ/yVM7s+5CQdfAfNajSTRL
CGmp968Nh4Z7ptbbZOtxSo4HgzEnwgEj+XAXhDIvOMemFn0pBsbyes/dn3WTtXjjTCFSZ9Pb6dU9
J1o60c6GNobTYNg2F/zS3cKX0gbw59N50UTcwyLsq6Tw5YNq8kYKuq00oUdyLRnKuLNQi5Sj3mhG
f94bDyv0zsJWz5YWwk1UV5mC5uw38Drg4f307qxaTjxUd329yPFCd+OLX0I/xKCMmgLPY/Cw/Q9i
0+fVGd9sDlL2s/2plTdfK8bdTxdhoke6mEguLnQtndORVNJQqDj8X+fIl7CJyFtUlA0/prJ/k0Tq
GmL/8VskWUSIstfomi+ioLflXm7LCrMr9VxEZ5FE+MzciesguTEOlTCkDb4jzuxmdzHHfBfSFiNY
vCCLqb+5gqOerzfMc/k83j7ZyKNprljiODuj+NrHXG+IUQhshItwQrIHGYyCC5jZo2pjvlZbuK+v
G0Tyd7HV8ZbKzsGODTPVWPDfxXWRlKo2zKrUKbou8rysldWIX2dVXxUOXR4cV2347KZ7jFpvnetw
7Yb1PezX3bub1tVW4iIaSOuIu4H40guvgO7FOCaK2pcV1e5nuViBSdRlCSgqdc48BSisyZ08C8of
GUQJMoULSxXz0LAm0ONltSUDDZGUylC7IaShhO3LWpl+pX+uA6WyQ7BeDqAtgsySzMrdc5Rs75JE
q4uSwy6J9GQUyi2NNU6r8Gx+l0MRJut27ceHbPHZ20HLtNkvK8ZDHxa9xbQr0yPKkoXjzY1OPlZ3
rczMNbzVDJLYmdN8YEjr1I38o15FX1jGHeJFAq/XJ4/BouMNoDdlxwctSPFQowYFTMLMxFuEOYvV
MDOeaIgiGIiPrQeZnPNat0sQzDCwzaDu4odY85qlmnwvQTjIfkktyqu9rs3QiHWd6qtaS1mogxJN
h0iWpW56Wkac4VNOKusmFxyJNYEKA5rbMKUKwXuWtlWlWDsipmgsXD1kkqEC0cH3j9DDB9/Wwguw
U3vvNkw6j4EXBnDYrg05bm5AvSTBqZo0LvNMqcklEv0Ikhqywm/Zn4O47eRdYnSHNtSXD66IDEmx
vuligIWOe5bUecLHCEh1M5TwwJueuUpJKSne5Z67ELiTqpJ7rYkS8KkXDiBnkl8kBxupjrEHZpOc
Orp0D1pKsUN6SzW3cY0NwzKXKMtXCQoRMGMpbxKQu12HETeNihtczqGb65zvEsUlBXZUmXDEnkL4
iTnj3pKpZ+p0UU45qWY8vLQ1G0vqXiXnivGD9eas2zFKuT8GuoskbQFc5JptcOAF18Xq0xdkHR8g
6zz7csVEhkHkSc04c04fCwlYksgdtqdJYDo5NcLMDAwmZn6dEDlDsCP7/LnO464Y/OSQAIICVCE4
kHfCF9uN1jFe+DITAG1FIBhA5iFRuSgdUm2ILVX3NnFN5lNh1Ruhg7LKQ/kQz4b8qzB224beK7qO
bn+svEdTcSiiJcMzDF684DalU+p6UTx1yJq/MTELSw4oiaaah5LHOJs71gNXKr0HPzkxKv0HOeKh
L2U8Twrj+OpK9SpocDWhJv6r/CALXM5zIl9APVl+2JKHLK+tiOSVnbD4vWWBQGmEGbd62ZmR97Mo
WWnZjj2WTQjrB3BKrBYaeuitTPPE4G3hiYtwxZuf2cxlSWdTSwwHPQORMGlpcF7o4FFL6KtI55DC
76MG2rLjJi8tv3DcM/tLSskrPnVtTPDkdqvUrjM5ykdPcp3xtwwi0DrKQhdNUslUOTTfFJD5M5DL
IZZEMSsu0HKbUNSInEGE5SDgksxulm3/cbzceTecLzlp3GfQugzLcYRTjgcS25TU6G7j2Bib/iV5
SgYqay68zoTUnV4U7YG/Rbq1q5VgZiyu4z5uOEGKtBdGIVz4qorai5YjS5UbBKbEULIEnJDtJ2gF
U74uOukamrF8NVSGEmZZ95UobSZrJRwt5FTkczzJqTF/JkOyRkJEAamaDbuO0eBoXm69I6E7kV4M
eOEk97kVujDvK1XUc5wjib7vdhLWhIa3THxvf6IM1C+L81kNFERJbi91TLzaKyqNO9XO1yXHZMAS
I344UjK9tOO9ykp2RrhSwSoGSOeial1eYEQ3Wqx5fLyO3nB0HBl3HdOhee0XdJccy1XsDEaGToF/
iPbRdHiZwNpBZjt5OiybG0eXgoFyOAMbWEIVk45DHynA38ZJNIWQMFlBfWwLEDEJdPVzaqCmKJNT
a4zEbMH4C1UC14QcWa41yvyplhSKuMSm3Ba9xN1WrOQa2moNHz/o6gJwLeTnPxP23aHjplqsq83O
X1en32kTTAzITI6HCmVa5xJDL0WAbn5cC1tZbZFXEKJdbe5G97V0qwPTCQof3LYBHEE24xCd/qF3
Blc4FZqno9LvTBu5cp0wpXBMhHm2JIgRqlrRmmDbHytKYy+lms13PwMNXlZbMS6rtiW7WDaSH5Eg
3B+Z8Awku3e5i7QldRho5x2trVuIsbrhlbV1xisVjUeLkJiA6TJzK7E0sUWwSm0qUBvAdNL2wSKp
qIOMTZJNx5xKJoEYmLTbTqgohUkXgRNmTYnICTg2V8Op74aVfwlNooUDNuUru0FMylWzNTuNVhIu
pEVxJqnOHoAtYER8eU8WgwDt1F3jGhAz1JIkCqJRn4sBPRBK15PA1Cr/M5BbY28L54C7mQyU+oQF
Yu6uNxWktLjg4W2cacoO4Y74PYylQkSv0Yi3cBcXW5N22OUkyQG1OEC91MDlVBVbcERysnEm43Gr
2/YUoUGSXLAbbkb+Nezpdua8esRsyYAmdoTzJYNKB5EaQwNaVqwIqVSWthwhPIucOYzuwghr10wY
1RkGkRy7MLZHNePKJYzVGrnjHBTRB3a2cRKmpc5V2DjbDK2He0VR8VqtZZg0m2i5pZGw7mjPNfi7
raoIgwRJJIpNgEp6XEs8mbIVYbgbWzwEiotuFcMqUSfiEZwibRUFa5wWpGSYewnUyEb0d1ZADMsW
IXvrTMwqhQeK1tGA6iJbHxlBJZJdgHYxsbHoqGxU2lklk5DNTGHQ7d69LpeFr4fTctlqspeSNqJs
N73wAsZkvl1qtDupaHlvb/rUFlBrU2hWLEDaHCPI7Io4A0YSHYyZNQ8hKNM9kGLVw9AXAXjEAxAE
G3ZJTXS7j1U2wVJ0rwkE4oGxi8XLL0tgtgvUwHJ5xdr/FXB/xdyRThQkJ/sa70A=


--===============1162999200==--