From: marko.makela
Date: October 20 2010 11:54am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3263 to 3264)
List-Archive: http://lists.mysql.com/commits/121302
Message-Id: <201010201154.o9KBR9QY008735@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1562677368=="

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

IDMyNjQgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yMCBbbWVyZ2VdCiAgICAgIE1lcmdlIGZyb20g
bXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIKCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1ZGR5LmMKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL2J1ZjBidWRkeS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVk
ZHkuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAogICAgICBzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGZsdS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3lu
Yy9zeW5jMHN5bmMuYwogMzI2MyBNYXJrbyBNw6RrZWzDpAkyMDEwLTEwLTIwCiAgICAgIEZpeCB0
d28gZXJyb3JzIGludHJvZHVjZWQgaW4gdGhlIEJ1ZyM1NzIzMiBmaXggYnkgU3VubnkgQmFpbnMK
ICAgICAgcmV2bm86IDMyNjIKICAgICAgcmV2aXNpb24taWQ6IHN1bm55LmJhaW5zQG9yYWNsZS5j
b20tMjAxMDEwMjAwODU0NDQtZHJpemkxOWp4ZWUya2RrcAoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MG15c3FsLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1
ZjBidWRkeS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVkZHkuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMDEwMzQzNS1zdHp3bzY2Zzc2dTF6cWZ6Cisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWRkeS5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAxMDIwMTE1MzI1LWF3eThnNTQzYm1zODFoaHoKQEAgLTI4MSw3ICsyODEs
NyBAQCBidWZfYnVkZHlfYWxsb2NfZnJvbSgKIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBBbGxvY2F0
ZSBhIGJsb2NrLiAgVGhlIHRocmVhZCBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gbXVzdCBob2xkCi1i
dWZfcG9vbC0+bXV0ZXggYW5kIG11c3Qgbm90IGhvbGQgYnVmX3Bvb2xfemlwX211dGV4IG9yIGFu
eSBibG9jay0+bXV0ZXguCitidWZfcG9vbC0+bXV0ZXggYW5kIG11c3Qgbm90IGhvbGQgYnVmX3Bv
b2wtPnppcF9tdXRleCBvciBhbnkgYmxvY2stPm11dGV4LgogVGhlIGJ1Zl9wb29sLT5tdXRleCBt
YXkgb25seSBiZSByZWxlYXNlZCBhbmQgcmVhY3F1aXJlZCBpZiBscnUgIT0gTlVMTC4KIEByZXR1
cm4JYWxsb2NhdGVkIGJsb2NrLCBwb3NzaWJseSBOVUxMIGlmIGxydT09TlVMTCAqLwogVU5JVl9J
TlRFUk4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMTAyMDEwMzQzNS1zdHp3bzY2Zzc2dTF6cWZ6CisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MTAyMDExNTMyNS1hd3k4ZzU0M2JtczgxaGh6CkBAIC0xNzMsNyArMTczLDcgQEAgVGhlIGNoYWlu
IG9mIG1vZGlmaWVkIGJsb2NrcyAoYnVmX3Bvb2wtPgogaG9sZGluZyBmaWxlIHBhZ2VzIHRoYXQg
aGF2ZSBiZWVuIG1vZGlmaWVkIGluIHRoZSBtZW1vcnkKIGJ1dCBub3Qgd3JpdHRlbiB0byBkaXNr
IHlldC4gVGhlIGJsb2NrIHdpdGggdGhlIG9sZGVzdCBtb2RpZmljYXRpb24KIHdoaWNoIGhhcyBu
b3QgeWV0IGJlZW4gd3JpdHRlbiB0byBkaXNrIGlzIGF0IHRoZSBlbmQgb2YgdGhlIGNoYWluLgot
VGhlIGFjY2VzcyB0byB0aGlzIGxpc3QgaXMgcHJvdGVjdGVkIGJ5IGZsdXNoX2xpc3RfbXV0ZXgu
CitUaGUgYWNjZXNzIHRvIHRoaXMgbGlzdCBpcyBwcm90ZWN0ZWQgYnkgYnVmX3Bvb2wtPmZsdXNo
X2xpc3RfbXV0ZXguCiAKIFRoZSBjaGFpbiBvZiB1bm1vZGlmaWVkIGNvbXByZXNzZWQgYmxvY2tz
IChidWZfcG9vbC0+emlwX2NsZWFuKQogY29udGFpbnMgdGhlIGNvbnRyb2wgYmxvY2tzIChidWZf
cGFnZV90KSBvZiB0aG9zZSBjb21wcmVzc2VkIHBhZ2VzCkBAIC0xOTMyLDcgKzE5MzIsNyBAQCBw
YWdlX2ZvdW5kOgogCWhhc2hfbXV0ZXhlcy4gYnVmX3Bvb2wgbXV0ZXggaXMgbmVlZGVkIGJlY2F1
c2UgYW55IGNoYW5nZXMgdG8KIAl0aGUgcGFnZV9oYXNoIG11c3QgYmUgY292ZXJlZCBieSBpdCBh
bmQgaGFzaF9tdXRleGVzIGFyZSBuZWVkZWQKIAliZWNhdXNlIHdlIGRvbid0IHdhbnQgdG8gcmVh
ZCBhbnkgc3RhbGUgaW5mb3JtYXRpb24gaW4KLQlidWZfcG9vbF93YXRjaFtdLiBIb3dldmVyLCBp
dCBpcyBub3QgaW4gdGhlIGNyaXRpY2FsIGNvZGUgcGF0aAorCWJ1Zl9wb29sLT53YXRjaFtdLiBI
b3dldmVyLCBpdCBpcyBub3QgaW4gdGhlIGNyaXRpY2FsIGNvZGUgcGF0aAogCWFzIHRoaXMgZnVu
Y3Rpb24gd2lsbCBiZSBjYWxsZWQgb25seSBieSB0aGUgcHVyZ2UgdGhyZWFkLiAqLwogCiAKQEAg
LTE5NjksOCArMTk2OSw4IEBAIHBhZ2VfZm91bmQ6CiAJCQl1dF9hZCghYnBhZ2UtPmluX3BhZ2Vf
aGFzaCk7CiAJCQl1dF9hZChicGFnZS0+YnVmX2ZpeF9jb3VudCA9PSAwKTsKIAotCQkJLyogYnBh
Z2UgaXMgcG9pbnRpbmcgdG8gYnVmX3Bvb2xfd2F0Y2hbXSwKLQkJCXdoaWNoIGlzIHByb3RlY3Rl
ZCBieSBidWZfcG9vbF9tdXRleC4KKwkJCS8qIGJwYWdlIGlzIHBvaW50aW5nIHRvIGJ1Zl9wb29s
LT53YXRjaFtdLAorCQkJd2hpY2ggaXMgcHJvdGVjdGVkIGJ5IGJ1Zl9wb29sLT5tdXRleC4KIAkJ
CU5vcm1hbGx5LCBidWZfcGFnZV90IG9iamVjdHMgYXJlIHByb3RlY3RlZCBieQogCQkJYnVmX2Js
b2NrX3Q6Om11dGV4IG9yIGJ1Zl9wb29sLT56aXBfbXV0ZXggb3IgYm90aC4gKi8KIApAQCAtMzA2
MSw3ICszMDYxLDcgQEAgd2FpdF91bnRpbF91bmZpeGVkOgogCQltdXRleF9lbnRlcigmYmxvY2st
Pm11dGV4KTsKIAkJaWYgKFVOSVZfVU5MSUtFTFkoYnBhZ2UgIT0gaGFzaF9icGFnZSkpIHsKIAkJ
CS8qIFRoZSBidWZfcG9vbC0+cGFnZV9oYXNoIHdhcyBtb2RpZmllZAotCQkJd2hpbGUgYnVmX3Bv
b2xfbXV0ZXggd2FzIHJlbGVhc2VkLgorCQkJd2hpbGUgYnVmX3Bvb2wtPm11dGV4IHdhcyByZWxl
YXNlZC4KIAkJCUZyZWUgdGhlIGJsb2NrIHRoYXQgd2FzIGFsbG9jYXRlZC4gKi8KIAogCQkJYnVm
X0xSVV9ibG9ja19mcmVlX25vbl9maWxlX3BhZ2UoYmxvY2spOwoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9i
dWYvYnVmMGZsdS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIwMTAzNDM1
LXN0endvNjZnNzZ1MXpxZnoKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGZsdS5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIwMTE1MzI1LWF3eThnNTQzYm1zODFo
aHoKQEAgLTMyNCw3ICszMjQsNyBAQCBidWZfZmx1c2hfaW5zZXJ0X3NvcnRlZF9pbnRvX2ZsdXNo
X2xpc3QoCiAKIAlidWZfZmx1c2hfbGlzdF9tdXRleF9lbnRlcihidWZfcG9vbCk7CiAKLQkvKiBU
aGUgZmllbGQgaW5fTFJVX2xpc3QgaXMgcHJvdGVjdGVkIGJ5IGJ1Zl9wb29sX211dGV4LCB3aGlj
aAorCS8qIFRoZSBmaWVsZCBpbl9MUlVfbGlzdCBpcyBwcm90ZWN0ZWQgYnkgYnVmX3Bvb2wtPm11
dGV4LCB3aGljaAogCXdlIGFyZSBub3QgaG9sZGluZy4gIEhvd2V2ZXIsIHdoaWxlIGEgYmxvY2sg
aXMgaW4gdGhlIGZsdXNoCiAJbGlzdCwgaXQgaXMgZGlydHkgYW5kIGNhbm5vdCBiZSBkaXNjYXJk
ZWQsIG5vdCBmcm9tIHRoZQogCXBhZ2VfaGFzaCBvciBmcm9tIHRoZSBMUlUgbGlzdC4gIEF0IG1v
c3QsIHRoZSB1bmNvbXByZXNzZWQKQEAgLTEwNjYsNyArMTA2Niw3IEBAIGJ1Zl9mbHVzaF93cml0
ZV9ibG9ja19sb3coCiAKIAl1dF9hZChidWZfcGFnZV9pbl9maWxlKGJwYWdlKSk7CiAKLQkvKiBX
ZSBhcmUgbm90IGhvbGRpbmcgYnVmX3Bvb2xfbXV0ZXggb3IgYmxvY2tfbXV0ZXggaGVyZS4KKwkv
KiBXZSBhcmUgbm90IGhvbGRpbmcgYnVmX3Bvb2wtPm11dGV4IG9yIGJsb2NrX211dGV4IGhlcmUu
CiAJTmV2ZXJ0aGVsZXNzLCBpdCBpcyBzYWZlIHRvIGFjY2VzcyBicGFnZSwgYmVjYXVzZSBpdCBp
cwogCWlvX2ZpeGVkIGFuZCBvbGRlc3RfbW9kaWZpY2F0aW9uICE9IDAuICBUaHVzLCBpdCBjYW5u
b3QgYmUKIAlyZWxvY2F0ZWQgaW4gdGhlIGJ1ZmZlciBwb29sIG9yIHJlbW92ZWQgZnJvbSBmbHVz
aF9saXN0IG9yCkBAIC0xMTQwLDcgKzExNDAsNyBAQCBidWZfZmx1c2hfd3JpdGVfYmxvY2tfbG93
KAogIyBpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0lCVUZfREVCVUcKIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIFdyaXRlcyBhIGZsdXNoYWJsZSBwYWdlIGFzeW5jaHJvbm91c2x5IGZy
b20gdGhlIGJ1ZmZlciBwb29sIHRvIGEgZmlsZS4KLU5PVEU6IGJ1Zl9wb29sX211dGV4IGFuZCBi
bG9jay0+bXV0ZXggbXVzdCBiZSBoZWxkIHVwb24gZW50ZXJpbmcgdGhpcworTk9URTogYnVmX3Bv
b2wtPm11dGV4IGFuZCBibG9jay0+bXV0ZXggbXVzdCBiZSBoZWxkIHVwb24gZW50ZXJpbmcgdGhp
cwogZnVuY3Rpb24sIGFuZCB0aGV5IHdpbGwgYmUgcmVsZWFzZWQgYnkgdGhpcyBmdW5jdGlvbiBh
ZnRlciBmbHVzaGluZy4KIFRoaXMgaXMgbG9vc2VseSBiYXNlZCBvbiBidWZfZmx1c2hfYmF0Y2go
KSBhbmQgYnVmX2ZsdXNoX3BhZ2UoKS4KIEByZXR1cm4gVFJVRSBpZiB0aGUgcGFnZSB3YXMgZmx1
c2hlZCBhbmQgdGhlIG11dGV4ZXMgcmVsZWFzZWQgKi8KQEAgLTIxOTgsMTIgKzIxOTgsMTIgQEAg
YnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdygKIAogCQl1dF9hZChicGFnZS0+aW5fZmx1c2hfbGlzdCk7
CiAKLQkJLyogQSBwYWdlIGluIGZsdXNoX2xpc3QgY2FuIGJlIGluIEJVRl9CTE9DS19SRU1PVkVf
SEFTSAotCQlzdGF0ZS4gVGhpcyBoYXBwZW5zIHdoZW4gYSBwYWdlIGlzIGluIHRoZSBtaWRkbGUg
b2YKLQkJYmVpbmcgcmVsb2NhdGVkLiBJbiB0aGF0IGNhc2UgdGhlIG9yaWdpbmFsIGRlc2NyaXB0
b3IKLQkJY2FuIGhhdmUgdGhpcyBzdGF0ZSBhbmQgc3RpbGwgYmUgaW4gdGhlIGZsdXNoIGxpc3QK
LQkJd2FpdGluZyB0byBhY3F1aXJlIHRoZSBmbHVzaF9saXN0X211dGV4IHRvIGNvbXBsZXRlCi0J
CXRoZSByZWxvY2F0aW9uLiAqLworCQkvKiBBIHBhZ2UgaW4gYnVmX3Bvb2wtPmZsdXNoX2xpc3Qg
Y2FuIGJlIGluCisJCUJVRl9CTE9DS19SRU1PVkVfSEFTSCBzdGF0ZS4gVGhpcyBoYXBwZW5zIHdo
ZW4gYSBwYWdlCisJCWlzIGluIHRoZSBtaWRkbGUgb2YgYmVpbmcgcmVsb2NhdGVkLiBJbiB0aGF0
IGNhc2UgdGhlCisJCW9yaWdpbmFsIGRlc2NyaXB0b3IgY2FuIGhhdmUgdGhpcyBzdGF0ZSBhbmQg
c3RpbGwgYmUKKwkJaW4gdGhlIGZsdXNoIGxpc3Qgd2FpdGluZyB0byBhY3F1aXJlIHRoZQorCQli
dWZfcG9vbC0+Zmx1c2hfbGlzdF9tdXRleCB0byBjb21wbGV0ZSB0aGUgcmVsb2NhdGlvbi4gKi8K
IAkJdXRfYShidWZfcGFnZV9pbl9maWxlKGJwYWdlKQogCQkgICAgIHx8IGJ1Zl9wYWdlX2dldF9z
dGF0ZShicGFnZSkgPT0gQlVGX0JMT0NLX1JFTU9WRV9IQVNIKTsKIAkJdXRfYShvbSA+IDApOwoK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGxydS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAxMDIwMTAzNDM1LXN0endvNjZnNzZ1MXpxZnoKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGxydS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIwMTE1
MzI1LWF3eThnNTQzYm1zODFoaHoKQEAgLTEyMyw3ICsxMjMsNyBAQCBUYWtlcyBhIGJsb2NrIG91
dCBvZiB0aGUgTFJVIGxpc3QgYW5kIHBhCiBJZiB0aGUgYmxvY2sgaXMgY29tcHJlc3NlZC1vbmx5
IChCVUZfQkxPQ0tfWklQX1BBR0UpLAogdGhlIG9iamVjdCB3aWxsIGJlIGZyZWVkLgogCi1UaGUg
Y2FsbGVyIG11c3QgaG9sZCBidWZfcG9vbF9tdXRleCwgdGhlIGJ1Zl9wYWdlX2dldF9tdXRleCgp
IG11dGV4CitUaGUgY2FsbGVyIG11c3QgaG9sZCBidWZfcG9vbC0+bXV0ZXgsIHRoZSBidWZfcGFn
ZV9nZXRfbXV0ZXgoKSBtdXRleAogYW5kIHRoZSBhcHByb3ByaWF0ZSBoYXNoX211dGV4LiBUaGlz
IGZ1bmN0aW9uIHdpbGwgcmVsZWFzZSB0aGUKIGJ1Zl9wYWdlX2dldF9tdXRleCgpIGFuZCB0aGUg
aGFzaF9tdXRleC4KIApAQCAtMzYwLDggKzM2MCw4IEBAIHNjYW5fYWdhaW46CiAJCXByZXZfYnBh
Z2UgPSBVVF9MSVNUX0dFVF9QUkVWKExSVSwgYnBhZ2UpOwogCiAJCS8qIGJwYWdlLT5zcGFjZSBh
bmQgYnBhZ2UtPmlvX2ZpeCBhcmUgcHJvdGVjdGVkIGJ5Ci0JCWJ1Zl9wb29sX211dGV4IGFuZCBi
bG9ja19tdXRleC4gIEl0IGlzIHNhZmUgdG8gY2hlY2sKLQkJdGhlbSB3aGlsZSBob2xkaW5nIGJ1
Zl9wb29sX211dGV4IG9ubHkuICovCisJCWJ1Zl9wb29sLT5tdXRleCBhbmQgYmxvY2tfbXV0ZXgu
ICBJdCBpcyBzYWZlIHRvIGNoZWNrCisJCXRoZW0gd2hpbGUgaG9sZGluZyBidWZfcG9vbC0+bXV0
ZXggb25seS4gKi8KIAogCQlpZiAoYnVmX3BhZ2VfZ2V0X3NwYWNlKGJwYWdlKSAhPSBpZCkgewog
CQkJLyogU2tpcCB0aGlzIGJsb2NrLCBhcyBpdCBkb2VzIG5vdCBiZWxvbmcgdG8KQEAgLTQxNSw3
ICs0MTUsNyBAQCBzY2FuX2FnYWluOgogCQkJCQkJLyogRGVzY3JpcHRvcnMgb2YgdW5jb21wcmVz
c2VkCiAJCQkJCQlibG9ja3Mgd2lsbCBub3QgYmUgcmVsb2NhdGVkLAogCQkJCQkJYmVjYXVzZSB3
ZSBhcmUgaG9sZGluZyB0aGUKLQkJCQkJCWJ1Zl9wb29sX211dGV4LiAqLworCQkJCQkJYnVmX3Bv
b2wtPm11dGV4LiAqLwogCQkJCQkJYnJlYWs7CiAJCQkJCWNhc2UgQlVGX0JMT0NLX1pJUF9QQUdF
OgogCQkJCQljYXNlIEJVRl9CTE9DS19aSVBfRElSVFk6CkBAIC0xNDQ3LDEwICsxNDQ3LDEwIEBA
IFRyeSB0byBmcmVlIGEgYmxvY2suICBJZiBicGFnZSBpcyBhIGRlc2MKIHBhZ2UsIHRoZSBkZXNj
cmlwdG9yIG9iamVjdCB3aWxsIGJlIGZyZWVkIGFzIHdlbGwuCiAKIE5PVEU6IElmIHRoaXMgZnVu
Y3Rpb24gcmV0dXJucyBCVUZfTFJVX0ZSRUVELCBpdCB3aWxsIHRlbXBvcmFyaWx5Ci1yZWxlYXNl
IGJ1Zl9wb29sX211dGV4LiAgRnVydGhlcm1vcmUsIHRoZSBwYWdlIGZyYW1lIHdpbGwgbm8gbG9u
Z2VyIGJlCityZWxlYXNlIGJ1Zl9wb29sLT5tdXRleC4gIEZ1cnRoZXJtb3JlLCB0aGUgcGFnZSBm
cmFtZSB3aWxsIG5vIGxvbmdlciBiZQogYWNjZXNzaWJsZSB2aWEgYnBhZ2UuCiAKLVRoZSBjYWxs
ZXIgbXVzdCBob2xkIGJ1Zl9wb29sX211dGV4IGFuZCBtdXN0IG5vdCBob2xkIGFueQorVGhlIGNh
bGxlciBtdXN0IGhvbGQgYnVmX3Bvb2wtPm11dGV4IGFuZCBtdXN0IG5vdCBob2xkIGFueQogYnVm
X3BhZ2VfZ2V0X211dGV4KCkgd2hlbiBjYWxsaW5nIHRoaXMgZnVuY3Rpb24uCiBAcmV0dXJuIEJV
Rl9MUlVfRlJFRUQgaWYgZnJlZWQsIEJVRl9MUlVfQ0FOTk9UX1JFTE9DQVRFIG9yCiBCVUZfTFJV
X05PVF9GUkVFRCBvdGhlcndpc2UuICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL2J1ZjBidWRkeS5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
YnVmMGJ1ZGR5LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjAxMDM0MzUt
c3R6d282Nmc3NnUxenFmegorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1ZGR5
LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjAxMTUzMjUtYXd5OGc1NDNi
bXM4MWhoegpAQCAtMzYsNyArMzYsNyBAQCBDcmVhdGVkIERlY2VtYmVyIDIwMDYgYnkgTWFya28g
TWFrZWxhCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogQWxsb2NhdGUgYSBibG9jay4gIFRoZSB0aHJl
YWQgY2FsbGluZyB0aGlzIGZ1bmN0aW9uIG11c3QgaG9sZAotYnVmX3Bvb2wtPm11dGV4IGFuZCBt
dXN0IG5vdCBob2xkIGJ1Zl9wb29sX3ppcF9tdXRleCBvciBhbnkKK2J1Zl9wb29sLT5tdXRleCBh
bmQgbXVzdCBub3QgaG9sZCBidWZfcG9vbC0+emlwX211dGV4IG9yIGFueQogYmxvY2stPm11dGV4
LiAgVGhlIGJ1Zl9wb29sLT5tdXRleCBtYXkgb25seSBiZSByZWxlYXNlZCBhbmQgcmVhY3F1aXJl
ZAogaWYgbHJ1ICE9IE5VTEwuICBUaGlzIGZ1bmN0aW9uIHNob3VsZCBvbmx5IGJlIHVzZWQgZm9y
IGFsbG9jYXRpbmcKIGNvbXByZXNzZWQgcGFnZSBmcmFtZXMgb3IgY29udHJvbCBibG9ja3MgKGJ1
Zl9wYWdlX3QpLiAgQWxsb2NhdGVkCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2J1ZjBidWRkeS5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1
ZjBidWRkeS5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMDEwMzQzNS1z
dHp3bzY2Zzc2dTF6cWZ6CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVkZHku
aWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjAxMTUzMjUtYXd5OGc1NDNi
bXM4MWhoegpAQCAtMzUsNyArMzUsNyBAQCBDcmVhdGVkIERlY2VtYmVyIDIwMDYgYnkgTWFya28g
TWFrZWxhCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogQWxsb2NhdGUgYSBibG9jay4gIFRoZSB0aHJl
YWQgY2FsbGluZyB0aGlzIGZ1bmN0aW9uIG11c3QgaG9sZAotYnVmX3Bvb2wtPm11dGV4IGFuZCBt
dXN0IG5vdCBob2xkIGJ1Zl9wb29sX3ppcF9tdXRleCBvciBhbnkgYmxvY2stPm11dGV4LgorYnVm
X3Bvb2wtPm11dGV4IGFuZCBtdXN0IG5vdCBob2xkIGJ1Zl9wb29sLT56aXBfbXV0ZXggb3IgYW55
IGJsb2NrLT5tdXRleC4KIFRoZSBidWZfcG9vbC0+bXV0ZXggbWF5IG9ubHkgYmUgcmVsZWFzZWQg
YW5kIHJlYWNxdWlyZWQgaWYgbHJ1ICE9IE5VTEwuCiBAcmV0dXJuCWFsbG9jYXRlZCBibG9jaywg
cG9zc2libHkgTlVMTCBpZiBscnU9PU5VTEwgKi8KIFVOSVZfSU5URVJOCkBAIC04Niw3ICs4Niw3
IEBAIGJ1Zl9idWRkeV9nZXRfc2xvdCgKIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBBbGxvY2F0ZSBh
IGJsb2NrLiAgVGhlIHRocmVhZCBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gbXVzdCBob2xkCi1idWZf
cG9vbC0+bXV0ZXggYW5kIG11c3Qgbm90IGhvbGQgYnVmX3Bvb2xfemlwX211dGV4IG9yIGFueQor
YnVmX3Bvb2wtPm11dGV4IGFuZCBtdXN0IG5vdCBob2xkIGJ1Zl9wb29sLT56aXBfbXV0ZXggb3Ig
YW55CiBibG9jay0+bXV0ZXguICBUaGUgYnVmX3Bvb2wtPm11dGV4IG1heSBvbmx5IGJlIHJlbGVh
c2VkIGFuZCByZWFjcXVpcmVkCiBpZiBscnUgIT0gTlVMTC4gIFRoaXMgZnVuY3Rpb24gc2hvdWxk
IG9ubHkgYmUgdXNlZCBmb3IgYWxsb2NhdGluZwogY29tcHJlc3NlZCBwYWdlIGZyYW1lcyBvciBj
b250cm9sIGJsb2NrcyAoYnVmX3BhZ2VfdCkuICBBbGxvY2F0ZWQKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5oJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvYnVmMGJ1Zi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAx
MDIwMTAzNDM1LXN0endvNjZnNzZ1MXpxZnoKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L2J1ZjBidWYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMDExNTMyNS1h
d3k4ZzU0M2JtczgxaGh6CkBAIC05OSw3ICs5OSw3IEBAIGVudW0gYnVmX3BhZ2Vfc3RhdGUgewog
CUJVRl9CTE9DS19aSVBfRlJFRSA9IDAsCQkvKiE8IGNvbnRhaW5zIGEgZnJlZQogCQkJCQljb21w
cmVzc2VkIHBhZ2UgKi8KIAlCVUZfQkxPQ0tfUE9PTF9XQVRDSCA9IDAsCS8qITwgYSBzZW50aW5l
bCBmb3IgdGhlIGJ1ZmZlciBwb29sCi0JCQkJCXdhdGNoLCBlbGVtZW50IG9mIGJ1Zl9wb29sX3dh
dGNoW10gKi8KKwkJCQkJd2F0Y2gsIGVsZW1lbnQgb2YgYnVmX3Bvb2wtPndhdGNoW10gKi8KIAlC
VUZfQkxPQ0tfWklQX1BBR0UsCQkvKiE8IGNvbnRhaW5zIGEgY2xlYW4KIAkJCQkJY29tcHJlc3Nl
ZCBwYWdlICovCiAJQlVGX0JMT0NLX1pJUF9ESVJUWSwJCS8qITwgY29udGFpbnMgYSBjb21wcmVz
c2VkCkBAIC0xMjQyLDEwICsxMjQyLDEwIEBAIHN0cnVjdCBidWZfcGFnZV9zdHJ1Y3R7CiAjZW5k
aWYgLyogIVVOSVZfSE9UQkFDS1VQICovCiAJcGFnZV96aXBfZGVzX3QJemlwOwkJLyohPCBjb21w
cmVzc2VkIHBhZ2U7IHppcC5kYXRhCiAJCQkJCShidXQgbm90IHRoZSBkYXRhIGl0IHBvaW50cyB0
bykgaXMKLQkJCQkJYWxzbyBwcm90ZWN0ZWQgYnkgYnVmX3Bvb2xfbXV0ZXg7CisJCQkJCWFsc28g
cHJvdGVjdGVkIGJ5IGJ1Zl9wb29sLT5tdXRleDsKIAkJCQkJc3RhdGUgPT0gQlVGX0JMT0NLX1pJ
UF9QQUdFIGFuZAogCQkJCQl6aXAuZGF0YSA9PSBOVUxMIG1lYW5zIGFuIGFjdGl2ZQotCQkJCQli
dWZfcG9vbF93YXRjaCAqLworCQkJCQlidWZfcG9vbC0+d2F0Y2ggKi8KICNpZm5kZWYgVU5JVl9I
T1RCQUNLVVAKIAlidWZfcGFnZV90KgloYXNoOwkJLyohPCBub2RlIHVzZWQgaW4gY2hhaW5pbmcg
dG8KIAkJCQkJYnVmX3Bvb2wtPnBhZ2VfaGFzaCBvcgpAQCAtMTI1NiwxNSArMTI1NiwxNiBAQCBz
dHJ1Y3QgYnVmX3BhZ2Vfc3RydWN0ewogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAogCS8qKiBA
bmFtZSBQYWdlIGZsdXNoaW5nIGZpZWxkcwotCUFsbCB0aGVzZSBhcmUgcHJvdGVjdGVkIGJ5IGJ1
Zl9wb29sX211dGV4LiAqLworCUFsbCB0aGVzZSBhcmUgcHJvdGVjdGVkIGJ5IGJ1Zl9wb29sLT5t
dXRleC4gKi8KIAkvKiBAeyAqLwogCiAJVVRfTElTVF9OT0RFX1QoYnVmX3BhZ2VfdCkgbGlzdDsK
IAkJCQkJLyohPCBiYXNlZCBvbiBzdGF0ZSwgdGhpcyBpcyBhCiAJCQkJCWxpc3Qgbm9kZSwgcHJv
dGVjdGVkIGVpdGhlciBieQotCQkJCQlidWZfcG9vbF9tdXRleCBvciBieQotCQkJCQlmbHVzaF9s
aXN0X211dGV4LCBpbiBvbmUgb2YgdGhlCi0JCQkJCWZvbGxvd2luZyBsaXN0cyBpbiBidWZfcG9v
bDoKKwkJCQkJYnVmX3Bvb2wtPm11dGV4IG9yIGJ5CisJCQkJCWJ1Zl9wb29sLT5mbHVzaF9saXN0
X211dGV4LAorCQkJCQlpbiBvbmUgb2YgdGhlIGZvbGxvd2luZyBsaXN0cyBpbgorCQkJCQlidWZf
cG9vbDoKIAogCQkJCQktIEJVRl9CTE9DS19OT1RfVVNFRDoJZnJlZQogCQkJCQktIEJVRl9CTE9D
S19GSUxFX1BBR0U6CWZsdXNoX2xpc3QKQEAgLTEyNzQsOSArMTI3NSw5IEBAIHN0cnVjdCBidWZf
cGFnZV9zdHJ1Y3R7CiAKIAkJCQkJSWYgYnBhZ2UgaXMgcGFydCBvZiBmbHVzaF9saXN0CiAJCQkJ
CXRoZW4gdGhlIG5vZGUgcG9pbnRlcnMgYXJlCi0JCQkJCWNvdmVyZWQgYnkgZmx1c2hfbGlzdF9t
dXRleC4KKwkJCQkJY292ZXJlZCBieSBidWZfcG9vbC0+Zmx1c2hfbGlzdF9tdXRleC4KIAkJCQkJ
T3RoZXJ3aXNlIHRoZXNlIHBvaW50ZXJzIGFyZQotCQkJCQlwcm90ZWN0ZWQgYnkgYnVmX3Bvb2xf
bXV0ZXguCisJCQkJCXByb3RlY3RlZCBieSBidWZfcG9vbC0+bXV0ZXguCiAKIAkJCQkJVGhlIGNv
bnRlbnRzIG9mIHRoZSBsaXN0IG5vZGUKIAkJCQkJaXMgdW5kZWZpbmVkIGlmICFpbl9mbHVzaF9s
aXN0CkBAIC0xMjg4LDE3ICsxMjg5LDE4IEBAIHN0cnVjdCBidWZfcGFnZV9zdHJ1Y3R7CiAKICNp
ZmRlZiBVTklWX0RFQlVHCiAJaWJvb2wJCWluX2ZsdXNoX2xpc3Q7CS8qITwgVFJVRSBpZiBpbiBi
dWZfcG9vbC0+Zmx1c2hfbGlzdDsKLQkJCQkJd2hlbiBmbHVzaF9saXN0X211dGV4IGlzIGZyZWUs
IHRoZQotCQkJCQlmb2xsb3dpbmcgc2hvdWxkIGhvbGQ6IGluX2ZsdXNoX2xpc3QKKwkJCQkJd2hl
biBidWZfcG9vbC0+Zmx1c2hfbGlzdF9tdXRleCBpcworCQkJCQlmcmVlLCB0aGUgZm9sbG93aW5n
IHNob3VsZCBob2xkOgorCQkJCQlpbl9mbHVzaF9saXN0CiAJCQkJCT09IChzdGF0ZSA9PSBCVUZf
QkxPQ0tfRklMRV9QQUdFCiAJCQkJCSAgICB8fCBzdGF0ZSA9PSBCVUZfQkxPQ0tfWklQX0RJUlRZ
KQogCQkJCQlXcml0ZXMgdG8gdGhpcyBmaWVsZCBtdXN0IGJlCiAJCQkJCWNvdmVyZWQgYnkgYm90
aCBibG9jay0+bXV0ZXgKLQkJCQkJYW5kIGZsdXNoX2xpc3RfbXV0ZXguIEhlbmNlCisJCQkJCWFu
ZCBidWZfcG9vbC0+Zmx1c2hfbGlzdF9tdXRleC4gSGVuY2UKIAkJCQkJcmVhZHMgY2FuIGhhcHBl
biB3aGlsZSBob2xkaW5nCiAJCQkJCWFueSBvbmUgb2YgdGhlIHR3byBtdXRleGVzICovCiAJaWJv
b2wJCWluX2ZyZWVfbGlzdDsJLyohPCBUUlVFIGlmIGluIGJ1Zl9wb29sLT5mcmVlOyB3aGVuCi0J
CQkJCWJ1Zl9wb29sX211dGV4IGlzIGZyZWUsIHRoZSBmb2xsb3dpbmcKKwkJCQkJYnVmX3Bvb2wt
Pm11dGV4IGlzIGZyZWUsIHRoZSBmb2xsb3dpbmcKIAkJCQkJc2hvdWxkIGhvbGQ6IGluX2ZyZWVf
bGlzdAogCQkJCQk9PSAoc3RhdGUgPT0gQlVGX0JMT0NLX05PVF9VU0VEKSAqLwogI2VuZGlmIC8q
IFVOSVZfREVCVUcgKi8KQEAgLTEzMTgsNyArMTMyMCw3IEBAIHN0cnVjdCBidWZfcGFnZV9zdHJ1
Y3R7CiAJCQkJCW1vZGlmaWNhdGlvbnMgYXJlIG9uIGRpc2suCiAJCQkJCVdyaXRlcyB0byB0aGlz
IGZpZWxkIG11c3QgYmUKIAkJCQkJY292ZXJlZCBieSBib3RoIGJsb2NrLT5tdXRleAotCQkJCQlh
bmQgZmx1c2hfbGlzdF9tdXRleC4gSGVuY2UKKwkJCQkJYW5kIGJ1Zl9wb29sLT5mbHVzaF9saXN0
X211dGV4LiBIZW5jZQogCQkJCQlyZWFkcyBjYW4gaGFwcGVuIHdoaWxlIGhvbGRpbmcKIAkJCQkJ
YW55IG9uZSBvZiB0aGUgdHdvIG11dGV4ZXMgKi8KIAkvKiBAfSAqLwpAQCAtMTU3Miw5ICsxNTc0
LDkgQEAgc3RydWN0IGJ1Zl9wb29sX3N0cnVjdHsKIAkJCQkJcGFnZV9oYXNoIGlzIHByb3RlY3Rl
ZCBieSBhbgogCQkJCQlhcnJheSBvZiBtdXRleGVzLgogCQkJCQlDaGFuZ2VzIGluIHBhZ2VfaGFz
aCBhcmUgcHJvdGVjdGVkCi0JCQkJCWJ5IGJ1Zl9wb29sX211dGV4IGFuZCB0aGUgcmVsZXZhbnQK
KwkJCQkJYnkgYnVmX3Bvb2wtPm11dGV4IGFuZCB0aGUgcmVsZXZhbnQKIAkJCQkJcGFnZV9oYXNo
IG11dGV4LiBMb29rdXBzIGNhbiBoYXBwZW4KLQkJCQkJd2hpbGUgaG9sZGluZyB0aGUgYnVmX3Bv
b2xfbXV0ZXggb3IKKwkJCQkJd2hpbGUgaG9sZGluZyB0aGUgYnVmX3Bvb2wtPm11dGV4IG9yCiAJ
CQkJCXRoZSByZWxldmFudCBwYWdlX2hhc2ggbXV0ZXguICovCiAJaGFzaF90YWJsZV90Kgl6aXBf
aGFzaDsJLyohPCBoYXNoIHRhYmxlIG9mIGJ1Zl9ibG9ja190IGJsb2NrcwogCQkJCQl3aG9zZSBm
cmFtZXMgYXJlIGFsbG9jYXRlZCB0byB0aGUKQEAgLTE3MDAsMjAgKzE3MDIsMTMgQEAgc3RydWN0
IGJ1Zl9wb29sX3N0cnVjdHsKIAkvKiBAfSAqLwogfTsKIAotLyoqIG11dGV4IHByb3RlY3Rpbmcg
dGhlIGJ1ZmZlciBwb29sIHN0cnVjdCBhbmQgY29udHJvbCBibG9ja3MsIGV4Y2VwdCB0aGUKLXJl
YWQtd3JpdGUgbG9jayBpbiB0aGVtICovCi1leHRlcm4gbXV0ZXhfdAlidWZfcG9vbF9tdXRleDsK
LS8qKiBtdXRleCBwcm90ZWN0aW5nIHRoZSBjb250cm9sIGJsb2NrcyBvZiBjb21wcmVzc2VkLW9u
bHkgcGFnZXMKLShvZiB0eXBlIGJ1Zl9wYWdlX3QsIG5vdCBidWZfYmxvY2tfdCkgKi8KLWV4dGVy
biBtdXRleF90CWJ1Zl9wb29sX3ppcF9tdXRleDsKLQotLyoqIEBuYW1lIEFjY2Vzc29ycyBmb3Ig
YnVmX3Bvb2xfbXV0ZXguCi1Vc2UgdGhlc2UgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgYnVmX3Bvb2xf
bXV0ZXggZGlyZWN0bHkuICovCisvKiogQG5hbWUgQWNjZXNzb3JzIGZvciBidWZfcG9vbC0+bXV0
ZXguCitVc2UgdGhlc2UgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgYnVmX3Bvb2wtPm11dGV4IGRpcmVj
dGx5LiAqLwogLyogQHsgKi8KIAotLyoqIFRlc3QgaWYgYnVmX3Bvb2xfbXV0ZXggaXMgb3duZWQu
ICovCisvKiogVGVzdCBpZiBhIGJ1ZmZlciBwb29sIG11dGV4IGlzIG93bmVkLiAqLwogI2RlZmlu
ZSBidWZfcG9vbF9tdXRleF9vd24oYikgbXV0ZXhfb3duKCZiLT5tdXRleCkKLS8qKiBBY3F1aXJl
IHRoZSBidWZmZXIgcG9vbCBtdXRleC4gKi8KKy8qKiBBY3F1aXJlIGEgYnVmZmVyIHBvb2wgbXV0
ZXguICovCiAjZGVmaW5lIGJ1Zl9wb29sX211dGV4X2VudGVyKGIpIGRvIHsJCVwKIAl1dF9hZCgh
bXV0ZXhfb3duKCZiLT56aXBfbXV0ZXgpKTsJXAogCW11dGV4X2VudGVyKCZiLT5tdXRleCk7CQlc
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBmbHUuaCcK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBmbHUuaAlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMTAyMDEwMzQzNS1zdHp3bzY2Zzc2dTF6cWZ6CisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwZmx1LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDEwMjAxMTUzMjUtYXd5OGc1NDNibXM4MWhoegpAQCAtODcsNyArODcsNyBAQCBidWZf
Zmx1c2hfaW5pdF9mb3Jfd3JpdGluZygKICMgaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmlu
ZWQgVU5JVl9JQlVGX0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBXcml0ZXMgYSBmbHVzaGFibGUg
cGFnZSBhc3luY2hyb25vdXNseSBmcm9tIHRoZSBidWZmZXIgcG9vbCB0byBhIGZpbGUuCi1OT1RF
OiBidWZfcG9vbF9tdXRleCBhbmQgYmxvY2stPm11dGV4IG11c3QgYmUgaGVsZCB1cG9uIGVudGVy
aW5nIHRoaXMKK05PVEU6IGJ1Zl9wb29sLT5tdXRleCBhbmQgYmxvY2stPm11dGV4IG11c3QgYmUg
aGVsZCB1cG9uIGVudGVyaW5nIHRoaXMKIGZ1bmN0aW9uLCBhbmQgdGhleSB3aWxsIGJlIHJlbGVh
c2VkIGJ5IHRoaXMgZnVuY3Rpb24gYWZ0ZXIgZmx1c2hpbmcuCiBUaGlzIGlzIGxvb3NlbHkgYmFz
ZWQgb24gYnVmX2ZsdXNoX2JhdGNoKCkgYW5kIGJ1Zl9mbHVzaF9wYWdlKCkuCiBAcmV0dXJuIFRS
VUUgaWYgdGhlIHBhZ2Ugd2FzIGZsdXNoZWQgYW5kIHRoZSBtdXRleGVzIHJlbGVhc2VkICovCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwc3luYy5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBzeW5jLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDEwMjAxMDM0MzUtc3R6d282Nmc3NnUxenFmegorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL3N5bmMvc3luYzBzeW5jLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDEwMjAxMTUzMjUtYXd5OGc1NDNibXM4MWhoegpAQCAtMTIxNCw4ICsxMjE0LDggQEAgc3luY190
aHJlYWRfYWRkX2xldmVsKAogCiAJY2FzZSBTWU5DX0JVRl9CTE9DSzoKIAkJLyogRWl0aGVyIHRo
ZSB0aHJlYWQgbXVzdCBvd24gdGhlIGJ1ZmZlciBwb29sIG11dGV4Ci0JCShidWZfcG9vbF9tdXRl
eCksIG9yIGl0IGlzIGFsbG93ZWQgdG8gbGF0Y2ggb25seSBPTkUKLQkJYnVmZmVyIGJsb2NrIChi
bG9jay0+bXV0ZXggb3IgYnVmX3Bvb2xfemlwX211dGV4KS4gKi8KKwkJKGJ1Zl9wb29sLT5tdXRl
eCksIG9yIGl0IGlzIGFsbG93ZWQgdG8gbGF0Y2ggb25seSBPTkUKKwkJYnVmZmVyIGJsb2NrIChi
bG9jay0+bXV0ZXggb3IgYnVmX3Bvb2wtPnppcF9tdXRleCkuICovCiAJCWlmICghc3luY190aHJl
YWRfbGV2ZWxzX2coYXJyYXksIGxldmVsLCBGQUxTRSkpIHsKIAkJCXV0X2Eoc3luY190aHJlYWRf
bGV2ZWxzX2coYXJyYXksIGxldmVsIC0gMSwgVFJVRSkpOwogCQkJdXRfYShzeW5jX3RocmVhZF9s
ZXZlbHNfY29udGFpbihhcnJheSwgU1lOQ19CVUZfUE9PTCkpOwoK

