From: marko.makela
Date: March 22 2011 11:39am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3350) Bug#11766305
List-Archive: http://lists.mysql.com/commits/133501
X-Bug: 11766305
Message-Id: <201103221139.p2MBdWAU003941@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1114788593=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMyMTA3NTYzOC11NGk4
ejdnOGhlNWc0cWNnCgogMzM1MCBNYXJrbyBNw6RrZWzDpAkyMDExLTAzLTIyCiAgICAgIEJ1ZyMx
MTc2NjMwNSAtIDU5MzkyOiBSZW1vdmUgdGhyMGxvYy5jIGFuZCBpYnVmX2luc2lkZSgpIFtwYXJ0
IDNdCiAgICAgIFJlbW92ZSB0aGUgc2xvdF9ubyBtZW1iZXIgb2Ygc3RydWN0IHRocl9sb2NhbF9z
dHJ1Y3QuCiAgICAgIAogICAgICBlbnVtIHNydl90aHJlYWRfdHlwZTogUmVtb3ZlIHVudXNlZCB0
aHJlYWQgdHlwZXMuCiAgICAgIHNydl9nZXRfdGhyZWFkX3R5cGUoKTogVW51c2VkIGZ1bmN0aW9u
LCByZW1vdmUuCiAgICAgIAogICAgICB0aHJfbG9jYWxfZ2V0X3Nsb3Rfbm8oKSwgdGhyX2xvY2Fs
X3NldF9zbG90X25vKCk6IFJlbW92ZS4KICAgICAgCiAgICAgIHNydl90aHJlYWRfdHlwZV92YWxp
ZGF0ZSgpLCBzcnZfc2xvdF9nZXRfdHlwZSgpOiBOZXcgZnVuY3Rpb25zLCBmb3IgZGVidWdnaW5n
LgogICAgICAKICAgICAgc3J2X3RhYmxlX3Jlc2VydmVfc2xvdCgpOiBSZXR1cm4gdGhlIHNydl9z
bG90X3QqIGRpcmVjdGx5LiBEbyBub3QgY3JlYXRlCiAgICAgIHRocmVhZC1sb2NhbCBzdG9yYWdl
LgogICAgICAKICAgICAgc3J2X3N1c3BlbmRfdGhyZWFkKCk6IEdldCB0aGUgc3J2X3Nsb3RfdCog
YXMgcGFyYW1ldGVyLiBSZXR1cm4gdm9pZDsKICAgICAgdGhlIGNhbGxlciBrbm93cyBzbG90LT5l
dmVudCBhbHJlYWR5LgogICAgICAKICAgICAgc3J2X3RocmVhZF9oYXNfcmVzZXJ2ZWRfc2xvdCgp
LCBzcnZfcmVsZWFzZV90aHJlYWRzKCk6IEFzc2VydAogICAgICBzcnZfdGhyZWFkX3R5cGVfdmFs
aWRhdGUodHlwZSkuCiAgICAgIAogICAgICBzcnZfaW5pdCgpOiBVc2UgbWVtX3phbGxvYygpIGlu
c3RlYWQgb2YgbWVtX2FsbG9jKCkuIFJlcGxhY2UKICAgICAgc3J2X3RhYmxlX2dldF9udGhfc2xv
dCgpLCBiZWNhdXNlIGl0IG5vdyBhc3NlcnRzIHRoYXQgdGhlIGtlcm5lbF9tdXRleAogICAgICBp
cyBiZWluZyBoZWxkLgogICAgICAKICAgICAgc3J2X21hc3Rlcl90aHJlYWQoKSwgc3J2X3B1cmdl
X3RocmVhZCgpOiBSZW1lbWJlciB0aGUgc2xvdCBmcm9tCiAgICAgIHNydl90YWJsZV9yZXNlcnZl
X3Nsb3QoKS4KICAgICAgCiAgICAgIHJiOjYyOSBhcHByb3ZlZCBieSBJbmFhbSBSYW5hCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zcnYwc3J2LmgKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RocjBsb2MuaAogICAgICBzdG9yYWdlL2lubm9iYXNl
L3Nydi9zcnYwc3J2LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90aHIvdGhyMGxvYy5jCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMzIxMDc1NjM4LXU0aTh6N2c4aGU1ZzRxY2cKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3NydjBzcnYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDMyMjExMzkxNi1vcmljdzAycWczdHp2aW04CkBAIC00NDIsMTYgKzQ0Miw4IEBAIHR5cGVkZWYg
ZW51bSBzcnZfc3RhdHNfbWV0aG9kX25hbWVfZW51bQogI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAog
LyoqIFR5cGVzIG9mIHRocmVhZHMgZXhpc3RpbmcgaW4gdGhlIHN5c3RlbS4gKi8KIGVudW0gc3J2
X3RocmVhZF90eXBlIHsKLQlTUlZfQ09NID0gMSwJLyoqPCB0aHJlYWRzIHNlcnZpbmcgY29tbXVu
aWNhdGlvbiBhbmQgcXVlcmllcyAqLwotCVNSVl9DT05TT0xFLAkvKio8IHRocmVhZCBzZXJ2aW5n
IGNvbnNvbGUgKi8KLQlTUlZfV09SS0VSLAkvKio8IHRocmVhZHMgc2VydmluZyBwYXJhbGxlbGl6
ZWQgcXVlcmllcyBhbmQKKwlTUlZfV09SS0VSID0gMCwJLyoqPCB0aHJlYWRzIHNlcnZpbmcgcGFy
YWxsZWxpemVkIHF1ZXJpZXMgYW5kCiAJCQlxdWVyaWVzIHJlbGVhc2VkIGZyb20gbG9jayB3YWl0
ICovCi0jaWYgMAotCS8qIFV0aWxpdHkgdGhyZWFkcyAqLwotCVNSVl9CVUZGRVIsCS8qKjwgdGhy
ZWFkIGZsdXNoaW5nIGRpcnR5IGJ1ZmZlciBibG9ja3MgKi8KLQlTUlZfUkVDT1ZFUlksCS8qKjwg
dGhyZWFkcyBmaW5pc2hpbmcgYSByZWNvdmVyeSAqLwotCVNSVl9JTlNFUlQsCS8qKjwgdGhyZWFk
IGZsdXNoaW5nIHRoZSBpbnNlcnQgYnVmZmVyIHRvIGRpc2sgKi8KLSNlbmRpZgogCVNSVl9NQVNU
RVIJLyoqPCB0aGUgbWFzdGVyIHRocmVhZCwgKHdob3NlIHR5cGUgbnVtYmVyIG11c3QKIAkJCWJl
IGJpZ2dlc3QpICovCiB9OwpAQCAtNDkwLDEzICs0ODIsNiBAQCB1bGludAogc3J2X2dldF9uX3Ro
cmVhZHModm9pZCk7CiAvKj09PT09PT09PT09PT09PT09PT0qLwogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
LVJldHVybnMgdGhlIGNhbGxpbmcgdGhyZWFkIHR5cGUuCi1AcmV0dXJuCVNSVl9DT00sIC4uLiAq
LwotCi1lbnVtIHNydl90aHJlYWRfdHlwZQotc3J2X2dldF90aHJlYWRfdHlwZSh2b2lkKTsKLS8q
PT09PT09PT09PT09PT09PT09PT09Ki8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBDaGVjayB3aGV0aGVy
IHRocmVhZCB0eXBlIGhhcyByZXNlcnZlZCBhIHNsb3QuCiBAcmV0dXJuCXNsb3QgbnVtYmVyIG9y
IFVOREVGSU5FRCBpZiBub3QgZm91bmQqLwogVU5JVl9JTlRFUk4KCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdGhyMGxvYy5oJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvdGhyMGxvYy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MzIxMDc1NjM4LXU0aTh6N2c4aGU1ZzRxY2cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3RocjBsb2MuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMyMjExMzkxNi1v
cmljdzAycWczdHp2aW04CkBAIC01OSwyMiArNTksNiBAQCB0aHJfbG9jYWxfZnJlZSgKIC8qPT09
PT09PT09PT0qLwogCW9zX3RocmVhZF9pZF90CWlkKTsJLyohPCBpbjogdGhyZWFkIGlkICovCiAv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKLUdldHMgdGhlIHNsb3QgbnVtYmVyIGluIHRoZSB0aHJlYWQgdGFibGUg
b2YgYSB0aHJlYWQuCi1AcmV0dXJuCXNsb3QgbnVtYmVyICovCi1VTklWX0lOVEVSTgotdWxpbnQK
LXRocl9sb2NhbF9nZXRfc2xvdF9ubygKLS8qPT09PT09PT09PT09PT09PT09Ki8KLQlvc190aHJl
YWRfaWRfdAlpZCk7CS8qITwgaW46IHRocmVhZCBpZCBvZiB0aGUgdGhyZWFkICovCi0vKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKLVNldHMgaW4gdGhlIGxvY2FsIHN0b3JhZ2UgdGhlIHNsb3QgbnVtYmVyIGluIHRo
ZSB0aHJlYWQgdGFibGUgb2YgYSB0aHJlYWQuICovCi1VTklWX0lOVEVSTgotdm9pZAotdGhyX2xv
Y2FsX3NldF9zbG90X25vKAotLyo9PT09PT09PT09PT09PT09PT0qLwotCW9zX3RocmVhZF9pZF90
CWlkLAkvKiE8IGluOiB0aHJlYWQgaWQgb2YgdGhlIHRocmVhZCAqLwotCXVsaW50CQlzbG90X25v
KTsvKiE8IGluOiBzbG90IG51bWJlciAqLwotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIHBvaW50
ZXIgdG8gdGhlICdpbl9pYnVmJyBmaWVsZCB3aXRoaW4gdGhlIGN1cnJlbnQgdGhyZWFkIGxvY2Fs
CiBzdG9yYWdlLgogQHJldHVybglwb2ludGVyIHRvIHRoZSBpbl9pYnVmIGZpZWxkICovCgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAzMjEwNzU2MzgtdTRpOHo3ZzhoZTVnNHFjZworKysgYi9zdG9yYWdlL2lubm9iYXNlL3Ny
di9zcnYwc3J2LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAzMjIxMTM5MTYt
b3JpY3cwMnFnM3R6dmltOApAQCAtNjkwLDcgKzY5MCw3IEBAIFVuaXguKi8KIHN0cnVjdCBzcnZf
c2xvdF9zdHJ1Y3R7CiAJb3NfdGhyZWFkX2lkX3QJaWQ7CQkvKiE8IHRocmVhZCBpZCAqLwogCW9z
X3RocmVhZF90CWhhbmRsZTsJCS8qITwgdGhyZWFkIGhhbmRsZSAqLwotCXVuc2lnbmVkCXR5cGU6
MzsJCS8qITwgdGhyZWFkIHR5cGU6IHVzZXIsIHV0aWxpdHkgZXRjLiAqLworCXVuc2lnbmVkCXR5
cGU6MTsJCS8qITwgdGhyZWFkIHR5cGU6IHVzZXIsIHV0aWxpdHkgZXRjLiAqLwogCXVuc2lnbmVk
CWluX3VzZToxOwkvKiE8IFRSVUUgaWYgdGhpcyBzbG90IGlzIGluIHVzZSAqLwogCXVuc2lnbmVk
CXN1c3BlbmRlZDoxOwkvKiE8IFRSVUUgaWYgdGhlIHRocmVhZCBpcyB3YWl0aW5nCiAJCQkJCWZv
ciB0aGUgZXZlbnQgb2YgdGhpcyBzbG90ICovCkBAIC03OTcsNiArNzk3LDcgQEAgc3J2X3RhYmxl
X2dldF9udGhfc2xvdCgKIC8qPT09PT09PT09PT09PT09PT09PSovCiAJdWxpbnQJaW5kZXgpCQkv
KiE8IGluOiBpbmRleCBvZiB0aGUgc2xvdCAqLwogeworCXV0X2FkKG11dGV4X293bigma2VybmVs
X211dGV4KSk7CiAJdXRfYShpbmRleCA8IE9TX1RIUkVBRF9NQVhfTik7CiAKIAlyZXR1cm4oc3J2
X3N5cy0+dGhyZWFkcyArIGluZGV4KTsKQEAgLTgxNSw3ICs4MTYsNyBAQCBzcnZfZ2V0X25fdGhy
ZWFkcyh2b2lkKQogCiAJbXV0ZXhfZW50ZXIoJmtlcm5lbF9tdXRleCk7CiAKLQlmb3IgKGkgPSBT
UlZfQ09NOyBpIDwgU1JWX01BU1RFUiArIDE7IGkrKykgeworCWZvciAoaSA9IDA7IGkgPCBTUlZf
TUFTVEVSICsgMTsgaSsrKSB7CiAKIAkJbl90aHJlYWRzICs9IHNydl9uX3RocmVhZHNbaV07CiAJ
fQpAQCAtODI1LDEzICs4MjYsNDYgQEAgc3J2X2dldF9uX3RocmVhZHModm9pZCkKIAlyZXR1cm4o
bl90aHJlYWRzKTsKIH0KIAorI2lmZGVmIFVOSVZfREVCVUcKIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1S
ZXNlcnZlcyBhIHNsb3QgaW4gdGhlIHRocmVhZCB0YWJsZSBmb3IgdGhlIGN1cnJlbnQgdGhyZWFk
LiBBbHNvIGNyZWF0ZXMgdGhlCi10aHJlYWQgbG9jYWwgc3RvcmFnZSBzdHJ1Y3QgZm9yIHRoZSBj
dXJyZW50IHRocmVhZC4gTk9URSEgVGhlIHNlcnZlciBtdXRleAotaGFzIHRvIGJlIHJlc2VydmVk
IGJ5IHRoZSBjYWxsZXIhCi1AcmV0dXJuCXJlc2VydmVkIHNsb3QgaW5kZXggKi8KK1ZhbGlkYXRl
cyB0aGUgdHlwZSBvZiBhIHRocmVhZCB0YWJsZSBzbG90LgorQHJldHVybiBUUlVFIGlmIG9rICov
CiBzdGF0aWMKLXVsaW50CitpYm9vbAorc3J2X3RocmVhZF90eXBlX3ZhbGlkYXRlKAorLyo9PT09
PT09PT09PT09PT09PT09PT0qLworCWVudW0gc3J2X3RocmVhZF90eXBlCXR5cGUpCS8qITwgaW46
IHRocmVhZCB0eXBlICovCit7CisJc3dpdGNoICh0eXBlKSB7CisJY2FzZSBTUlZfV09SS0VSOgor
CWNhc2UgU1JWX01BU1RFUjoKKwkJcmV0dXJuKFRSVUUpOworCX0KKwl1dF9lcnJvcjsKKwlyZXR1
cm4oRkFMU0UpOworfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KKworLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8v
KioKK0dldHMgdGhlIHR5cGUgb2YgYSB0aHJlYWQgdGFibGUgc2xvdC4KK0ByZXR1cm4gdGhyZWFk
IHR5cGUgKi8KK3N0YXRpYworZW51bSBzcnZfdGhyZWFkX3R5cGUKK3Nydl9zbG90X2dldF90eXBl
KAorLyo9PT09PT09PT09PT09PSovCisJY29uc3Qgc3J2X3Nsb3RfdCoJc2xvdCkJLyohPCBpbjog
dGhyZWFkIHNsb3QgKi8KK3sKKwllbnVtIHNydl90aHJlYWRfdHlwZQl0eXBlCT0gKGVudW0gc3J2
X3RocmVhZF90eXBlKSBzbG90LT50eXBlOworCXV0X2FkKHNydl90aHJlYWRfdHlwZV92YWxpZGF0
ZSh0eXBlKSk7CisJcmV0dXJuKHR5cGUpOworfQorCisvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorUmVzZXJ2
ZXMgYSBzbG90IGluIHRoZSB0aHJlYWQgdGFibGUgZm9yIHRoZSBjdXJyZW50IHRocmVhZC4KK05P
VEUhIFRoZSBzZXJ2ZXIgbXV0ZXggaGFzIHRvIGJlIHJlc2VydmVkIGJ5IHRoZSBjYWxsZXIhCitA
cmV0dXJuCXJlc2VydmVkIHNsb3QgKi8KK3N0YXRpYworc3J2X3Nsb3RfdCoKIHNydl90YWJsZV9y
ZXNlcnZlX3Nsb3QoCiAvKj09PT09PT09PT09PT09PT09PT0qLwogCWVudW0gc3J2X3RocmVhZF90
eXBlCXR5cGUpCS8qITwgaW46IHR5cGUgb2YgdGhlIHRocmVhZCAqLwpAQCAtODM5LDggKzg3Myw3
IEBAIHNydl90YWJsZV9yZXNlcnZlX3Nsb3QoCiAJc3J2X3Nsb3RfdCoJc2xvdDsKIAl1bGludAkJ
aTsKIAotCXV0X2EodHlwZSA+IDApOwotCXV0X2EodHlwZSA8PSBTUlZfTUFTVEVSKTsKKwl1dF9h
ZChzcnZfdGhyZWFkX3R5cGVfdmFsaWRhdGUodHlwZSkpOwogCXV0X2FkKG11dGV4X293bigma2Vy
bmVsX211dGV4KSk7CiAKIAlpID0gMDsKQEAgLTg1MSw1MyArODg0LDQwIEBAIHNydl90YWJsZV9y
ZXNlcnZlX3Nsb3QoCiAJCXNsb3QgPSBzcnZfdGFibGVfZ2V0X250aF9zbG90KGkpOwogCX0KIAot
CXV0X2Eoc2xvdC0+aW5fdXNlID09IEZBTFNFKTsKLQogCXNsb3QtPmluX3VzZSA9IFRSVUU7CiAJ
c2xvdC0+c3VzcGVuZGVkID0gRkFMU0U7CiAJc2xvdC0+dHlwZSA9IHR5cGU7CisJdXRfYWQoc3J2
X3Nsb3RfZ2V0X3R5cGUoc2xvdCkgPT0gdHlwZSk7CiAJc2xvdC0+aWQgPSBvc190aHJlYWRfZ2V0
X2N1cnJfaWQoKTsKIAlzbG90LT5oYW5kbGUgPSBvc190aHJlYWRfZ2V0X2N1cnIoKTsKIAotCXRo
cl9sb2NhbF9jcmVhdGUoKTsKLQotCXRocl9sb2NhbF9zZXRfc2xvdF9ubyhvc190aHJlYWRfZ2V0
X2N1cnJfaWQoKSwgaSk7Ci0KLQlyZXR1cm4oaSk7CisJcmV0dXJuKHNsb3QpOwogfQogCiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgogU3VzcGVuZHMgdGhlIGNhbGxpbmcgdGhyZWFkIHRvIHdhaXQgZm9yIHRo
ZSBldmVudCBpbiBpdHMgdGhyZWFkIHNsb3QuCi1OT1RFISBUaGUgc2VydmVyIG11dGV4IGhhcyB0
byBiZSByZXNlcnZlZCBieSB0aGUgY2FsbGVyIQotQHJldHVybglldmVudCBmb3IgdGhlIGNhbGxp
bmcgdGhyZWFkIHRvIHdhaXQgKi8KK05PVEUhIFRoZSBzZXJ2ZXIgbXV0ZXggaGFzIHRvIGJlIHJl
c2VydmVkIGJ5IHRoZSBjYWxsZXIhICovCiBzdGF0aWMKLW9zX2V2ZW50X3QKLXNydl9zdXNwZW5k
X3RocmVhZCh2b2lkKQotLyo9PT09PT09PT09PT09PT09PT09PSovCit2b2lkCitzcnZfc3VzcGVu
ZF90aHJlYWQoCisvKj09PT09PT09PT09PT09PSovCisJc3J2X3Nsb3RfdCoJc2xvdCkJLyohPCBp
bi9vdXQ6IHRocmVhZCBzbG90ICovCiB7Ci0Jc3J2X3Nsb3RfdCoJCXNsb3Q7Ci0Jb3NfZXZlbnRf
dAkJZXZlbnQ7Ci0JdWxpbnQJCQlzbG90X25vOwogCWVudW0gc3J2X3RocmVhZF90eXBlCXR5cGU7
CiAKIAl1dF9hZChtdXRleF9vd24oJmtlcm5lbF9tdXRleCkpOwotCi0Jc2xvdF9ubyA9IHRocl9s
b2NhbF9nZXRfc2xvdF9ubyhvc190aHJlYWRfZ2V0X2N1cnJfaWQoKSk7CisJdXRfYWQoc2xvdC0+
aW5fdXNlKTsKKwl1dF9hZCghc2xvdC0+c3VzcGVuZGVkKTsKKwl1dF9hZChzbG90LT5pZCA9PSBv
c190aHJlYWRfZ2V0X2N1cnJfaWQoKSk7CiAKIAlpZiAoc3J2X3ByaW50X3RocmVhZF9yZWxlYXNl
cykgewogCQlmcHJpbnRmKHN0ZGVyciwKIAkJCSJTdXNwZW5kaW5nIHRocmVhZCAlbHUgdG8gc2xv
dCAlbHVcbiIsCi0JCQkodWxvbmcpIG9zX3RocmVhZF9nZXRfY3Vycl9pZCgpLCAodWxvbmcpIHNs
b3Rfbm8pOworCQkJKHVsb25nKSBvc190aHJlYWRfZ2V0X2N1cnJfaWQoKSwKKwkJCSh1bG9uZykg
KHNsb3QgLSBzcnZfc3lzLT50aHJlYWRzKSk7CiAJfQogCi0Jc2xvdCA9IHNydl90YWJsZV9nZXRf
bnRoX3Nsb3Qoc2xvdF9ubyk7Ci0KLQl0eXBlID0gc2xvdC0+dHlwZTsKLQotCXV0X2FkKHR5cGUg
Pj0gU1JWX1dPUktFUik7Ci0JdXRfYWQodHlwZSA8PSBTUlZfTUFTVEVSKTsKLQotCWV2ZW50ID0g
c2xvdC0+ZXZlbnQ7CisJdHlwZSA9IHNydl9zbG90X2dldF90eXBlKHNsb3QpOwogCiAJc2xvdC0+
c3VzcGVuZGVkID0gVFJVRTsKIApAQCAtOTA1LDkgKzkyNSw3IEBAIHNydl9zdXNwZW5kX3RocmVh
ZCh2b2lkKQogCiAJc3J2X25fdGhyZWFkc19hY3RpdmVbdHlwZV0tLTsKIAotCW9zX2V2ZW50X3Jl
c2V0KGV2ZW50KTsKLQotCXJldHVybihldmVudCk7CisJb3NfZXZlbnRfcmVzZXQoc2xvdC0+ZXZl
bnQpOwogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtOTI2LDggKzk0NCw3IEBAIHNydl9yZWxl
YXNlX3RocmVhZHMoCiAJdWxpbnQJCWk7CiAJdWxpbnQJCWNvdW50CT0gMDsKIAotCXV0X2FkKHR5
cGUgPj0gU1JWX1dPUktFUik7Ci0JdXRfYWQodHlwZSA8PSBTUlZfTUFTVEVSKTsKKwl1dF9hZChz
cnZfdGhyZWFkX3R5cGVfdmFsaWRhdGUodHlwZSkpOwogCXV0X2FkKG4gPiAwKTsKIAl1dF9hZCht
dXRleF9vd24oJmtlcm5lbF9tdXRleCkpOwogCkBAIC05MzUsNyArOTUyLDggQEAgc3J2X3JlbGVh
c2VfdGhyZWFkcygKIAogCQlzbG90ID0gc3J2X3RhYmxlX2dldF9udGhfc2xvdChpKTsKIAotCQlp
ZiAoc2xvdC0+aW5fdXNlICYmIHNsb3QtPnR5cGUgPT0gdHlwZSAmJiBzbG90LT5zdXNwZW5kZWQp
IHsKKwkJaWYgKHNsb3QtPmluX3VzZSAmJiBzbG90LT5zdXNwZW5kZWQKKwkJICAgICYmIHNydl9z
bG90X2dldF90eXBlKHNsb3QpID09IHR5cGUpIHsKIAogCQkJc2xvdC0+c3VzcGVuZGVkID0gRkFM
U0U7CiAKQEAgLTk2MywzNCArOTgxLDYgQEAgc3J2X3JlbGVhc2VfdGhyZWFkcygKIH0KIAogLyoq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKLVJldHVybnMgdGhlIGNhbGxpbmcgdGhyZWFkIHR5cGUuCi1AcmV0dXJu
CVNSVl9DT00sIC4uLiAqLwotVU5JVl9JTlRFUk4KLWVudW0gc3J2X3RocmVhZF90eXBlCi1zcnZf
Z2V0X3RocmVhZF90eXBlKHZvaWQpCi0vKj09PT09PT09PT09PT09PT09PT09PSovCi17Ci0JdWxp
bnQJCQlzbG90X25vOwotCXNydl9zbG90X3QqCQlzbG90OwotCWVudW0gc3J2X3RocmVhZF90eXBl
CXR5cGU7Ci0KLQltdXRleF9lbnRlcigma2VybmVsX211dGV4KTsKLQotCXNsb3Rfbm8gPSB0aHJf
bG9jYWxfZ2V0X3Nsb3Rfbm8ob3NfdGhyZWFkX2dldF9jdXJyX2lkKCkpOwotCi0Jc2xvdCA9IHNy
dl90YWJsZV9nZXRfbnRoX3Nsb3Qoc2xvdF9ubyk7Ci0KLQl0eXBlID0gc2xvdC0+dHlwZTsKLQot
CXV0X2FkKHR5cGUgPj0gU1JWX1dPUktFUik7Ci0JdXRfYWQodHlwZSA8PSBTUlZfTUFTVEVSKTsK
LQotCW11dGV4X2V4aXQoJmtlcm5lbF9tdXRleCk7Ci0KLQlyZXR1cm4odHlwZSk7Ci19Ci0KLS8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCiBDaGVjayB3aGV0aGVyIHRocmVhZCB0eXBlIGhhcyByZXNlcnZlZCBh
IHNsb3QuIFJldHVybiB0aGUgZmlyc3Qgc2xvdCB0aGF0CiBpcyBmb3VuZC4gVGhpcyB3b3JrcyBi
ZWNhdXNlIHdlIGN1cnJlbnRseSBoYXZlIG9ubHkgMSB0aHJlYWQgb2YgZWFjaCB0eXBlLgogQHJl
dHVybglzbG90IG51bWJlciBvciBVTElOVF9VTkRFRklORUQgaWYgbm90IGZvdW5kKi8KQEAgLTEw
MDMsNiArOTkzLDcgQEAgc3J2X3RocmVhZF9oYXNfcmVzZXJ2ZWRfc2xvdCgKIAl1bGludAkJCWk7
CiAJdWxpbnQJCQlzbG90X25vID0gVUxJTlRfVU5ERUZJTkVEOwogCisJdXRfYWQoc3J2X3RocmVh
ZF90eXBlX3ZhbGlkYXRlKHR5cGUpKTsKIAltdXRleF9lbnRlcigma2VybmVsX211dGV4KTsKIAog
CWZvciAoaSA9IDA7IGkgPCBPU19USFJFQURfTUFYX047IGkrKykgewpAQCAtMTA0MCwyMiArMTAz
MSwxOCBAQCBzcnZfaW5pdCh2b2lkKQogCW11dGV4X2NyZWF0ZShzcnZfaW5ub2RiX21vbml0b3Jf
bXV0ZXhfa2V5LAogCQkgICAgICZzcnZfaW5ub2RiX21vbml0b3JfbXV0ZXgsIFNZTkNfTk9fT1JE
RVJfQ0hFQ0spOwogCi0Jc3J2X3N5cy0+dGhyZWFkcyA9IG1lbV9hbGxvYyhPU19USFJFQURfTUFY
X04gKiBzaXplb2Yoc3J2X3Nsb3RfdCkpOworCXNydl9zeXMtPnRocmVhZHMgPSBtZW1femFsbG9j
KE9TX1RIUkVBRF9NQVhfTiAqIHNpemVvZihzcnZfc2xvdF90KSk7CiAKIAlmb3IgKGkgPSAwOyBp
IDwgT1NfVEhSRUFEX01BWF9OOyBpKyspIHsKLQkJc2xvdCA9IHNydl90YWJsZV9nZXRfbnRoX3Ns
b3QoaSk7Ci0JCXNsb3QtPmluX3VzZSA9IEZBTFNFOwotCQlzbG90LT50eXBlPTA7CS8qIEF2b2lk
IHB1cmlmeSBlcnJvcnMgKi8KKwkJc2xvdCA9IHNydl9zeXMtPnRocmVhZHMgKyBpOwogCQlzbG90
LT5ldmVudCA9IG9zX2V2ZW50X2NyZWF0ZShOVUxMKTsKIAkJdXRfYShzbG90LT5ldmVudCk7CiAJ
fQogCi0Jc3J2X215c3FsX3RhYmxlID0gbWVtX2FsbG9jKE9TX1RIUkVBRF9NQVhfTiAqIHNpemVv
ZihzcnZfc2xvdF90KSk7CisJc3J2X215c3FsX3RhYmxlID0gbWVtX3phbGxvYyhPU19USFJFQURf
TUFYX04gKiBzaXplb2Yoc3J2X3Nsb3RfdCkpOwogCiAJZm9yIChpID0gMDsgaSA8IE9TX1RIUkVB
RF9NQVhfTjsgaSsrKSB7CiAJCXNsb3QgPSBzcnZfbXlzcWxfdGFibGUgKyBpOwotCQlzbG90LT5p
bl91c2UgPSBGQUxTRTsKLQkJc2xvdC0+dHlwZSA9IDA7CiAJCXNsb3QtPmV2ZW50ID0gb3NfZXZl
bnRfY3JlYXRlKE5VTEwpOwogCQl1dF9hKHNsb3QtPmV2ZW50KTsKIAl9CkBAIC0xNTAxLDcgKzE0
ODgsNyBAQCBzcnZfdGFibGVfcmVzZXJ2ZV9zbG90X2Zvcl9teXNxbCh2b2lkKQogCXdoaWxlIChz
bG90LT5pbl91c2UpIHsKIAkJaSsrOwogCi0JCWlmIChpID49IE9TX1RIUkVBRF9NQVhfTikgewor
CQlpZiAoVU5JVl9VTkxJS0VMWShpID49IE9TX1RIUkVBRF9NQVhfTikpIHsKIAogCQkJdXRfcHJp
bnRfdGltZXN0YW1wKHN0ZGVycik7CiAKQEAgLTI0ODksNyArMjQ3Niw3IEBAIHNydl9pc19hbnlf
YmFja2dyb3VuZF90aHJlYWRfYWN0aXZlKHZvaWQKIAogCW11dGV4X2VudGVyKCZrZXJuZWxfbXV0
ZXgpOwogCi0JZm9yIChpID0gU1JWX0NPTTsgaSA8PSBTUlZfTUFTVEVSOyArK2kpIHsKKwlmb3Ig
KGkgPSAwOyBpIDw9IFNSVl9NQVNURVI7ICsraSkgewogCQlpZiAoc3J2X25fdGhyZWFkc19hY3Rp
dmVbaV0gIT0gMCkgewogCQkJcmV0ID0gVFJVRTsKIAkJCWJyZWFrOwpAQCAtMjY0Myw3ICsyNjMw
LDcgQEAgc3J2X21hc3Rlcl90aHJlYWQoCiAJCQlvc190aHJlYWRfY3JlYXRlICovCiB7CiAJYnVm
X3Bvb2xfc3RhdF90IGJ1Zl9zdGF0OwotCW9zX2V2ZW50X3QJZXZlbnQ7CisJc3J2X3Nsb3RfdCoJ
c2xvdDsKIAl1bGludAkJb2xkX2FjdGl2aXR5X2NvdW50OwogCXVsaW50CQluX3BhZ2VzX3B1cmdl
ZAk9IDA7CiAJdWxpbnQJCW5fYnl0ZXNfbWVyZ2VkOwpAQCAtMjY3MSw3ICsyNjU4LDcgQEAgc3J2
X21hc3Rlcl90aHJlYWQoCiAKIAltdXRleF9lbnRlcigma2VybmVsX211dGV4KTsKIAotCXNydl90
YWJsZV9yZXNlcnZlX3Nsb3QoU1JWX01BU1RFUik7CisJc2xvdCA9IHNydl90YWJsZV9yZXNlcnZl
X3Nsb3QoU1JWX01BU1RFUik7CiAKIAlzcnZfbl90aHJlYWRzX2FjdGl2ZVtTUlZfTUFTVEVSXSsr
OwogCkBAIC0zMDYwLDcgKzMwNDcsNyBAQCBzdXNwZW5kX3RocmVhZDoKIAkJZ290byBsb29wOwog
CX0KIAotCWV2ZW50ID0gc3J2X3N1c3BlbmRfdGhyZWFkKCk7CisJc3J2X3N1c3BlbmRfdGhyZWFk
KHNsb3QpOwogCiAJbXV0ZXhfZXhpdCgma2VybmVsX211dGV4KTsKIApAQCAtMzA3MCw3ICszMDU3
LDcgQEAgc3VzcGVuZF90aHJlYWQ6CiAJbWFudWFsIGFsc28gbWVudGlvbnMgdGhpcyBzdHJpbmcg
aW4gc2V2ZXJhbCBwbGFjZXMuICovCiAJc3J2X21haW5fdGhyZWFkX29wX2luZm8gPSAid2FpdGlu
ZyBmb3Igc2VydmVyIGFjdGl2aXR5IjsKIAotCW9zX2V2ZW50X3dhaXQoZXZlbnQpOworCW9zX2V2
ZW50X3dhaXQoc2xvdC0+ZXZlbnQpOwogCiAJaWYgKHNydl9zaHV0ZG93bl9zdGF0ZSA9PSBTUlZf
U0hVVERPV05fRVhJVF9USFJFQURTKSB7CiAJCS8qIFRoaXMgaXMgb25seSBleHRyYSBzYWZldHks
IHRoZSB0aHJlYWQgc2hvdWxkIGV4aXQKQEAgLTMxMDAsNyArMzA4Nyw2IEBAIHNydl9wdXJnZV90
aHJlYWQoCiB7CiAJc3J2X3Nsb3RfdCoJc2xvdDsKIAl1bGludAkJcmV0cmllcyA9IDA7Ci0JdWxp
bnQJCXNsb3Rfbm8gPSBVTElOVF9VTkRFRklORUQ7CiAJdWxpbnQJCW5fdG90YWxfcHVyZ2VkID0g
VUxJTlRfVU5ERUZJTkVEOwogCiAJdXRfYShzcnZfbl9wdXJnZV90aHJlYWRzID09IDEpOwpAQCAt
MzExNiw5ICszMTAyLDcgQEAgc3J2X3B1cmdlX3RocmVhZCgKIAogCW11dGV4X2VudGVyKCZrZXJu
ZWxfbXV0ZXgpOwogCi0Jc2xvdF9ubyA9IHNydl90YWJsZV9yZXNlcnZlX3Nsb3QoU1JWX1dPUktF
Uik7Ci0KLQlzbG90ID0gc3J2X3RhYmxlX2dldF9udGhfc2xvdChzbG90X25vKTsKKwlzbG90ID0g
c3J2X3RhYmxlX3Jlc2VydmVfc2xvdChTUlZfV09SS0VSKTsKIAogCSsrc3J2X25fdGhyZWFkc19h
Y3RpdmVbU1JWX1dPUktFUl07CiAKQEAgLTMxMzcsMTUgKzMxMjEsMTMgQEAgc3J2X3B1cmdlX3Ro
cmVhZCgKIAkJICAgIHx8IChuX3RvdGFsX3B1cmdlZCA9PSAwCiAJCQkmJiByZXRyaWVzID49IFRS
WF9TWVNfTl9SU0VHUykpIHsKIAotCQkJb3NfZXZlbnRfdAlldmVudDsKLQogCQkJbXV0ZXhfZW50
ZXIoJmtlcm5lbF9tdXRleCk7CiAKLQkJCWV2ZW50ID0gc3J2X3N1c3BlbmRfdGhyZWFkKCk7CisJ
CQlzcnZfc3VzcGVuZF90aHJlYWQoc2xvdCk7CiAKIAkJCW11dGV4X2V4aXQoJmtlcm5lbF9tdXRl
eCk7CiAKLQkJCW9zX2V2ZW50X3dhaXQoZXZlbnQpOworCQkJb3NfZXZlbnRfd2FpdChzbG90LT5l
dmVudCk7CiAKIAkJCXJldHJpZXMgPSAwOwogCQl9CkBAIC0zMTc5LDE2ICszMTYxLDExIEBAIHNy
dl9wdXJnZV90aHJlYWQoCiAKIAltdXRleF9lbnRlcigma2VybmVsX211dGV4KTsKIAotCXV0X2Fk
KHNydl90YWJsZV9nZXRfbnRoX3Nsb3Qoc2xvdF9ubykgPT0gc2xvdCk7Ci0KIAkvKiBEZWNyZW1l
bnQgdGhlIGFjdGl2ZSBjb3VudC4gKi8KLQlzcnZfc3VzcGVuZF90aHJlYWQoKTsKKwlzcnZfc3Vz
cGVuZF90aHJlYWQoc2xvdCk7CiAKIAlzbG90LT5pbl91c2UgPSBGQUxTRTsKIAotCS8qIEZyZWUg
dGhlIHRocmVhZCBsb2NhbCBtZW1vcnkuICovCi0JdGhyX2xvY2FsX2ZyZWUob3NfdGhyZWFkX2dl
dF9jdXJyX2lkKCkpOwotCiAJbXV0ZXhfZXhpdCgma2VybmVsX211dGV4KTsKIAogI2lmZGVmIFVO
SVZfREVCVUdfVEhSRUFEX0NSRUFUSU9OCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS90aHIvdGhyMGxvYy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Roci90aHIwbG9jLmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAzMjEwNzU2MzgtdTRpOHo3ZzhoZTVn
NHFjZworKysgYi9zdG9yYWdlL2lubm9iYXNlL3Roci90aHIwbG9jLmMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTAzMjIxMTM5MTYtb3JpY3cwMnFnM3R6dmltOApAQCAtNjUsOCAr
NjUsNiBAQCBmb3IgdGhlIGZpZWxkLiAqLwogc3RydWN0IHRocl9sb2NhbF9zdHJ1Y3R7CiAJb3Nf
dGhyZWFkX2lkX3QJaWQ7CS8qITwgaWQgb2YgdGhlIHRocmVhZCB3aGljaCBvd25zIHRoaXMgc3Ry
dWN0ICovCiAJb3NfdGhyZWFkX3QJaGFuZGxlOwkvKiE8IG9wZXJhdGluZyBzeXN0ZW0gaGFuZGxl
IHRvIHRoZSB0aHJlYWQgKi8KLQl1bGludAkJc2xvdF9ubzsvKiE8IHRoZSBpbmRleCBvZiB0aGUg
c2xvdCBpbiB0aGUgdGhyZWFkIHRhYmxlCi0JCQkJZm9yIHRoaXMgdGhyZWFkICovCiAJaWJvb2wJ
CWluX2lidWY7LyohPCBUUlVFIGlmIHRoZSB0aHJlYWQgaXMgZG9pbmcgYW4gaWJ1ZgogCQkJCW9w
ZXJhdGlvbiAqLwogCWhhc2hfbm9kZV90CWhhc2g7CS8qITwgaGFzaCBjaGFpbiBub2RlICovCkBA
IC04Nyw4ICs4NSw2IEBAIHRocl9sb2NhbF92YWxpZGF0ZSgKIAljb25zdCB0aHJfbG9jYWxfdCoJ
bG9jYWwpCS8qITwgaW46IGRhdGEgdG8gdmFsaWRhdGUgKi8KIHsKIAl1dF9hZChsb2NhbC0+bWFn
aWNfbiA9PSBUSFJfTE9DQUxfTUFHSUNfTik7Ci0JdXRfYWQobG9jYWwtPnNsb3Rfbm8gPT0gVUxJ
TlRfVU5ERUZJTkVECi0JICAgICAgfHwgbG9jYWwtPnNsb3Rfbm8gPCBPU19USFJFQURfTUFYX04p
OwogCXV0X2FkKGxvY2FsLT5pbl9pYnVmID09IEZBTFNFIHx8IGxvY2FsLT5pbl9pYnVmID09IFRS
VUUpOwogCXJldHVybihUUlVFKTsKIH0KQEAgLTEzMiw0OSArMTI4LDYgQEAgdHJ5X2FnYWluOgog
fQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKLUdldHMgdGhlIHNsb3QgbnVtYmVyIGluIHRoZSB0aHJlYWQg
dGFibGUgb2YgYSB0aHJlYWQuCi1AcmV0dXJuCXNsb3QgbnVtYmVyICovCi1VTklWX0lOVEVSTgot
dWxpbnQKLXRocl9sb2NhbF9nZXRfc2xvdF9ubygKLS8qPT09PT09PT09PT09PT09PT09Ki8KLQlv
c190aHJlYWRfaWRfdAlpZCkJLyohPCBpbjogdGhyZWFkIGlkIG9mIHRoZSB0aHJlYWQgKi8KLXsK
LQl1bGludAkJc2xvdF9ubzsKLQl0aHJfbG9jYWxfdCoJbG9jYWw7Ci0KLQltdXRleF9lbnRlcigm
dGhyX2xvY2FsX211dGV4KTsKLQotCWxvY2FsID0gdGhyX2xvY2FsX2dldChpZCk7Ci0KLQlzbG90
X25vID0gbG9jYWwtPnNsb3Rfbm87Ci0KLQltdXRleF9leGl0KCZ0aHJfbG9jYWxfbXV0ZXgpOwot
Ci0JcmV0dXJuKHNsb3Rfbm8pOwotfQotCi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVNldHMgdGhlIHNsb3Qg
bnVtYmVyIGluIHRoZSB0aHJlYWQgdGFibGUgb2YgYSB0aHJlYWQuICovCi1VTklWX0lOVEVSTgot
dm9pZAotdGhyX2xvY2FsX3NldF9zbG90X25vKAotLyo9PT09PT09PT09PT09PT09PT0qLwotCW9z
X3RocmVhZF9pZF90CWlkLAkvKiE8IGluOiB0aHJlYWQgaWQgb2YgdGhlIHRocmVhZCAqLwotCXVs
aW50CQlzbG90X25vKS8qITwgaW46IHNsb3QgbnVtYmVyICovCi17Ci0JdGhyX2xvY2FsX3QqCWxv
Y2FsOwotCi0JbXV0ZXhfZW50ZXIoJnRocl9sb2NhbF9tdXRleCk7Ci0KLQlsb2NhbCA9IHRocl9s
b2NhbF9nZXQoaWQpOwotCi0JbG9jYWwtPnNsb3Rfbm8gPSBzbG90X25vOwotCi0JbXV0ZXhfZXhp
dCgmdGhyX2xvY2FsX211dGV4KTsKLX0KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIHBvaW50
ZXIgdG8gdGhlICdpbl9pYnVmJyBmaWVsZCB3aXRoaW4gdGhlIGN1cnJlbnQgdGhyZWFkIGxvY2Fs
CiBzdG9yYWdlLgogQHJldHVybglwb2ludGVyIHRvIHRoZSBpbl9pYnVmIGZpZWxkICovCkBAIC0y
MTIsNyArMTY1LDYgQEAgdGhyX2xvY2FsX2NyZWF0ZSh2b2lkKQogCWxvY2FsLT5pZCA9IG9zX3Ro
cmVhZF9nZXRfY3Vycl9pZCgpOwogCWxvY2FsLT5oYW5kbGUgPSBvc190aHJlYWRfZ2V0X2N1cnIo
KTsKIAlsb2NhbC0+bWFnaWNfbiA9IFRIUl9MT0NBTF9NQUdJQ19OOwotCWxvY2FsLT5zbG90X25v
ID0gVUxJTlRfVU5ERUZJTkVEOwogCWxvY2FsLT5pbl9pYnVmID0gRkFMU0U7CiAKIAltdXRleF9l
bnRlcigmdGhyX2xvY2FsX211dGV4KTsKCg==

--===============1114788593==
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: e93268f1264c8441adff753583178553d7a692f2
# timestamp: 2011-03-22 13:39:26 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   u4i8z7g8he5g4qcg
# 
# Begin bundle
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
dyRThQkFgXgGEA==


--===============1114788593==--