From: marko.makela
Date: June 24 2010 10:49am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3522 to 3524) Bug#54679
List-Archive: http://lists.mysql.com/commits/112052
X-Bug: 54679
Message-Id: <201006241050.o5OA2fFj008539@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0019745844=="

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

IDM1MjQgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yNAogICAgICBBZGQgQ2hhbmdlTG9nIGVudHJ5
IGZvciBCdWcjNTQ2NzkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L0NoYW5nZUxvZwogMzUyMyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI0CiAgICAgIEJ1ZyM1NDY3
OTogYWx0ZXIgdGFibGUgY2F1c2VzIGNvbXByZXNzZWQgcm93X2Zvcm1hdCB0byByZXZlcnQgdG8g
Y29tcGFjdAogICAgICAKICAgICAgaGFfaW5ub2Jhc2U6OmNyZWF0ZSgpOiBBZGQgdGhlIGxvY2Fs
IHZhcmlhYmxlIHJvd190eXBlID0gZm9ybS0+cy0+cm93X3R5cGUuCiAgICAgIEFkanVzdCBpdCB0
byBST1dfVFlQRV9DT01QUkVTU0VEIHdoZW4gUk9XX0ZPUk1BVCBpcyBub3Qgc3BlY2lmaWVkIG9y
IGluaGVyaXRlZAogICAgICBidXQgS0VZX0JMT0NLX1NJWkUgaXMuIE9ic2VydmUgdGhlIGluaGVy
aXRlZCBST1dfRk9STUFUIGV2ZW4gd2hlbiBpdCBpcyBub3QKICAgICAgZXhwbGljaXRseSBzcGVj
aWZpZWQuCiAgICAgIAogICAgICBpbm5vZGJfYnVnNTQ2NzkudGVzdDogTmV3IHRlc3QsIHRvIHRl
c3QgdGhlIGJ1ZyBhbmQgdG8gZW5zdXJlIHRoYXQgdGhlcmUgYXJlCiAgICAgIG5vIHJlZ3Jlc3Np
b25zLiAoVGhlIG9ubHkgZGlmZmVyZW5jZSBpbiB0aGUgdGVzdCByZXN1bHQgd2l0aG91dCB0aGUg
cGF0Y2gKICAgICAgYXBwbGllZCBpcyB0aGF0IHRoZSBmaXJzdCBBTFRFUiBUQUJMRSBjaGFuZ2Vz
IFJPV19GT1JNQVQgdG8gQ29tcGFjdC4pCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1NDY3OS5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzU0Njc5LnRlc3QKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MKIDM1MjIg
SmltbXkgWWFuZwkyMDEwLTA2LTIzCiAgICAgIE1vdmUgdGhlIGZpeCBmb3IgYnVnICM1NDA0NCB0
byBzZWN1cml0eSBicmFuY2gsIGFuZCByZXZlcnQgY29tbWl0IC1yMzUyMDozNTIxLgoKICAgIHJl
bW92ZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU0MDQ0LnJl
c3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1NDA0NC50ZXN0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1NDA0NC5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzU0
MDQ0LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFf
aW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFfaW5ub2RiLmNjCj09PSBhZGRlZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTQ2NzkucmVzdWx0Jwot
LS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTQ2NzkucmVz
dWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzU0Njc5LnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDYyNDEwNDgyMC1wNG9qbXhjbXE4cWVvczZkCkBAIC0wLDAgKzEsOTEgQEAK
K1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSdCYXJyYWN1ZGEnOworU0VUIEdMT0JBTCBp
bm5vZGJfZmlsZV9wZXJfdGFibGU9T047CitTRVQgaW5ub2RiX3N0cmljdF9tb2RlPU9OOworQ1JF
QVRFIFRBQkxFIGJ1ZzU0Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPUNPTVBS
RVNTRUQ7CitTRUxFQ1QgVEFCTEVfTkFNRSxST1dfRk9STUFULENSRUFURV9PUFRJT05TIEZST00g
aW5mb3JtYXRpb25fc2NoZW1hLnRhYmxlcworV0hFUkUgVEFCTEVfTkFNRT0nYnVnNTQ2NzknOwor
VEFCTEVfTkFNRQlST1dfRk9STUFUCUNSRUFURV9PUFRJT05TCitidWc1NDY3OQlDb21wcmVzc2Vk
CXJvd19mb3JtYXQ9Q09NUFJFU1NFRAorQUxURVIgVEFCTEUgYnVnNTQ2NzkgQUREIENPTFVNTiBi
IElOVDsKK1NFTEVDVCBUQUJMRV9OQU1FLFJPV19GT1JNQVQsQ1JFQVRFX09QVElPTlMgRlJPTSBp
bmZvcm1hdGlvbl9zY2hlbWEudGFibGVzCitXSEVSRSBUQUJMRV9OQU1FPSdidWc1NDY3OSc7CitU
QUJMRV9OQU1FCVJPV19GT1JNQVQJQ1JFQVRFX09QVElPTlMKK2J1ZzU0Njc5CUNvbXByZXNzZWQJ
cm93X2Zvcm1hdD1DT01QUkVTU0VECitEUk9QIFRBQkxFIGJ1ZzU0Njc5OworQ1JFQVRFIFRBQkxF
IGJ1ZzU0Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQjsKK1NFTEVDVCBUQUJMRV9OQU1FLFJPV19G
T1JNQVQsQ1JFQVRFX09QVElPTlMgRlJPTSBpbmZvcm1hdGlvbl9zY2hlbWEudGFibGVzCitXSEVS
RSBUQUJMRV9OQU1FPSdidWc1NDY3OSc7CitUQUJMRV9OQU1FCVJPV19GT1JNQVQJQ1JFQVRFX09Q
VElPTlMKK2J1ZzU0Njc5CUNvbXBhY3QJCitBTFRFUiBUQUJMRSBidWc1NDY3OSBLRVlfQkxPQ0tf
U0laRT0xOworU0VMRUNUIFRBQkxFX05BTUUsUk9XX0ZPUk1BVCxDUkVBVEVfT1BUSU9OUyBGUk9N
IGluZm9ybWF0aW9uX3NjaGVtYS50YWJsZXMKK1dIRVJFIFRBQkxFX05BTUU9J2J1ZzU0Njc5JzsK
K1RBQkxFX05BTUUJUk9XX0ZPUk1BVAlDUkVBVEVfT1BUSU9OUworYnVnNTQ2NzkJQ29tcHJlc3Nl
ZAlLRVlfQkxPQ0tfU0laRT0xCitBTFRFUiBUQUJMRSBidWc1NDY3OSBST1dfRk9STUFUPVJFRFVO
REFOVDsKK0VSUk9SIEhZMDAwOiBDYW4ndCBjcmVhdGUgdGFibGUgJyNzcWwtdGVtcG9yYXJ5JyAo
ZXJybm86IDE0NzgpCitTSE9XIFdBUk5JTkdTOworTGV2ZWwJQ29kZQlNZXNzYWdlCitXYXJuaW5n
CTE0NzgJSW5ub0RCOiBjYW5ub3Qgc3BlY2lmeSBST1dfRk9STUFUID0gUkVEVU5EQU5UIHdpdGgg
S0VZX0JMT0NLX1NJWkUuCitFcnJvcgkxMDA1CUNhbid0IGNyZWF0ZSB0YWJsZSAnI3NxbC10ZW1w
b3JhcnknIChlcnJubzogMTQ3OCkKK0RST1AgVEFCTEUgYnVnNTQ2Nzk7CitDUkVBVEUgVEFCTEUg
YnVnNTQ2NzkgKGEgSU5UKSBFTkdJTkU9SW5ub0RCIFJPV19GT1JNQVQ9UkVEVU5EQU5UOworU0VM
RUNUIFRBQkxFX05BTUUsUk9XX0ZPUk1BVCxDUkVBVEVfT1BUSU9OUyBGUk9NIGluZm9ybWF0aW9u
X3NjaGVtYS50YWJsZXMKK1dIRVJFIFRBQkxFX05BTUU9J2J1ZzU0Njc5JzsKK1RBQkxFX05BTUUJ
Uk9XX0ZPUk1BVAlDUkVBVEVfT1BUSU9OUworYnVnNTQ2NzkJUmVkdW5kYW50CXJvd19mb3JtYXQ9
UkVEVU5EQU5UCitBTFRFUiBUQUJMRSBidWc1NDY3OSBLRVlfQkxPQ0tfU0laRT0yOworU0VMRUNU
IFRBQkxFX05BTUUsUk9XX0ZPUk1BVCxDUkVBVEVfT1BUSU9OUyBGUk9NIGluZm9ybWF0aW9uX3Nj
aGVtYS50YWJsZXMKK1dIRVJFIFRBQkxFX05BTUU9J2J1ZzU0Njc5JzsKK1RBQkxFX05BTUUJUk9X
X0ZPUk1BVAlDUkVBVEVfT1BUSU9OUworYnVnNTQ2NzkJQ29tcHJlc3NlZAlyb3dfZm9ybWF0PVJF
RFVOREFOVCBLRVlfQkxPQ0tfU0laRT0yCitTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdD1B
bnRlbG9wZTsKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IEtFWV9CTE9DS19TSVpFPTQ7CitFUlJPUiBI
WTAwMDogQ2FuJ3QgY3JlYXRlIHRhYmxlICcjc3FsLXRlbXBvcmFyeScgKGVycm5vOiAxNDc4KQor
U0hPVyBXQVJOSU5HUzsKK0xldmVsCUNvZGUJTWVzc2FnZQorV2FybmluZwkxNDc4CUlubm9EQjog
S0VZX0JMT0NLX1NJWkUgcmVxdWlyZXMgaW5ub2RiX2ZpbGVfZm9ybWF0ID4gQW50ZWxvcGUuCitF
cnJvcgkxMDA1CUNhbid0IGNyZWF0ZSB0YWJsZSAnI3NxbC10ZW1wb3JhcnknIChlcnJubzogMTQ3
OCkKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IFJPV19GT1JNQVQ9RFlOQU1JQzsKK0VSUk9SIEhZMDAw
OiBDYW4ndCBjcmVhdGUgdGFibGUgJyNzcWwtdGVtcG9yYXJ5JyAoZXJybm86IDE0NzgpCitTSE9X
IFdBUk5JTkdTOworTGV2ZWwJQ29kZQlNZXNzYWdlCitXYXJuaW5nCTE0NzgJSW5ub0RCOiBLRVlf
QkxPQ0tfU0laRSByZXF1aXJlcyBpbm5vZGJfZmlsZV9mb3JtYXQgPiBBbnRlbG9wZS4KK1dhcm5p
bmcJMTQ3OAlJbm5vREI6IFJPV19GT1JNQVQ9RFlOQU1JQyByZXF1aXJlcyBpbm5vZGJfZmlsZV9m
b3JtYXQgPiBBbnRlbG9wZS4KK1dhcm5pbmcJMTQ3OAlJbm5vREI6IGNhbm5vdCBzcGVjaWZ5IFJP
V19GT1JNQVQgPSBEWU5BTUlDIHdpdGggS0VZX0JMT0NLX1NJWkUuCitFcnJvcgkxMDA1CUNhbid0
IGNyZWF0ZSB0YWJsZSAnI3NxbC10ZW1wb3JhcnknIChlcnJubzogMTQ3OCkKK0RST1AgVEFCTEUg
YnVnNTQ2Nzk7CitDUkVBVEUgVEFCTEUgYnVnNTQ2NzkgKGEgSU5UKSBFTkdJTkU9SW5ub0RCIFJP
V19GT1JNQVQ9RFlOQU1JQzsKK0VSUk9SIEhZMDAwOiBDYW4ndCBjcmVhdGUgdGFibGUgJ3Rlc3Qu
YnVnNTQ2NzknIChlcnJubzogMTQ3OCkKK1NIT1cgV0FSTklOR1M7CitMZXZlbAlDb2RlCU1lc3Nh
Z2UKK1dhcm5pbmcJMTQ3OAlJbm5vREI6IFJPV19GT1JNQVQ9RFlOQU1JQyByZXF1aXJlcyBpbm5v
ZGJfZmlsZV9mb3JtYXQgPiBBbnRlbG9wZS4KK0Vycm9yCTEwMDUJQ2FuJ3QgY3JlYXRlIHRhYmxl
ICd0ZXN0LmJ1ZzU0Njc5JyAoZXJybm86IDE0NzgpCitDUkVBVEUgVEFCTEUgYnVnNTQ2NzkgKGEg
SU5UKSBFTkdJTkU9SW5ub0RCOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9QmFycmFj
dWRhOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9T0ZGOworQUxURVIgVEFCTEUg
YnVnNTQ2NzkgS0VZX0JMT0NLX1NJWkU9NDsKK0VSUk9SIEhZMDAwOiBDYW4ndCBjcmVhdGUgdGFi
bGUgJyNzcWwtdGVtcG9yYXJ5JyAoZXJybm86IDE0NzgpCitTSE9XIFdBUk5JTkdTOworTGV2ZWwJ
Q29kZQlNZXNzYWdlCitXYXJuaW5nCTE0NzgJSW5ub0RCOiBLRVlfQkxPQ0tfU0laRSByZXF1aXJl
cyBpbm5vZGJfZmlsZV9wZXJfdGFibGUuCitFcnJvcgkxMDA1CUNhbid0IGNyZWF0ZSB0YWJsZSAn
I3NxbC10ZW1wb3JhcnknIChlcnJubzogMTQ3OCkKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IFJPV19G
T1JNQVQ9RFlOQU1JQzsKK0VSUk9SIEhZMDAwOiBDYW4ndCBjcmVhdGUgdGFibGUgJyNzcWwtdGVt
cG9yYXJ5JyAoZXJybm86IDE0NzgpCitTSE9XIFdBUk5JTkdTOworTGV2ZWwJQ29kZQlNZXNzYWdl
CitXYXJuaW5nCTE0NzgJSW5ub0RCOiBST1dfRk9STUFUPURZTkFNSUMgcmVxdWlyZXMgaW5ub2Ri
X2ZpbGVfcGVyX3RhYmxlLgorRXJyb3IJMTAwNQlDYW4ndCBjcmVhdGUgdGFibGUgJyNzcWwtdGVt
cG9yYXJ5JyAoZXJybm86IDE0NzgpCitEUk9QIFRBQkxFIGJ1ZzU0Njc5OworQ1JFQVRFIFRBQkxF
IGJ1ZzU0Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPURZTkFNSUM7CitFUlJP
UiBIWTAwMDogQ2FuJ3QgY3JlYXRlIHRhYmxlICd0ZXN0LmJ1ZzU0Njc5JyAoZXJybm86IDE0Nzgp
CitTSE9XIFdBUk5JTkdTOworTGV2ZWwJQ29kZQlNZXNzYWdlCitXYXJuaW5nCTE0NzgJSW5ub0RC
OiBST1dfRk9STUFUPURZTkFNSUMgcmVxdWlyZXMgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlLgorRXJy
b3IJMTAwNQlDYW4ndCBjcmVhdGUgdGFibGUgJ3Rlc3QuYnVnNTQ2NzknIChlcnJubzogMTQ3OCkK
K1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlPU9OOworQ1JFQVRFIFRBQkxFIGJ1ZzU0
Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPURZTkFNSUM7CitEUk9QIFRBQkxF
IGJ1ZzU0Njc5OworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9QW50ZWxvcGU7CitTRVQg
R0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdF9jaGVjaz1BbnRlbG9wZTsKK1NFVCBHTE9CQUwgaW5u
b2RiX2ZpbGVfcGVyX3RhYmxlPTA7Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzU0Njc5LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1NDY3OS50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6
MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1
ZzU0Njc5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjQxMDQ4MjAt
cDRvam14Y21xOHFlb3M2ZApAQCAtMCwwICsxLDk3IEBACisjIFRlc3QgQnVnICM1NDY3OSBhbHRl
ciB0YWJsZSBjYXVzZXMgY29tcHJlc3NlZCByb3dfZm9ybWF0IHRvIHJldmVydCB0byBjb21wYWN0
CisKKy0tc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGJfcGx1Z2luLmluYworCitsZXQgJGZpbGVf
Zm9ybWF0PWBzZWxlY3QgQEBpbm5vZGJfZmlsZV9mb3JtYXRgOworbGV0ICRmaWxlX2Zvcm1hdF9j
aGVjaz1gc2VsZWN0IEBAaW5ub2RiX2ZpbGVfZm9ybWF0X2NoZWNrYDsKK2xldCAkZmlsZV9wZXJf
dGFibGU9YHNlbGVjdCBAQGlubm9kYl9maWxlX3Blcl90YWJsZWA7CitTRVQgR0xPQkFMIGlubm9k
Yl9maWxlX2Zvcm1hdD0nQmFycmFjdWRhJzsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3Rh
YmxlPU9OOworU0VUIGlubm9kYl9zdHJpY3RfbW9kZT1PTjsKKworQ1JFQVRFIFRBQkxFIGJ1ZzU0
Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPUNPTVBSRVNTRUQ7CitTRUxFQ1Qg
VEFCTEVfTkFNRSxST1dfRk9STUFULENSRUFURV9PUFRJT05TIEZST00gaW5mb3JtYXRpb25fc2No
ZW1hLnRhYmxlcworV0hFUkUgVEFCTEVfTkFNRT0nYnVnNTQ2NzknOworCisjIFRoZSBST1dfRk9S
TUFUIG9mIHRoZSB0YWJsZSBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gaXQgaXMgbm90IHNwZWNp
ZmllZAorIyBpbiBBTFRFUiBUQUJMRS4KK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IEFERCBDT0xVTU4g
YiBJTlQ7CitTRUxFQ1QgVEFCTEVfTkFNRSxST1dfRk9STUFULENSRUFURV9PUFRJT05TIEZST00g
aW5mb3JtYXRpb25fc2NoZW1hLnRhYmxlcworV0hFUkUgVEFCTEVfTkFNRT0nYnVnNTQ2NzknOwor
CitEUk9QIFRBQkxFIGJ1ZzU0Njc5OworCisjIENoZWNrIHRoYXQgdGhlIFJPV19GT1JNQVQgY29u
dmVyc2lvbiB0by9mcm9tIENPTVBSRVNTRUQgd29ya3MuCisKK0NSRUFURSBUQUJMRSBidWc1NDY3
OSAoYSBJTlQpIEVOR0lORT1Jbm5vREI7CitTRUxFQ1QgVEFCTEVfTkFNRSxST1dfRk9STUFULENS
RUFURV9PUFRJT05TIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLnRhYmxlcworV0hFUkUgVEFCTEVf
TkFNRT0nYnVnNTQ2NzknOworCisjIEtFWV9CTE9DS19TSVpFIGltcGxpZXMgQ09NUFJFU1NFRC4K
K0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IEtFWV9CTE9DS19TSVpFPTE7CitTRUxFQ1QgVEFCTEVfTkFN
RSxST1dfRk9STUFULENSRUFURV9PUFRJT05TIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLnRhYmxl
cworV0hFUkUgVEFCTEVfTkFNRT0nYnVnNTQ2NzknOworCistLXJlcGxhY2VfcmVnZXggLydbXidd
KnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8KKy0tZXJyb3IgRVJfQ0FO
VF9DUkVBVEVfVEFCTEUKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IFJPV19GT1JNQVQ9UkVEVU5EQU5U
OworLS1yZXBsYWNlX3JlZ2V4IC8nW14nXSp0ZXN0XC4jc3FsLVswLTlhLWZfXSonLycjc3FsLXRl
bXBvcmFyeScvCitTSE9XIFdBUk5JTkdTOworRFJPUCBUQUJMRSBidWc1NDY3OTsKK0NSRUFURSBU
QUJMRSBidWc1NDY3OSAoYSBJTlQpIEVOR0lORT1Jbm5vREIgUk9XX0ZPUk1BVD1SRURVTkRBTlQ7
CitTRUxFQ1QgVEFCTEVfTkFNRSxST1dfRk9STUFULENSRUFURV9PUFRJT05TIEZST00gaW5mb3Jt
YXRpb25fc2NoZW1hLnRhYmxlcworV0hFUkUgVEFCTEVfTkFNRT0nYnVnNTQ2NzknOworCitBTFRF
UiBUQUJMRSBidWc1NDY3OSBLRVlfQkxPQ0tfU0laRT0yOworU0VMRUNUIFRBQkxFX05BTUUsUk9X
X0ZPUk1BVCxDUkVBVEVfT1BUSU9OUyBGUk9NIGluZm9ybWF0aW9uX3NjaGVtYS50YWJsZXMKK1dI
RVJFIFRBQkxFX05BTUU9J2J1ZzU0Njc5JzsKKworIyBUaGlzIHByZXZlbnRzIG90aGVyIHRoYW4g
UkVEVU5EQU5UIG9yIENPTVBBQ1QgUk9XX0ZPUk1BVCBmb3IgbmV3IHRhYmxlcy4KK1NFVCBHTE9C
QUwgaW5ub2RiX2ZpbGVfZm9ybWF0PUFudGVsb3BlOworCistLXJlcGxhY2VfcmVnZXggLydbXidd
KnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8KKy0tZXJyb3IgRVJfQ0FO
VF9DUkVBVEVfVEFCTEUKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IEtFWV9CTE9DS19TSVpFPTQ7Cist
LXJlcGxhY2VfcmVnZXggLydbXiddKnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9y
YXJ5Jy8KK1NIT1cgV0FSTklOR1M7CistLXJlcGxhY2VfcmVnZXggLydbXiddKnRlc3RcLiNzcWwt
WzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8KKy0tZXJyb3IgRVJfQ0FOVF9DUkVBVEVfVEFC
TEUKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IFJPV19GT1JNQVQ9RFlOQU1JQzsKKy0tcmVwbGFjZV9y
ZWdleCAvJ1teJ10qdGVzdFwuI3NxbC1bMC05YS1mX10qJy8nI3NxbC10ZW1wb3JhcnknLworU0hP
VyBXQVJOSU5HUzsKK0RST1AgVEFCTEUgYnVnNTQ2Nzk7CistLXJlcGxhY2VfcmVnZXggLydbXidd
KnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8KKy0tZXJyb3IgRVJfQ0FO
VF9DUkVBVEVfVEFCTEUKK0NSRUFURSBUQUJMRSBidWc1NDY3OSAoYSBJTlQpIEVOR0lORT1Jbm5v
REIgUk9XX0ZPUk1BVD1EWU5BTUlDOworLS1yZXBsYWNlX3JlZ2V4IC8nW14nXSp0ZXN0XC4jc3Fs
LVswLTlhLWZfXSonLycjc3FsLXRlbXBvcmFyeScvCitTSE9XIFdBUk5JTkdTOworQ1JFQVRFIFRB
QkxFIGJ1ZzU0Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQjsKKworU0VUIEdMT0JBTCBpbm5vZGJf
ZmlsZV9mb3JtYXQ9QmFycmFjdWRhOworIyBUaGlzIHdpbGwgcHJldmVudCBST1dfRk9STUFUPUNP
TVBSRVNTRUQsIGJlY2F1c2UgdGhlIHN5c3RlbSB0YWJsZXNwYWNlCisjIGNhbm5vdCBiZSBjb21w
cmVzc2VkLgorU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9T0ZGOworCistLXJlcGxh
Y2VfcmVnZXggLydbXiddKnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8K
Ky0tZXJyb3IgRVJfQ0FOVF9DUkVBVEVfVEFCTEUKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IEtFWV9C
TE9DS19TSVpFPTQ7CistLXJlcGxhY2VfcmVnZXggLydbXiddKnRlc3RcLiNzcWwtWzAtOWEtZl9d
KicvJyNzcWwtdGVtcG9yYXJ5Jy8KK1NIT1cgV0FSTklOR1M7CistLXJlcGxhY2VfcmVnZXggLydb
XiddKnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8KKy0tZXJyb3IgRVJf
Q0FOVF9DUkVBVEVfVEFCTEUKK0FMVEVSIFRBQkxFIGJ1ZzU0Njc5IFJPV19GT1JNQVQ9RFlOQU1J
QzsKKy0tcmVwbGFjZV9yZWdleCAvJ1teJ10qdGVzdFwuI3NxbC1bMC05YS1mX10qJy8nI3NxbC10
ZW1wb3JhcnknLworU0hPVyBXQVJOSU5HUzsKK0RST1AgVEFCTEUgYnVnNTQ2Nzk7CistLXJlcGxh
Y2VfcmVnZXggLydbXiddKnRlc3RcLiNzcWwtWzAtOWEtZl9dKicvJyNzcWwtdGVtcG9yYXJ5Jy8K
Ky0tZXJyb3IgRVJfQ0FOVF9DUkVBVEVfVEFCTEUKK0NSRUFURSBUQUJMRSBidWc1NDY3OSAoYSBJ
TlQpIEVOR0lORT1Jbm5vREIgUk9XX0ZPUk1BVD1EWU5BTUlDOworLS1yZXBsYWNlX3JlZ2V4IC8n
W14nXSp0ZXN0XC4jc3FsLVswLTlhLWZfXSonLycjc3FsLXRlbXBvcmFyeScvCitTSE9XIFdBUk5J
TkdTOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9T047CitDUkVBVEUgVEFCTEUg
YnVnNTQ2NzkgKGEgSU5UKSBFTkdJTkU9SW5ub0RCIFJPV19GT1JNQVQ9RFlOQU1JQzsKK0RST1Ag
VEFCTEUgYnVnNTQ2Nzk7CisKK0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9JGZp
bGVfZm9ybWF0OworRVZBTCBTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdF9jaGVjaz0kZmls
ZV9mb3JtYXRfY2hlY2s7CitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlPSRm
aWxlX3Blcl90YWJsZTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOmpp
bW15LnlhbmdAb3JhY2xlLmNvbS0yMDEwMDYyNDAyMTAxMC1vaDJobnA4ZTF4YmFheDZ1CisrKyBi
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA2MjQxMDQ4MjAtcDRvam14Y21xOHFlb3M2ZApAQCAtMSwzICsxLDkgQEAKKzIw
MTAtMDYtMjQJVGhlIElubm9EQiBUZWFtCisKKwkqIGhhbmRsZXIvaGFfaW5ub2RiLmNjOgorCUZp
eCBCdWcjNTQ2NzkgYWx0ZXIgdGFibGUgY2F1c2VzIGNvbXByZXNzZWQgcm93X2Zvcm1hdCB0byBy
ZXZlcnQKKwl0byBjb21wYWN0CisKIDIwMTAtMDYtMjIJVGhlIElubm9EQiBUZWFtCiAKIAkqIGRp
Y3QvZGljdDBkaWN0LmMsIGRpY3QvZGljdDBtZW0uYywgaW5jbHVkZS9kaWN0MG1lbS5oLAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5j
YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlk
OmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEwMDYyNDAyMTAxMC1vaDJobnA4ZTF4YmFheDZ1Cisr
KyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDEwNDgyMC1wNG9qbXhjbXE4cWVvczZkCkBAIC02
NDYwLDYgKzY0NjAsNyBAQCBoYV9pbm5vYmFzZTo6Y3JlYXRlKAogCWNvbnN0IHVsaW50CWZpbGVf
Zm9ybWF0ID0gc3J2X2ZpbGVfZm9ybWF0OwogCWNvbnN0IGNoYXIqCXN0bXQ7CiAJc2l6ZV90CQlz
dG10X2xlbjsKKwllbnVtIHJvd190eXBlCXJvd190eXBlOwogCiAJREJVR19FTlRFUigiaGFfaW5u
b2Jhc2U6OmNyZWF0ZSIpOwogCkBAIC02NTgwLDk0ICs2NTgxLDk0IEBAIGhhX2lubm9iYXNlOjpj
cmVhdGUoCiAJCX0KIAl9CiAKLQlpZiAoY3JlYXRlX2luZm8tPnVzZWRfZmllbGRzICYgSEFfQ1JF
QVRFX1VTRURfUk9XX0ZPUk1BVCkgewotCQlpZiAoZmxhZ3MpIHsKLQkJCS8qIEtFWV9CTE9DS19T
SVpFIHdhcyBzcGVjaWZpZWQuICovCi0JCQlpZiAoZm9ybS0+cy0+cm93X3R5cGUgIT0gUk9XX1RZ
UEVfQ09NUFJFU1NFRCkgewotCQkJCS8qIFJPV19GT1JNQVQgb3RoZXIgdGhhbiBDT01QUkVTU0VE
Ci0JCQkJaWdub3JlcyBLRVlfQkxPQ0tfU0laRS4gIEl0IGRvZXMgbm90Ci0JCQkJbWFrZSBzZW5z
ZSB0byByZWplY3QgY29uZmxpY3RpbmcKLQkJCQlLRVlfQkxPQ0tfU0laRSBhbmQgUk9XX0ZPUk1B
VCwgYmVjYXVzZQotCQkJCXN1Y2ggY29tYmluYXRpb25zIGNhbiBiZSBvYnRhaW5lZAotCQkJCXdp
dGggQUxURVIgVEFCTEUgYW55d2F5LiAqLwotCQkJCXB1c2hfd2FybmluZ19wcmludGYoCi0JCQkJ
CXRoZCwKLQkJCQkJTVlTUUxfRVJST1I6OldBUk5fTEVWRUxfV0FSTiwKLQkJCQkJRVJfSUxMRUdB
TF9IQV9DUkVBVEVfT1BUSU9OLAotCQkJCQkiSW5ub0RCOiBpZ25vcmluZyBLRVlfQkxPQ0tfU0la
RT0lbHUiCi0JCQkJCSIgdW5sZXNzIFJPV19GT1JNQVQ9Q09NUFJFU1NFRC4iLAotCQkJCQljcmVh
dGVfaW5mby0+a2V5X2Jsb2NrX3NpemUpOwotCQkJCWZsYWdzID0gMDsKLQkJCX0KLQkJfSBlbHNl
IHsKLQkJCS8qIE5vIEtFWV9CTE9DS19TSVpFICovCi0JCQlpZiAoZm9ybS0+cy0+cm93X3R5cGUg
PT0gUk9XX1RZUEVfQ09NUFJFU1NFRCkgewotCQkJCS8qIFJPV19GT1JNQVQ9Q09NUFJFU1NFRCB3
aXRob3V0Ci0JCQkJS0VZX0JMT0NLX1NJWkUgaW1wbGllcyBoYWxmIHRoZQotCQkJCW1heGltdW0g
S0VZX0JMT0NLX1NJWkUuICovCi0JCQkJZmxhZ3MgPSAoRElDVF9URl9aU1NJWkVfTUFYIC0gMSkK
LQkJCQkJPDwgRElDVF9URl9aU1NJWkVfU0hJRlQKLQkJCQkJfCBESUNUX1RGX0NPTVBBQ1QKLQkJ
CQkJfCBESUNUX1RGX0ZPUk1BVF9aSVAKLQkJCQkJPDwgRElDVF9URl9GT1JNQVRfU0hJRlQ7CisJ
cm93X3R5cGUgPSBmb3JtLT5zLT5yb3dfdHlwZTsKKworCWlmIChmbGFncykgeworCQkvKiBLRVlf
QkxPQ0tfU0laRSB3YXMgc3BlY2lmaWVkLiAqLworCQlpZiAoIShjcmVhdGVfaW5mby0+dXNlZF9m
aWVsZHMgJiBIQV9DUkVBVEVfVVNFRF9ST1dfRk9STUFUKSkgeworCQkJLyogUk9XX0ZPUk1BVCB3
YXMgbm90IHNwZWNpZmllZDsKKwkJCWRlZmF1bHQgdG8gUk9XX0ZPUk1BVD1DT01QUkVTU0VEICov
CisJCQlyb3dfdHlwZSA9IFJPV19UWVBFX0NPTVBSRVNTRUQ7CisJCX0gZWxzZSBpZiAocm93X3R5
cGUgIT0gUk9XX1RZUEVfQ09NUFJFU1NFRCkgeworCQkJLyogUk9XX0ZPUk1BVCBvdGhlciB0aGFu
IENPTVBSRVNTRUQKKwkJCWlnbm9yZXMgS0VZX0JMT0NLX1NJWkUuICBJdCBkb2VzIG5vdAorCQkJ
bWFrZSBzZW5zZSB0byByZWplY3QgY29uZmxpY3RpbmcKKwkJCUtFWV9CTE9DS19TSVpFIGFuZCBS
T1dfRk9STUFULCBiZWNhdXNlCisJCQlzdWNoIGNvbWJpbmF0aW9ucyBjYW4gYmUgb2J0YWluZWQK
KwkJCXdpdGggQUxURVIgVEFCTEUgYW55d2F5LiAqLworCQkJcHVzaF93YXJuaW5nX3ByaW50ZigK
KwkJCQl0aGQsCisJCQkJTVlTUUxfRVJST1I6OldBUk5fTEVWRUxfV0FSTiwKKwkJCQlFUl9JTExF
R0FMX0hBX0NSRUFURV9PUFRJT04sCisJCQkJIklubm9EQjogaWdub3JpbmcgS0VZX0JMT0NLX1NJ
WkU9JWx1IgorCQkJCSIgdW5sZXNzIFJPV19GT1JNQVQ9Q09NUFJFU1NFRC4iLAorCQkJCWNyZWF0
ZV9pbmZvLT5rZXlfYmxvY2tfc2l6ZSk7CisJCQlmbGFncyA9IDA7CisJCX0KKwl9IGVsc2Ugewor
CQkvKiBObyBLRVlfQkxPQ0tfU0laRSAqLworCQlpZiAocm93X3R5cGUgPT0gUk9XX1RZUEVfQ09N
UFJFU1NFRCkgeworCQkJLyogUk9XX0ZPUk1BVD1DT01QUkVTU0VEIHdpdGhvdXQKKwkJCUtFWV9C
TE9DS19TSVpFIGltcGxpZXMgaGFsZiB0aGUKKwkJCW1heGltdW0gS0VZX0JMT0NLX1NJWkUuICov
CisJCQlmbGFncyA9IChESUNUX1RGX1pTU0laRV9NQVggLSAxKQorCQkJCTw8IERJQ1RfVEZfWlNT
SVpFX1NISUZUCisJCQkJfCBESUNUX1RGX0NPTVBBQ1QKKwkJCQl8IERJQ1RfVEZfRk9STUFUX1pJ
UAorCQkJCTw8IERJQ1RfVEZfRk9STUFUX1NISUZUOwogI2lmIERJQ1RfVEZfWlNTSVpFX01BWCA8
IDEKICMgZXJyb3IgIkRJQ1RfVEZfWlNTSVpFX01BWCA8IDEiCiAjZW5kaWYKLQkJCX0KIAkJfQor
CX0KIAotCQlzd2l0Y2ggKGZvcm0tPnMtPnJvd190eXBlKSB7Ci0JCQljb25zdCBjaGFyKiByb3df
Zm9ybWF0X25hbWU7Ci0JCWNhc2UgUk9XX1RZUEVfUkVEVU5EQU5UOgotCQkJYnJlYWs7Ci0JCWNh
c2UgUk9XX1RZUEVfQ09NUFJFU1NFRDoKLQkJY2FzZSBST1dfVFlQRV9EWU5BTUlDOgotCQkJcm93
X2Zvcm1hdF9uYW1lCi0JCQkJPSBmb3JtLT5zLT5yb3dfdHlwZSA9PSBST1dfVFlQRV9DT01QUkVT
U0VECi0JCQkJPyAiQ09NUFJFU1NFRCIKLQkJCQk6ICJEWU5BTUlDIjsKLQotCQkJaWYgKCFzcnZf
ZmlsZV9wZXJfdGFibGUpIHsKLQkJCQlwdXNoX3dhcm5pbmdfcHJpbnRmKAotCQkJCQl0aGQsCi0J
CQkJCU1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX1dBUk4sCi0JCQkJCUVSX0lMTEVHQUxfSEFfQ1JF
QVRFX09QVElPTiwKLQkJCQkJIklubm9EQjogUk9XX0ZPUk1BVD0lcyIKLQkJCQkJIiByZXF1aXJl
cyBpbm5vZGJfZmlsZV9wZXJfdGFibGUuIiwKLQkJCQkJcm93X2Zvcm1hdF9uYW1lKTsKLQkJCX0g
ZWxzZSBpZiAoZmlsZV9mb3JtYXQgPCBESUNUX1RGX0ZPUk1BVF9aSVApIHsKLQkJCQlwdXNoX3dh
cm5pbmdfcHJpbnRmKAotCQkJCQl0aGQsCi0JCQkJCU1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX1dB
Uk4sCi0JCQkJCUVSX0lMTEVHQUxfSEFfQ1JFQVRFX09QVElPTiwKLQkJCQkJIklubm9EQjogUk9X
X0ZPUk1BVD0lcyIKLQkJCQkJIiByZXF1aXJlcyBpbm5vZGJfZmlsZV9mb3JtYXQgPiIKLQkJCQkJ
IiBBbnRlbG9wZS4iLAotCQkJCQlyb3dfZm9ybWF0X25hbWUpOwotCQkJfSBlbHNlIHsKLQkJCQlm
bGFncyB8PSBESUNUX1RGX0NPTVBBQ1QKLQkJCQkJfCAoRElDVF9URl9GT1JNQVRfWklQCi0JCQkJ
CSAgIDw8IERJQ1RfVEZfRk9STUFUX1NISUZUKTsKLQkJCQlicmVhazsKLQkJCX0KKwlzd2l0Y2gg
KHJvd190eXBlKSB7CisJCWNvbnN0IGNoYXIqIHJvd19mb3JtYXRfbmFtZTsKKwljYXNlIFJPV19U
WVBFX1JFRFVOREFOVDoKKwkJYnJlYWs7CisJY2FzZSBST1dfVFlQRV9DT01QUkVTU0VEOgorCWNh
c2UgUk9XX1RZUEVfRFlOQU1JQzoKKwkJcm93X2Zvcm1hdF9uYW1lCisJCQk9IHJvd190eXBlID09
IFJPV19UWVBFX0NPTVBSRVNTRUQKKwkJCT8gIkNPTVBSRVNTRUQiCisJCQk6ICJEWU5BTUlDIjsK
IAotCQkJLyogZmFsbCB0aHJvdWdoICovCi0JCWNhc2UgUk9XX1RZUEVfTk9UX1VTRUQ6Ci0JCWNh
c2UgUk9XX1RZUEVfRklYRUQ6Ci0JCWRlZmF1bHQ6Ci0JCQlwdXNoX3dhcm5pbmcodGhkLAotCQkJ
CSAgICAgTVlTUUxfRVJST1I6OldBUk5fTEVWRUxfV0FSTiwKLQkJCQkgICAgIEVSX0lMTEVHQUxf
SEFfQ1JFQVRFX09QVElPTiwKLQkJCQkgICAgICJJbm5vREI6IGFzc3VtaW5nIFJPV19GT1JNQVQ9
Q09NUEFDVC4iKTsKLQkJY2FzZSBST1dfVFlQRV9ERUZBVUxUOgotCQljYXNlIFJPV19UWVBFX0NP
TVBBQ1Q6Ci0JCQlmbGFncyA9IERJQ1RfVEZfQ09NUEFDVDsKKwkJaWYgKCFzcnZfZmlsZV9wZXJf
dGFibGUpIHsKKwkJCXB1c2hfd2FybmluZ19wcmludGYoCisJCQkJdGhkLAorCQkJCU1ZU1FMX0VS
Uk9SOjpXQVJOX0xFVkVMX1dBUk4sCisJCQkJRVJfSUxMRUdBTF9IQV9DUkVBVEVfT1BUSU9OLAor
CQkJCSJJbm5vREI6IFJPV19GT1JNQVQ9JXMiCisJCQkJIiByZXF1aXJlcyBpbm5vZGJfZmlsZV9w
ZXJfdGFibGUuIiwKKwkJCQlyb3dfZm9ybWF0X25hbWUpOworCQl9IGVsc2UgaWYgKGZpbGVfZm9y
bWF0IDwgRElDVF9URl9GT1JNQVRfWklQKSB7CisJCQlwdXNoX3dhcm5pbmdfcHJpbnRmKAorCQkJ
CXRoZCwKKwkJCQlNWVNRTF9FUlJPUjo6V0FSTl9MRVZFTF9XQVJOLAorCQkJCUVSX0lMTEVHQUxf
SEFfQ1JFQVRFX09QVElPTiwKKwkJCQkiSW5ub0RCOiBST1dfRk9STUFUPSVzIgorCQkJCSIgcmVx
dWlyZXMgaW5ub2RiX2ZpbGVfZm9ybWF0ID4iCisJCQkJIiBBbnRlbG9wZS4iLAorCQkJCXJvd19m
b3JtYXRfbmFtZSk7CisJCX0gZWxzZSB7CisJCQlmbGFncyB8PSBESUNUX1RGX0NPTVBBQ1QKKwkJ
CQl8IChESUNUX1RGX0ZPUk1BVF9aSVAKKwkJCQkgICA8PCBESUNUX1RGX0ZPUk1BVF9TSElGVCk7
CiAJCQlicmVhazsKIAkJfQotCX0gZWxzZSBpZiAoIWZsYWdzKSB7Ci0JCS8qIE5vIEtFWV9CTE9D
S19TSVpFIG9yIFJPV19GT1JNQVQgc3BlY2lmaWVkOgotCQl1c2UgUk9XX0ZPUk1BVD1DT01QQUNU
IGJ5IGRlZmF1bHQuICovCisKKwkJLyogZmFsbCB0aHJvdWdoICovCisJY2FzZSBST1dfVFlQRV9O
T1RfVVNFRDoKKwljYXNlIFJPV19UWVBFX0ZJWEVEOgorCWRlZmF1bHQ6CisJCXB1c2hfd2Fybmlu
Zyh0aGQsCisJCQkgICAgIE1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX1dBUk4sCisJCQkgICAgIEVS
X0lMTEVHQUxfSEFfQ1JFQVRFX09QVElPTiwKKwkJCSAgICAgIklubm9EQjogYXNzdW1pbmcgUk9X
X0ZPUk1BVD1DT01QQUNULiIpOworCWNhc2UgUk9XX1RZUEVfREVGQVVMVDoKKwljYXNlIFJPV19U
WVBFX0NPTVBBQ1Q6CiAJCWZsYWdzID0gRElDVF9URl9DT01QQUNUOworCQlicmVhazsKIAl9CiAK
IAkvKiBMb29rIGZvciBhIHByaW1hcnkga2V5ICovCgo=

--===============0019745844==
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: 0db9382d67982aa93abd389a1614b7c3e6cc61e4
# timestamp: 2010-06-24 13:49:53 +0300
# base_revision_id: jimmy.yang@stripped\
#   oh2hnp8e1xbaax6u
# 
# Begin bundle
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
8TObUPQx0Af/hrP3n9BdyRThQkJRK+JA


--===============0019745844==--