From: marko.makela
Date: December 1 2010 9:09am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3248 to 3249) Bug#58226
List-Archive: http://lists.mysql.com/commits/125624
X-Bug: 58226
Message-Id: <201012010910.oB17oL41021558@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1246844203=="

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

IDMyNDkgTWFya28gTcOka2Vsw6QJMjAxMC0xMi0wMQogICAgICBCdWcjNTgyMjYgU29tZSBJbm5v
REIgZGVidWcgY2hlY2tzIGNvbnN1bWUgdG9vIG11Y2ggQ1BVIHRpbWUKICAgICAgCiAgICAgIERv
IG5vdCBkaXNhYmxlIElubm9EQiBpbmxpbmluZyB3aGVuIFVOSVZfREVCVUcgaXMgZGVmaW5lZC4g
VGhlCiAgICAgIGlubGluaW5nIGlzIG5vdyBzb2xlbHkgY29udHJvbGxlZCBieSB0aGUgcHJlcHJv
Y2Vzc29yIHN5bWJvbAogICAgICBVTklWX01VU1RfTk9UX0lOTElORSBhbmQgYnkgYW55IGNvbXBp
bGVyIG9wdGlvbnMuCiAgICAgIAogICAgICBtdHJfbWVtb19jb250YWlucygpOiBBZGQgYW4gZXhw
bGljaXQgdHlwZSBjb252ZXJzaW9uIGZyb20gdm9pZCosIHNvCiAgICAgIHRoYXQgdGhlIGZ1bmN0
aW9uIGNhbiBiZSBjb21waWxlZCBieSBhIEMrKyBjb21waWxlci4gUHJldmlvdXNseSwgdGhpcwog
ICAgICBmdW5jdGlvbiB3YXMgbmV2ZXIgc2VlbiBieSB0aGUgQysrIGNvbXBpbGVyLCBiZWNhdXNl
IGl0IGlzIG9ubHkKICAgICAgcHJlc2VudCBpbiBVTklWX0RFQlVHIGJ1aWxkcyBhbmQgSW5ub0RC
IGlubGluaW5nIHVzZWQgdG8gYmUgZGlzYWJsZWQuCiAgICAgIAogICAgICBidWZfZmx1c2hfdmFs
aWRhdGVfc2tpcCgpOiBBIHdyYXBwZXIgdGhhdCBza2lwcyBtb3N0IGNhbGxzIG9mCiAgICAgIGJ1
Zl9mbHVzaF92YWxpZGF0ZV9sb3coKS4gSW52b2tlZCBieSBkZWJ1ZyBhc3NlcnRpb25zIGluCiAg
ICAgIGJ1Zl9mbHVzaF9pbnNlcnRfaW50b19mbHVzaF9saXN0KCkgYW5kIGJ1Zl9mbHVzaF9yZW1v
dmUoKS4KICAgICAgCiAgICAgIGZpbF92YWxpZGF0ZV9za2lwKCk6IEEgd3JhcHBlciB0aGF0IHNr
aXBzIG1vc3QgY2FsbHMgb2YKICAgICAgZmlsX3ZhbGlkYXRlKCkuIEludm9rZWQgYnkgZGVidWcg
YXNzZXJ0aW9ucyBpbiBmaWxfaW8oKSBhbmQgZmlsX2lvX3dhaXQoKS4KICAgICAgCiAgICAgIG9z
X2Fpb192YWxpZGF0ZV9za2lwKCk6IEEgd3JhcHBlciB0aGF0IHNraXBzIG1vc3QgY2FsbHMgb2YK
ICAgICAgb3NfYWlvX3ZhbGlkYXRlKCkuIEludm9rZWQgYnkgZGVidWcgYXNzZXJ0aW9ucyBpbgog
ICAgICBvc19haW9fZnVuYygpLCBvc19haW9fd2luZG93c19oYW5kbGUoKSBhbmQgb3NfYWlvX3Np
bXVsYXRlZF9oYW5kbGUuCiAgICAgIAogICAgICBvc19nZXRfb3NfdmVyc2lvbigpOiBPbmx5IGlu
Y2x1ZGUgdGhpcyBmdW5jdGlvbiBpZiBfX1dJTl9fIGlzIGRlZmluZWQuCiAgICAgIAogICAgICBz
eW5jX2FycmF5X2RlYWRsb2NrX3N0ZXAoKTogU2xpZ2h0IG9wdGltaXphdGlvbnMuIFRoaXMgZnVu
Y3Rpb24gaXMgYQogICAgICBtYWpvciBDUFUgY29uc3VtZXIgaW4gVU5JVl9TWU5DX0RFQlVHIGJ1
aWxkcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGZsdS5j
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwogICAgICBzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvbXRyMG10ci5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3Mw
ZmlsZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9vcy9vczBmaWxlLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMw
YXJyLmMKIDMyNDggTWFya28gTcOka2Vsw6QJMjAxMC0xMi0wMQogICAgICBGaXggYSBjb21waWxh
dGlvbiBlcnJvciB0aGF0IHdhcyBpbnRyb2R1Y2VkIGluIHRoZSBCdWcgIzU1MjIyIGZpeAogICAg
ICAoYnpyIHJldmlzaW9uIGlkIGtldmluLmxld2lzQG9yYWNsZS5jb20tMjAxMDExMzAxODI1NTIt
aGZ5ZGdnYWVleXMzdGpxeCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
ZGljdC9kaWN0MG1lbS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9i
dWYwZmx1LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MzY1NC1mdzZnNW52dmoxM2NudTA0CisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMTIwMTA4NDMzMy1jNWlsa3Jld3FibGZvcGc3CkBAIC04OCw2ICs4OCwzNCBAQCBp
Ym9vbAogYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdygKIC8qPT09PT09PT09PT09PT09PT09PSovCiAJ
YnVmX3Bvb2xfdCoJYnVmX3Bvb2wpOwkvKiE8IGluOiBCdWZmZXIgcG9vbCBpbnN0YW5jZSAqLwor
CisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLy8qKgorVmFsaWRhdGVzIHRoZSBmbHVzaCBsaXN0IHNvbWUgb2YgdGhlIHRp
bWUuCitAcmV0dXJuCVRSVUUgaWYgb2sgb3IgdGhlIGNoZWNrIHdhcyBza2lwcGVkICovCitzdGF0
aWMKK2lib29sCitidWZfZmx1c2hfdmFsaWRhdGVfc2tpcCgKKy8qPT09PT09PT09PT09PT09PT09
PT0qLworCWJ1Zl9wb29sX3QqCWJ1Zl9wb29sKQkvKiE8IGluOiBCdWZmZXIgcG9vbCBpbnN0YW5j
ZSAqLworeworLyoqIFRyeSBidWZfZmx1c2hfdmFsaWRhdGVfbG93KCkgZXZlcnkgdGhpcyBtYW55
IHRpbWVzICovCisjIGRlZmluZSBCVUZfRkxVU0hfVkFMSURBVEVfU0tJUAkyMworCisJLyoqIFRo
ZSBidWZfZmx1c2hfdmFsaWRhdGVfbG93KCkgY2FsbCBza2lwIGNvdW50ZXIuCisJVXNlIGEgc2ln
bmVkIHR5cGUgYmVjYXVzZSBvZiB0aGUgcmFjZSBjb25kaXRpb24gYmVsb3cuICovCisJc3RhdGlj
IGludCBidWZfZmx1c2hfdmFsaWRhdGVfY291bnQgPSBCVUZfRkxVU0hfVkFMSURBVEVfU0tJUDsK
KworCS8qIFRoZXJlIGlzIGEgcmFjZSBjb25kaXRpb24gYmVsb3csIGJ1dCBpdCBkb2VzIG5vdCBt
YXR0ZXIsCisJYmVjYXVzZSB0aGlzIGNhbGwgaXMgb25seSBmb3IgaGV1cmlzdGljIHB1cnBvc2Vz
LiBXZSB3YW50IHRvCisJcmVkdWNlIHRoZSBjYWxsIGZyZXF1ZW5jeSBvZiB0aGUgY29zdGx5IGJ1
Zl9mbHVzaF92YWxpZGF0ZV9sb3coKQorCWNoZWNrIGluIGRlYnVnIGJ1aWxkcy4gKi8KKwlpZiAo
LS1idWZfZmx1c2hfdmFsaWRhdGVfY291bnQgPiAwKSB7CisJCXJldHVybihUUlVFKTsKKwl9CisK
KwlidWZfZmx1c2hfdmFsaWRhdGVfY291bnQgPSBCVUZfRkxVU0hfVkFMSURBVEVfU0tJUDsKKwly
ZXR1cm4oYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdyhidWZfcG9vbCkpOworfQogI2VuZGlmIC8qIFVO
SVZfREVCVUcgfHwgVU5JVl9CVUZfREVCVUcgKi8KIAogLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKQEAgLTI5Myw3
ICszMjEsNyBAQCBidWZfZmx1c2hfaW5zZXJ0X2ludG9fZmx1c2hfbGlzdCgKIAl9CiAjZW5kaWYg
LyogVU5JVl9ERUJVR19WQUxHUklORCAqLwogI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZp
bmVkIFVOSVZfQlVGX0RFQlVHCi0JdXRfYShidWZfZmx1c2hfdmFsaWRhdGVfbG93KGJ1Zl9wb29s
KSk7CisJdXRfYShidWZfZmx1c2hfdmFsaWRhdGVfc2tpcChidWZfcG9vbCkpOwogI2VuZGlmIC8q
IFVOSVZfREVCVUcgfHwgVU5JVl9CVUZfREVCVUcgKi8KIAogCWJ1Zl9mbHVzaF9saXN0X211dGV4
X2V4aXQoYnVmX3Bvb2wpOwpAQCAtNTE1LDcgKzU0Myw3IEBAIGJ1Zl9mbHVzaF9yZW1vdmUoCiAJ
YnBhZ2UtPm9sZGVzdF9tb2RpZmljYXRpb24gPSAwOwogCiAjaWYgZGVmaW5lZCBVTklWX0RFQlVH
IHx8IGRlZmluZWQgVU5JVl9CVUZfREVCVUcKLQl1dF9hKGJ1Zl9mbHVzaF92YWxpZGF0ZV9sb3co
YnVmX3Bvb2wpKTsKKwl1dF9hKGJ1Zl9mbHVzaF92YWxpZGF0ZV9za2lwKGJ1Zl9wb29sKSk7CiAj
ZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JVRl9ERUJVRyAqLwogCiAJYnVmX2ZsdXNoX2xp
c3RfbXV0ZXhfZXhpdChidWZfcG9vbCk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9maWwvZmlsMGZpbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODM2NTQtZnc2ZzVudnZqMTNj
bnUwNAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODQzMzMtYzVpbGtyZXdxYmxmb3BnNwpAQCAtMjk5LDYg
KzI5OSwzNCBAQCBzdHJ1Y3QgZmlsX3N5c3RlbV9zdHJ1Y3QgewogaW5pdGlhbGl6ZWQuICovCiBz
dGF0aWMgZmlsX3N5c3RlbV90KglmaWxfc3lzdGVtCT0gTlVMTDsKIAorI2lmZGVmIFVOSVZfREVC
VUcKKy8qKiBUcnkgZmlsX3ZhbGlkYXRlKCkgZXZlcnkgdGhpcyBtYW55IHRpbWVzICovCisjIGRl
ZmluZSBGSUxfVkFMSURBVEVfU0tJUAkxNworCisvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorQ2hlY2tzIHRoZSBj
b25zaXN0ZW5jeSBvZiB0aGUgdGFibGVzcGFjZSBjYWNoZSBzb21lIG9mIHRoZSB0aW1lLgorQHJl
dHVybglUUlVFIGlmIG9rIG9yIHRoZSBjaGVjayB3YXMgc2tpcHBlZCAqLworc3RhdGljCitpYm9v
bAorZmlsX3ZhbGlkYXRlX3NraXAodm9pZCkKKy8qPT09PT09PT09PT09PT09PT09PSovCit7CisJ
LyoqIFRoZSBmaWxfdmFsaWRhdGUoKSBjYWxsIHNraXAgY291bnRlci4gVXNlIGEgc2lnbmVkIHR5
cGUKKwliZWNhdXNlIG9mIHRoZSByYWNlIGNvbmRpdGlvbiBiZWxvdy4gKi8KKwlzdGF0aWMgaW50
IGZpbF92YWxpZGF0ZV9jb3VudCA9IEZJTF9WQUxJREFURV9TS0lQOworCisJLyogVGhlcmUgaXMg
YSByYWNlIGNvbmRpdGlvbiBiZWxvdywgYnV0IGl0IGRvZXMgbm90IG1hdHRlciwKKwliZWNhdXNl
IHRoaXMgY2FsbCBpcyBvbmx5IGZvciBoZXVyaXN0aWMgcHVycG9zZXMuIFdlIHdhbnQgdG8KKwly
ZWR1Y2UgdGhlIGNhbGwgZnJlcXVlbmN5IG9mIHRoZSBjb3N0bHkgZmlsX3ZhbGlkYXRlKCkgY2hl
Y2sKKwlpbiBkZWJ1ZyBidWlsZHMuICovCisJaWYgKC0tZmlsX3ZhbGlkYXRlX2NvdW50ID4gMCkg
eworCQlyZXR1cm4oVFJVRSk7CisJfQorCisJZmlsX3ZhbGlkYXRlX2NvdW50ID0gRklMX1ZBTElE
QVRFX1NLSVA7CisJcmV0dXJuKGZpbF92YWxpZGF0ZSgpKTsKK30KKyNlbmRpZiAvKiBVTklWX0RF
QlVHICovCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKi8vKioKIE5PVEU6IHlvdSBtdXN0IGNhbGwgZmlsX211dGV4
X2VudGVyX2FuZF9wcmVwYXJlX2Zvcl9pbygpIGZpcnN0IQpAQCAtNDMwNyw3ICs0MzM1LDcgQEAg
ZmlsX2lvKAogI2lmICgxIDw8IFVOSVZfUEFHRV9TSVpFX1NISUZUKSAhPSBVTklWX1BBR0VfU0la
RQogIyBlcnJvciAiKDEgPDwgVU5JVl9QQUdFX1NJWkVfU0hJRlQpICE9IFVOSVZfUEFHRV9TSVpF
IgogI2VuZGlmCi0JdXRfYWQoZmlsX3ZhbGlkYXRlKCkpOworCXV0X2FkKGZpbF92YWxpZGF0ZV9z
a2lwKCkpOwogI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAogIyBpZm5kZWYgVU5JVl9MT0dfREVCVUcK
IAkvKiBpYnVmIGJpdG1hcCBwYWdlcyBtdXN0IGJlIHJlYWQgaW4gdGhlIHN5bmMgYWlvIG1vZGU6
ICovCkBAIC00NDY2LDcgKzQ0OTQsNyBAQCBmaWxfaW8oCiAKIAkJbXV0ZXhfZXhpdCgmZmlsX3N5
c3RlbS0+bXV0ZXgpOwogCi0JCXV0X2FkKGZpbF92YWxpZGF0ZSgpKTsKKwkJdXRfYWQoZmlsX3Zh
bGlkYXRlX3NraXAoKSk7CiAJfQogCiAJcmV0dXJuKERCX1NVQ0NFU1MpOwpAQCAtNDQ5MCw3ICs0
NTE4LDcgQEAgZmlsX2Fpb193YWl0KAogCXZvaWQqCQltZXNzYWdlOwogCXVsaW50CQl0eXBlOwog
Ci0JdXRfYWQoZmlsX3ZhbGlkYXRlKCkpOworCXV0X2FkKGZpbF92YWxpZGF0ZV9za2lwKCkpOwog
CiAJaWYgKHNydl91c2VfbmF0aXZlX2FpbykgewogCQlzcnZfc2V0X2lvX3RocmVhZF9vcF9pbmZv
KHNlZ21lbnQsICJuYXRpdmUgYWlvIGhhbmRsZSIpOwpAQCAtNDUyMSw3ICs0NTQ5LDcgQEAgZmls
X2Fpb193YWl0KAogCiAJbXV0ZXhfZXhpdCgmZmlsX3N5c3RlbS0+bXV0ZXgpOwogCi0JdXRfYWQo
ZmlsX3ZhbGlkYXRlKCkpOworCXV0X2FkKGZpbF92YWxpZGF0ZV9za2lwKCkpOwogCiAJLyogRG8g
dGhlIGkvbyBoYW5kbGluZyAqLwogCS8qIElNUE9SVEFOVDogc2luY2UgaS9vIGhhbmRsaW5nIGZv
ciByZWFkcyB3aWxsIHJlYWQgYWxzbyB0aGUgaW5zZXJ0Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL210cjBtdHIuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9tdHIwbXRyLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAx
MDgzNjU0LWZ3Nmc1bnZ2ajEzY251MDQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL210
cjBtdHIuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODQzMzMtYzVp
bGtyZXdxYmxmb3BnNwpAQCAtMTYwLDcgKzE2MCw3IEBAIG10cl9tZW1vX2NvbnRhaW5zKAogCXdo
aWxlIChvZmZzZXQgPiAwKSB7CiAJCW9mZnNldCAtPSBzaXplb2YobXRyX21lbW9fc2xvdF90KTsK
IAotCQlzbG90ID0gZHluX2FycmF5X2dldF9lbGVtZW50KG1lbW8sIG9mZnNldCk7CisJCXNsb3Qg
PSAobXRyX21lbW9fc2xvdF90KikgZHluX2FycmF5X2dldF9lbGVtZW50KG1lbW8sIG9mZnNldCk7
CiAKIAkJaWYgKChvYmplY3QgPT0gc2xvdC0+b2JqZWN0KSAmJiAodHlwZSA9PSBzbG90LT50eXBl
KSkgewogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL29zMGZp
bGUuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL29zMGZpbGUuaAlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MzY1NC1mdzZnNW52dmoxM2NudTA0CisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9vczBmaWxlLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDEyMDEwODQzMzMtYzVpbGtyZXdxYmxmb3BnNwpAQCAtMzczLDYgKzM3Myw3
IEBAIHR5cGVkZWYgSEFORExFCW9zX2ZpbGVfZGlyX3Q7CS8qITwgZGlyZWMKIHR5cGVkZWYgRElS
Kglvc19maWxlX2Rpcl90OwkvKiE8IGRpcmVjdG9yeSBzdHJlYW0gKi8KICNlbmRpZgogCisjaWZk
ZWYgX19XSU5fXwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogR2V0cyB0aGUgb3BlcmF0aW5nIHN5c3Rl
bSB2ZXJzaW9uLiBDdXJyZW50bHkgd29ya3Mgb25seSBvbiBXaW5kb3dzLgogQHJldHVybglPU19X
SU45NSwgT1NfV0lOMzEsIE9TX1dJTk5ULCBPU19XSU4yMDAwLCBPU19XSU5YUCwgT1NfV0lOVklT
VEEsCkBAIC0zODEsNiArMzgyLDcgQEAgVU5JVl9JTlRFUk4KIHVsaW50CiBvc19nZXRfb3NfdmVy
c2lvbih2b2lkKTsKIC8qPT09PT09PT09PT09PT09PT09PSovCisjZW5kaWYgLyogX19XSU5fXyAq
LwogI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBDcmVhdGVzIHRoZSBzZWVr
IG11dGV4ZXMgdXNlZCBpbiBwb3NpdGlvbmVkIHJlYWRzIGFuZCB3cml0ZXMuICovCgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMTIwMTA4MzY1NC1mdzZnNW52dmoxM2NudTA0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODQzMzMt
YzVpbGtyZXdxYmxmb3BnNwpAQCAtMjUzLDcgKzI1Myw3IEBAIGVhc3kgd2F5IHRvIGdldCBpdCB0
byB3b3JrLiBTZWUgaHR0cDovL2IKICMgZGVmaW5lIFVOSVZfSU5URVJOCiAjZW5kaWYKIAotI2lm
ICghZGVmaW5lZChVTklWX0RFQlVHKSAmJiAhZGVmaW5lZChVTklWX01VU1RfTk9UX0lOTElORSkp
CisjaWZuZGVmIFVOSVZfTVVTVF9OT1RfSU5MSU5FCiAvKiBEZWZpbml0aW9uIGZvciBpbmxpbmUg
dmVyc2lvbiAqLwogCiAjaWZkZWYgX19XSU5fXwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2Uvb3Mvb3MwZmlsZS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUu
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MzY1NC1mdzZnNW52dmox
M2NudTA0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3MwZmlsZS5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0MzMzLWM1aWxrcmV3cWJsZm9wZzcKQEAgLTMwMiw2
ICszMDIsMzYgQEAgVU5JVl9JTlRFUk4gdWxpbnQJb3Nfbl9wZW5kaW5nX3dyaXRlcyA9CiAvKiog
TnVtYmVyIG9mIHBlbmRpbmcgcmVhZCBvcGVyYXRpb25zICovCiBVTklWX0lOVEVSTiB1bGludAlv
c19uX3BlbmRpbmdfcmVhZHMgPSAwOwogCisjaWZkZWYgVU5JVl9ERUJVRworLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCitWYWxpZGF0ZXMgdGhlIGNvbnNpc3RlbmN5IHRoZSBhaW8gc3lzdGVtIHNvbWUgb2Yg
dGhlIHRpbWUuCitAcmV0dXJuCVRSVUUgaWYgb2sgb3IgdGhlIGNoZWNrIHdhcyBza2lwcGVkICov
CitVTklWX0lOVEVSTgoraWJvb2wKK29zX2Fpb192YWxpZGF0ZV9za2lwKHZvaWQpCisvKj09PT09
PT09PT09PT09PT09PT09PT0qLworeworLyoqIFRyeSBvc19haW9fdmFsaWRhdGUoKSBldmVyeSB0
aGlzIG1hbnkgdGltZXMgKi8KKyMgZGVmaW5lIE9TX0FJT19WQUxJREFURV9TS0lQCTEzCisKKwkv
KiogVGhlIG9zX2Fpb192YWxpZGF0ZSgpIGNhbGwgc2tpcCBjb3VudGVyLgorCVVzZSBhIHNpZ25l
ZCB0eXBlIGJlY2F1c2Ugb2YgdGhlIHJhY2UgY29uZGl0aW9uIGJlbG93LiAqLworCXN0YXRpYyBp
bnQgb3NfYWlvX3ZhbGlkYXRlX2NvdW50ID0gT1NfQUlPX1ZBTElEQVRFX1NLSVA7CisKKwkvKiBU
aGVyZSBpcyBhIHJhY2UgY29uZGl0aW9uIGJlbG93LCBidXQgaXQgZG9lcyBub3QgbWF0dGVyLAor
CWJlY2F1c2UgdGhpcyBjYWxsIGlzIG9ubHkgZm9yIGhldXJpc3RpYyBwdXJwb3Nlcy4gV2Ugd2Fu
dCB0bworCXJlZHVjZSB0aGUgY2FsbCBmcmVxdWVuY3kgb2YgdGhlIGNvc3RseSBvc19haW9fdmFs
aWRhdGUoKQorCWNoZWNrIGluIGRlYnVnIGJ1aWxkcy4gKi8KKwlpZiAoLS1vc19haW9fdmFsaWRh
dGVfY291bnQgPiAwKSB7CisJCXJldHVybihUUlVFKTsKKwl9CisKKwlvc19haW9fdmFsaWRhdGVf
Y291bnQgPSBPU19BSU9fVkFMSURBVEVfU0tJUDsKKwlyZXR1cm4ob3NfYWlvX3ZhbGlkYXRlKCkp
OworfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KKworI2lmZGVmIF9fV0lOX18KIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKIEdldHMgdGhlIG9wZXJhdGluZyBzeXN0ZW0gdmVyc2lvbi4gQ3VycmVudGx5
IHdvcmtzIG9ubHkgb24gV2luZG93cy4KIEByZXR1cm4JT1NfV0lOOTUsIE9TX1dJTjMxLCBPU19X
SU5OVCwgT1NfV0lOMjAwMCwgT1NfV0lOWFAsIE9TX1dJTlZJU1RBLApAQCAtMzExLDcgKzM0MSw2
IEBAIHVsaW50CiBvc19nZXRfb3NfdmVyc2lvbih2b2lkKQogLyo9PT09PT09PT09PT09PT09PT09
Ki8KIHsKLSNpZmRlZiBfX1dJTl9fCiAJT1NWRVJTSU9OSU5GTwkgIG9zX2luZm87CiAKIAlvc19p
bmZvLmR3T1NWZXJzaW9uSW5mb1NpemUgPSBzaXplb2YoT1NWRVJTSU9OSU5GTyk7CkBAIC0zNDAs
MTIgKzM2OSw4IEBAIG9zX2dldF9vc192ZXJzaW9uKHZvaWQpCiAJCXV0X2Vycm9yOwogCQlyZXR1
cm4oMCk7CiAJfQotI2Vsc2UKLQl1dF9lcnJvcjsKLQotCXJldHVybigwKTsKLSNlbmRpZgogfQor
I2VuZGlmIC8qIF9fV0lOX18gKi8KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0cmlldmVzIHRo
ZSBsYXN0IGVycm9yIG51bWJlciBpZiBhbiBlcnJvciBvY2N1cnMgaW4gYSBmaWxlIGlvIGZ1bmN0
aW9uLgpAQCAtNDAwOCw3ICs0MDMzLDcgQEAgb3NfYWlvX2Z1bmMoCiAJdXRfYWQobiA+IDApOwog
CXV0X2FkKG4gJSBPU19GSUxFX0xPR19CTE9DS19TSVpFID09IDApOwogCXV0X2FkKG9mZnNldCAl
IE9TX0ZJTEVfTE9HX0JMT0NLX1NJWkUgPT0gMCk7Ci0JdXRfYWQob3NfYWlvX3ZhbGlkYXRlKCkp
OworCXV0X2FkKG9zX2Fpb192YWxpZGF0ZV9za2lwKCkpOwogI2lmZGVmIFdJTl9BU1lOQ19JTwog
CXV0X2FkKChuICYgMHhGRkZGRkZGRlVMKSA9PSBuKTsKICNlbmRpZgpAQCAtNDIxMCw3ICs0MjM1
LDcgQEAgb3NfYWlvX3dpbmRvd3NfaGFuZGxlKAogCS8qIE5PVEUhIFdlIG9ubHkgYWNjZXNzIGNv
bnN0YW50IGZpZWxkcyBpbiBvc19haW9fYXJyYXkuIFRoZXJlZm9yZQogCXdlIGRvIG5vdCBoYXZl
IHRvIGFjcXVpcmUgdGhlIHByb3RlY3RpbmcgbXV0ZXggeWV0ICovCiAKLQl1dF9hZChvc19haW9f
dmFsaWRhdGUoKSk7CisJdXRfYWQob3NfYWlvX3ZhbGlkYXRlX3NraXAoKSk7CiAJdXRfYWQoc2Vn
bWVudCA8IGFycmF5LT5uX3NlZ21lbnRzKTsKIAogCW4gPSBhcnJheS0+bl9zbG90cyAvIGFycmF5
LT5uX3NlZ21lbnRzOwpAQCAtNDYzMCw3ICs0NjU1LDcgQEAgcmVzdGFydDoKIAogCXNydl9zZXRf
aW9fdGhyZWFkX29wX2luZm8oZ2xvYmFsX3NlZ21lbnQsCiAJCQkJICAibG9va2luZyBmb3IgaS9v
IHJlcXVlc3RzIChhKSIpOwotCXV0X2FkKG9zX2Fpb192YWxpZGF0ZSgpKTsKKwl1dF9hZChvc19h
aW9fdmFsaWRhdGVfc2tpcCgpKTsKIAl1dF9hZChzZWdtZW50IDwgYXJyYXktPm5fc2VnbWVudHMp
OwogCiAJbiA9IGFycmF5LT5uX3Nsb3RzIC8gYXJyYXktPm5fc2VnbWVudHM7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwYXJyLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2Uvc3luYy9zeW5jMGFyci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAxMjAxMDgzNjU0LWZ3Nmc1bnZ2ajEzY251MDQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zeW5j
L3N5bmMwYXJyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODQzMzMt
YzVpbGtyZXdxYmxmb3BnNwpAQCAtNTkwLDkgKzU5MCw2IEBAIHN5bmNfYXJyYXlfZGVhZGxvY2tf
c3RlcCgKIAl1bGludAkJZGVwdGgpCS8qITwgaW46IHJlY3Vyc2lvbiBkZXB0aCAqLwogewogCXN5
bmNfY2VsbF90KgluZXc7Ci0JaWJvb2wJCXJldDsKLQotCWRlcHRoKys7CiAKIAlpZiAocGFzcyAh
PSAwKSB7CiAJCS8qIElmIHBhc3MgIT0gMCwgdGhlbiB3ZSBkbyBub3Qga25vdyB3aGljaCB0aHJl
YWRzIGFyZQpAQCAtNjA0LDcgKzYwMSw3IEBAIHN5bmNfYXJyYXlfZGVhZGxvY2tfc3RlcCgKIAog
CW5ldyA9IHN5bmNfYXJyYXlfZmluZF90aHJlYWQoYXJyLCB0aHJlYWQpOwogCi0JaWYgKG5ldyA9
PSBzdGFydCkgeworCWlmIChVTklWX1VOTElLRUxZKG5ldyA9PSBzdGFydCkpIHsKIAkJLyogU3Rv
cCBydW5uaW5nIG9mIG90aGVyIHRocmVhZHMgKi8KIAogCQl1dF9kYmdfc3RvcF90aHJlYWRzID0g
VFJVRTsKQEAgLTYxNiwxMSArNjEzLDcgQEAgc3luY19hcnJheV9kZWFkbG9ja19zdGVwKAogCQly
ZXR1cm4oVFJVRSk7CiAKIAl9IGVsc2UgaWYgKG5ldykgewotCQlyZXQgPSBzeW5jX2FycmF5X2Rl
dGVjdF9kZWFkbG9jayhhcnIsIHN0YXJ0LCBuZXcsIGRlcHRoKTsKLQotCQlpZiAocmV0KSB7Ci0J
CQlyZXR1cm4oVFJVRSk7Ci0JCX0KKwkJcmV0dXJuKHN5bmNfYXJyYXlfZGV0ZWN0X2RlYWRsb2Nr
KGFyciwgc3RhcnQsIG5ldywgZGVwdGggKyAxKSk7CiAJfQogCXJldHVybihGQUxTRSk7CiB9Cgo=

--===============1246844203==
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: ee05893a1a359b37d6f731eb3821685665f4b0ad
# timestamp: 2010-12-01 11:09:51 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   fw6g5nvvj13cnu04
# 
# Begin bundle
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


--===============1246844203==--