--===============1562677368==
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: 923b483bb4f77e41a4b4ca452e96cdf0496b5622
# timestamp: 2010-10-20 14:54:43 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   stzwo66g76u1zqfz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcuCPrcAEIjflDAwUnf//3tv
n4q////wBAAIAGATXVrtmHTm74dmrLTCqbYGgN7ChlQXVrBoyFGvSRp0OnTlWStK0DhKEU2k000p
+miPUemVPekyoDQDAjJoGmTJoEkQCZGhEyEo9Tan6jEmnqeoZAGgAGnqBqemghIU00eUNABoAAGg
AAABJqQgkmZGk9I0aJhMjTQZAAGg9Q2iDhppkYjCaYCGATTCMExMhpkaGgCpJEyaBMQaaDSYgaBp
U8Cm9Qmg0GjQoCBaSCgIIrFk2zsd77E69vescE4Xpq4fN2LJ9pArLbnQoZ8+aRtmS68mpu2qVPPD
u09an1rf3ZZoeyqKqsVxgVx24Hb5evX2CxRdwlI+4ynPpoeR3NhEBeVCTyhR4PKTyfyjL2xgfMMH
RgcSVGLDJmrOJs2TY5ZVJPjybpWqaXxJCpoITpgQOcmb5ziGpKdDopN8RchTkVWKUYpYqz1aJSUo
c40pcatp6nrk/LJfy9wg8BLgJsMyZkzFCiiwWCyCMEYqKqpFAUXx/yQDbuxx78dWgYGQ1HTfdpvb
TRvztzChgyYOTv8lmKdhBs5RNS7iHZioajZGgZp05DWIc4TI3ZlEOX1AXipqWpwnTA1acJ0TLUXN
2WYgEFYYOUVdg7MKxbIq8XGMINfFZmU+SsVcKWYlyU6JwcFzRJk2nLRDf0d0ivq1Atptc8VbJNat
Jtt2CGRb7wcdrWE00HwM4zasNWoyEOEENwiSey72w7C+hmQJdSX+oUK1tasUa2amgLZiA9rWG91d
YSJdhOABomJhkUk7tFmZ3PRsaYhWWY0KlVZHOx/qnoIIYRbDVGhB9tcINpa8U+zAglBpJk+rvu0g
RCDfr2iCDWZeDhtStU0JKVgZmadW0SdtDGl7pqoXRtjFnPiZL344SYHmPAIIiIRixnTOMaoaKiPa
OWeiK1UqVWOjDZzTo1unbq3PCn6xBs2WkR5D+xRNhnFFFFFFhcKSbzrJn+Ffe3Pl+mZ8fWlJgi76
9lqqvH0uylbUieARqnBInt494ktEdCpVClB2JGCRKnJynvea/Gu/RVEBpyQp7Siw196cOj5mDo1Y
PmDrwj6qc3N2Pgazq7Ka7lDYSgsVa0pqxpOMYSBywOTGa5lFFSqqqSfFIAd2uoh4Q+eeTVVFRUar
wQ1464WtaHbzuPOxB8Kg76hamFSQsgOVBLPmTBmZlvPLQBnh7pbVuREAiogqRJ1pEtaslCFM80O1
TLPMmMosVIXlODYgQoJCiEFCqagy9jlpCI4bTA7sbeJqWK0sbW0VyhA1DAwIZAYpqDlg1JJYuWPl
9dK9k2ND9kidsyQ/71J0BtZ89wGzZRDGIVDFUQp3IOVXbtmwlPKbuaa33KwmOKkfi9ZIN9RBoKl2
FGasKt7HveJ1ZEvZsMX0MxPRrUpSmbm25rmLYgp2HEjBqOJCwSpRC4hYggGOBynn5+Pa0Xfwzv02
42ZrWZyb6k8j9zuPckReVFv1ahqJHRKwygA4gH+o8DoRK9E4CndVFYzAOPlwTgzDJfuEhYvARY3P
r4NbIjNP8OhgI5qJzLWGBjg3NKmtCkiWdfc2NLrcTnbU+EsYO/W3jwKCR+D2CAx711T8j3qk6aEb
Mw8Oep4dk4OeQRdIkzd2Ks7JleuaVrU0aJY0mMyby8hI8QwEdFZ9KyOxeSZok+gVGIpOgUi4343q
FtZToM1miMtQ2LOQyakyBetuqsIC6oGzQu8WVxs7bAJITGpmV05yQ4wPGIiJSKUpRSn4SE7HdzNL
HDz5z++ODca23dwN85YlqeK+cmvVp1O/MnO2YjpoZi8r4nZqYmzTlGJm3UyTLhMc71jGrQJtQ5J+
MQ1kRMsXEiqdeRkgQUiBKsloOXNh2eLM1A3WDqXWxUiQVAawy0yFzfITMcaWYqJCdX23Kxo1BiY/
BuTDUpN6Hfu5fVcAugwhDkDoYHEiQSIHTLlDc3Mk+CwMHJxE19S9MfQarjLD4M7xMF74bJXPVdvf
bmverNjPZDN1FQDoGTM4jZoXVIDTSlVyFypIJl5q3btFSgdjYSNI9CZrPRajLUetYmhqXJSJCAmQ
iaECUWmdTsEyskd9oAwI0SO5AqdxIUqkTobnXr2LXubVN2zKHHG0r0dh2gzRYfqzm9UC9CAc9ikr
udOEMsaX0TL6CRKeTqwe7g6mhUSJWOgaBnM4fWJHgSKJGX0IhOimg1+W68/v+6V4v0NTVMxJjHjv
A7ZNDklDsaCdMaBcsn50EhaD9VcmHY7DHU0mEkcOx2Xtu13YdDMJN7a1KL8dLvl8Q+3TrG17tV99
F8vtMMqKYPQh3atd9u1DdeRiRAM9Cl5jVqzmi6cnqjkQHg9laoZ6LkwearMKBrvO0NLhWByRvxCS
6k+2D2raWNbW1BjSb8iQm7BnTc8wywZ12HDBIc9/rO6EbhUNDg2kYjg3DqEzMuBIVQbQ8ihUbLnJ
ckGAdfUuMruo5y5SGi5g0l028YoLZL8eCbsInltyBpjIkbhuGli7TJIwJCiGO+JjdityWJWbRSJ6
RGdyR4RU9h8DhuQDB2NBIVqB4Fodj5lvoVkYNTe5RLgvahEJbbnibiRqHBYowcGDFh8BciTNTgyv
Z6+aaajw2NHlm8I9Zxi7Sk8GczROJCYQZZOc1JEzSy7Sycx3JGEvwaGUrRraGDMxX2qqzLb2LFoc
OF7WmuaEF2RoLslqs13MB0HlIpVcGYMzM3Bk9mNGMEzffQLadhu45U52nM3Xt7e6llOhqv1MFN7U
0F5cvM6DEIHUie8SPfEYxik6GnXrGjbG9HlWdig8CDzYvqJCsX9WDg5IrzC5cnVSTabGxAJntUDJ
sMaljeohJi14VoEipmt3roRyGp1zFb58yw5FeoQD+RybEiZHyka+Bqa+QQOpPFzB0Op05K2Co30r
191nb9pfO44BZjLG5YFAcgjUkNLBXdJGxeRgskUxVgRlJFM+SmSItA8XyhDoNfWbibyJJLSgWCpE
YgDPtC6oVc4vqh7nfETcTciNPpHu9lvfdclowkm0x9ifRyE5lAYkGQUX327/X1/6Zf52dnIAj6WE
asC+7WCP8fCG1FI23P+Q3PurGMj+lCEATZute/rnvnt5PJ7ngB0gJEBBEoZIZnBh/N6/fFcVKq6p
dS78hJ44XkMJsmbIrMkexcsh6n5vV/gfVIn3WPseuk9fLNGLQ0W0MX5XrF6lPyZmZi1OG+QNzSu/
l+rnxUej1/Q5nBi7P2CLs8287Fvs7c8UpnkjJ/P9ZA4b/3tNn9urMypDwcsV8kxjFQ/H7Wjx0d1z
aiPiZSAPtOPHZroJXYloysy3KwkPngrwMv2CR9rmCRPHe7V/L+F/c7GN/lg6V7LzZMDOZZF7JeuX
s5jZg4LLzB7vd5CT2vM5Rr0t+/cpmwbS5d4Sp/WjQkVbUk/yxQ+olEo5lFCCIIgiCIIgmUPw8tEp
PUCWYuqB7WzMJKYUkpJ5+4CkzJCCUIFKeBOdInW4dzeZk4s2ZezO56HZe7XFnu+s5XIkxa2jk85p
a3eg5kia2diwZ6b+hO5qSJ3ZJE8HOzv01tTdTqbGhd/S27dL9Dd8KoyUW33E0b8KjMpdcEXiZTDi
hFeKu7Y5dPTjZJs9CRkakpahgS1jpqcx0Hg1L4wHbDocHJZe7MHLg1OL2tsRg1nc2pF7JjNTdpSG
g5uDs71TYyZPekS7Daxbpp4oaKE6WE1cjnbmTU48azIk9CO+HTL9O+ek3N2/Mh6bfg/ch6Wj6fL2
QMvN4BJnEDBYqQGebRK/CfrjiTqxyrHhpxHTQafYyZakE15djr8Je0N7Rq+93z9lxlDCnAY8sR+f
fWedRlHTRVyDn7jMW0aweGUNDMxOhTpOc6dj7odiGpOFVSONVS3Q4oVJG0uX6mpi7s68xdW3oYZs
U7VJh68OV/Z3uwlHcGFaUE+y5w80hp5dXkMkvDWbBSte8UOJEAMbDWedUeOz0ML1mEYAhKYiOcIh
v335kUJL6tpQ/5eV6/YomO9Zq2Kf0s2NjuQV7dwmqBMHppqPmOyg2JEollJJxKQt5uaeRsPhSnJR
7nipmXFmf4q9Gg9z5sWE0vBdsETmgVMCuUJFDc9wkLVlEvxcIAizBChkvc5Gw8f7ofVCyGolfy+M
X0fK+T6N0s+9c17un+s4zOTgkdMt38HhSSXbXR4SDw+yU+DQRJ1W7xaVIKBDfk4lHwoxWBvywW8h
a1xKeKRfFmFMxM+/y96R3JI9HYzzxnVvS7Fd0uLqSHbZ54tvmRn3Q0YIUohhz80sf7Z4ZG7wt+lL
cfT9xPvJGOrm0LcKtubG89jY8f3+La1tbKkivUitPya9PWpXTVpK4CfWSXOKWmw3V6BAl1VjkqvP
QmKREEFQVTcUWIyel5SlMgf+PbJHoyiD034N6zRYJXyh5jnEzLDMlSBr67h33yxj60RyxCLEJFGq
qUhkkzMgbFD9P4SAVWCp0ArcPiKeirFn+RNglE6/OuMg1tFUEZYzq+176SByh/V+yKhaJSyKhb0Y
jKI0e7M3nKdN52pfRgZ6GgQxXAkNAndPUCyMaQoGKiioisFpqOyxrNc6p0LV72WnQIQspfZ/zhih
rfhC5gkwEqSVJGPrS0S6ug2SEKLhRr3AZL6YDOpIUkWSCSoZnZ8XbJdXlV0gfrPdsmrwRnPDfem7
z27hJ9SZ3UK2EhFDlAtPiauQigSmoCqxy3YAQ6SPH4yRrWQuErJbZsIzt+plthZBTPsHAiHrcngu
QpIpgR37tjPfm71M6RKw778l79Kmfa+fFMeDpzPtzR2qSprqTcpjyZfwQYyQnV7+wlpRbuNPR2of
VyExCOpAgCJHarnB8aoQ680fOYXvDVl2PKk45fTq0LuSaJEWTnO2l1TxcIcidN9AmXe+abyQZrMj
HDQ0DYv5+KV07vkZC0nTUiqdSGjCGjcJeh8ZrSbaFbeWPO6N8aOZVS1lopFmtzq5pIv2z4Lp+Sda
UerXrz0d9rpqMF4ij02qGSl8G0sQLzaJPKEFGZFyrlzFPFL+DFnkSbyHU0IMLpF+LwcUDTWJjoEL
zNNbHowvZZJFErCEd4Quwo0vzQYs0zNJSqqqT4T6e/Py/N4IYiUEPk6O179bXIinOr6/b2aSYo4q
kSbNrVDt64Ww4JfddFhOvVser3/a0zr7q5KtVx8516UjT8VROypCyKhKh3S2y6J+yC5Idk7t84Us
O1VLlzgh13r0HekevunuQeXTPYh872fQ74jy2zhwQvrxJy8KiupjOadeuf/Gx+D/i7kinChIZcEf
W4A=


--===============1562677368==--