From: marko.makela
Date: December 1 2010 8:43am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3249) Bug#58226
List-Archive: http://lists.mysql.com/commits/125620
X-Bug: 58226
Message-Id: <201012010843.oB17VWN9006554@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0252734154=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MzY1NC1mdzZn
NW52dmoxM2NudTA0CgogMzI0OSBNYXJrbyBNw6RrZWzDpAkyMDEwLTEyLTAxCiAgICAgIEJ1ZyM1
ODIyNiBTb21lIElubm9EQiBkZWJ1ZyBjaGVja3MgY29uc3VtZSB0b28gbXVjaCBDUFUgdGltZQog
ICAgICAKICAgICAgRG8gbm90IGRpc2FibGUgSW5ub0RCIGlubGluaW5nIHdoZW4gVU5JVl9ERUJV
RyBpcyBkZWZpbmVkLiBUaGUKICAgICAgaW5saW5pbmcgaXMgbm93IHNvbGVseSBjb250cm9sbGVk
IGJ5IHRoZSBwcmVwcm9jZXNzb3Igc3ltYm9sCiAgICAgIFVOSVZfTVVTVF9OT1RfSU5MSU5FIGFu
ZCBieSBhbnkgY29tcGlsZXIgb3B0aW9ucy4KICAgICAgCiAgICAgIG10cl9tZW1vX2NvbnRhaW5z
KCk6IEFkZCBhbiBleHBsaWNpdCB0eXBlIGNvbnZlcnNpb24gZnJvbSB2b2lkKiwgc28KICAgICAg
dGhhdCB0aGUgZnVuY3Rpb24gY2FuIGJlIGNvbXBpbGVkIGJ5IGEgQysrIGNvbXBpbGVyLiBQcmV2
aW91c2x5LCB0aGlzCiAgICAgIGZ1bmN0aW9uIHdhcyBuZXZlciBzZWVuIGJ5IHRoZSBDKysgY29t
cGlsZXIsIGJlY2F1c2UgaXQgaXMgb25seQogICAgICBwcmVzZW50IGluIFVOSVZfREVCVUcgYnVp
bGRzIGFuZCBJbm5vREIgaW5saW5pbmcgdXNlZCB0byBiZSBkaXNhYmxlZC4KICAgICAgCiAgICAg
IGJ1Zl9mbHVzaF92YWxpZGF0ZV9za2lwKCk6IEEgd3JhcHBlciB0aGF0IHNraXBzIG1vc3QgY2Fs
bHMgb2YKICAgICAgYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdygpLiBJbnZva2VkIGJ5IGRlYnVnIGFz
c2VydGlvbnMgaW4KICAgICAgYnVmX2ZsdXNoX2luc2VydF9pbnRvX2ZsdXNoX2xpc3QoKSBhbmQg
YnVmX2ZsdXNoX3JlbW92ZSgpLgogICAgICAKICAgICAgZmlsX3ZhbGlkYXRlX3NraXAoKTogQSB3
cmFwcGVyIHRoYXQgc2tpcHMgbW9zdCBjYWxscyBvZgogICAgICBmaWxfdmFsaWRhdGUoKS4gSW52
b2tlZCBieSBkZWJ1ZyBhc3NlcnRpb25zIGluIGZpbF9pbygpIGFuZCBmaWxfaW9fd2FpdCgpLgog
ICAgICAKICAgICAgb3NfYWlvX3ZhbGlkYXRlX3NraXAoKTogQSB3cmFwcGVyIHRoYXQgc2tpcHMg
bW9zdCBjYWxscyBvZgogICAgICBvc19haW9fdmFsaWRhdGUoKS4gSW52b2tlZCBieSBkZWJ1ZyBh
c3NlcnRpb25zIGluCiAgICAgIG9zX2Fpb19mdW5jKCksIG9zX2Fpb193aW5kb3dzX2hhbmRsZSgp
IGFuZCBvc19haW9fc2ltdWxhdGVkX2hhbmRsZS4KICAgICAgCiAgICAgIG9zX2dldF9vc192ZXJz
aW9uKCk6IE9ubHkgaW5jbHVkZSB0aGlzIGZ1bmN0aW9uIGlmIF9fV0lOX18gaXMgZGVmaW5lZC4K
ICAgICAgCiAgICAgIHN5bmNfYXJyYXlfZGVhZGxvY2tfc3RlcCgpOiBTbGlnaHQgb3B0aW1pemF0
aW9ucy4gVGhpcyBmdW5jdGlvbiBpcyBhCiAgICAgIG1ham9yIENQVSBjb25zdW1lciBpbiBVTklW
X1NZTkNfREVCVUcgYnVpbGRzLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2J1Zi9idWYwZmx1LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tdHIwbXRyLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9vczBmaWxlLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYu
aQogICAgICBzdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuYwogICAgICBzdG9yYWdlL2lubm9i
YXNlL3N5bmMvc3luYzBhcnIuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9i
dWYvYnVmMGZsdS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODM2NTQtZnc2ZzVudnZqMTNjbnUwNAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDEyMDEwODQzMzMtYzVpbGtyZXdxYmxmb3BnNwpAQCAtODgsNiArODgsMzQg
QEAgaWJvb2wKIGJ1Zl9mbHVzaF92YWxpZGF0ZV9sb3coCiAvKj09PT09PT09PT09PT09PT09PT0q
LwogCWJ1Zl9wb29sX3QqCWJ1Zl9wb29sKTsJLyohPCBpbjogQnVmZmVyIHBvb2wgaW5zdGFuY2Ug
Ki8KKworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKK1ZhbGlkYXRlcyB0aGUgZmx1c2ggbGlzdCBzb21lIG9mIHRo
ZSB0aW1lLgorQHJldHVybglUUlVFIGlmIG9rIG9yIHRoZSBjaGVjayB3YXMgc2tpcHBlZCAqLwor
c3RhdGljCitpYm9vbAorYnVmX2ZsdXNoX3ZhbGlkYXRlX3NraXAoCisvKj09PT09PT09PT09PT09
PT09PT09Ki8KKwlidWZfcG9vbF90KglidWZfcG9vbCkJLyohPCBpbjogQnVmZmVyIHBvb2wgaW5z
dGFuY2UgKi8KK3sKKy8qKiBUcnkgYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdygpIGV2ZXJ5IHRoaXMg
bWFueSB0aW1lcyAqLworIyBkZWZpbmUgQlVGX0ZMVVNIX1ZBTElEQVRFX1NLSVAJMjMKKworCS8q
KiBUaGUgYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdygpIGNhbGwgc2tpcCBjb3VudGVyLgorCVVzZSBh
IHNpZ25lZCB0eXBlIGJlY2F1c2Ugb2YgdGhlIHJhY2UgY29uZGl0aW9uIGJlbG93LiAqLworCXN0
YXRpYyBpbnQgYnVmX2ZsdXNoX3ZhbGlkYXRlX2NvdW50ID0gQlVGX0ZMVVNIX1ZBTElEQVRFX1NL
SVA7CisKKwkvKiBUaGVyZSBpcyBhIHJhY2UgY29uZGl0aW9uIGJlbG93LCBidXQgaXQgZG9lcyBu
b3QgbWF0dGVyLAorCWJlY2F1c2UgdGhpcyBjYWxsIGlzIG9ubHkgZm9yIGhldXJpc3RpYyBwdXJw
b3Nlcy4gV2Ugd2FudCB0bworCXJlZHVjZSB0aGUgY2FsbCBmcmVxdWVuY3kgb2YgdGhlIGNvc3Rs
eSBidWZfZmx1c2hfdmFsaWRhdGVfbG93KCkKKwljaGVjayBpbiBkZWJ1ZyBidWlsZHMuICovCisJ
aWYgKC0tYnVmX2ZsdXNoX3ZhbGlkYXRlX2NvdW50ID4gMCkgeworCQlyZXR1cm4oVFJVRSk7CisJ
fQorCisJYnVmX2ZsdXNoX3ZhbGlkYXRlX2NvdW50ID0gQlVGX0ZMVVNIX1ZBTElEQVRFX1NLSVA7
CisJcmV0dXJuKGJ1Zl9mbHVzaF92YWxpZGF0ZV9sb3coYnVmX3Bvb2wpKTsKK30KICNlbmRpZiAv
KiBVTklWX0RFQlVHIHx8IFVOSVZfQlVGX0RFQlVHICovCiAKIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCkBAIC0y
OTMsNyArMzIxLDcgQEAgYnVmX2ZsdXNoX2luc2VydF9pbnRvX2ZsdXNoX2xpc3QoCiAJfQogI2Vu
ZGlmIC8qIFVOSVZfREVCVUdfVkFMR1JJTkQgKi8KICNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwg
ZGVmaW5lZCBVTklWX0JVRl9ERUJVRwotCXV0X2EoYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdyhidWZf
cG9vbCkpOworCXV0X2EoYnVmX2ZsdXNoX3ZhbGlkYXRlX3NraXAoYnVmX3Bvb2wpKTsKICNlbmRp
ZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQlVGX0RFQlVHICovCiAKIAlidWZfZmx1c2hfbGlzdF9t
dXRleF9leGl0KGJ1Zl9wb29sKTsKQEAgLTUxNSw3ICs1NDMsNyBAQCBidWZfZmx1c2hfcmVtb3Zl
KAogCWJwYWdlLT5vbGRlc3RfbW9kaWZpY2F0aW9uID0gMDsKIAogI2lmIGRlZmluZWQgVU5JVl9E
RUJVRyB8fCBkZWZpbmVkIFVOSVZfQlVGX0RFQlVHCi0JdXRfYShidWZfZmx1c2hfdmFsaWRhdGVf
bG93KGJ1Zl9wb29sKSk7CisJdXRfYShidWZfZmx1c2hfdmFsaWRhdGVfc2tpcChidWZfcG9vbCkp
OwogI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CVUZfREVCVUcgKi8KIAogCWJ1Zl9mbHVz
aF9saXN0X211dGV4X2V4aXQoYnVmX3Bvb2wpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZp
bC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDgzNjU0LWZ3Nmc1bnZ2
ajEzY251MDQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0MzMzLWM1aWxrcmV3cWJsZm9wZzcKQEAgLTI5
OSw2ICsyOTksMzQgQEAgc3RydWN0IGZpbF9zeXN0ZW1fc3RydWN0IHsKIGluaXRpYWxpemVkLiAq
Lwogc3RhdGljIGZpbF9zeXN0ZW1fdCoJZmlsX3N5c3RlbQk9IE5VTEw7CiAKKyNpZmRlZiBVTklW
X0RFQlVHCisvKiogVHJ5IGZpbF92YWxpZGF0ZSgpIGV2ZXJ5IHRoaXMgbWFueSB0aW1lcyAqLwor
IyBkZWZpbmUgRklMX1ZBTElEQVRFX1NLSVAJMTcKKworLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0NoZWNrcyB0
aGUgY29uc2lzdGVuY3kgb2YgdGhlIHRhYmxlc3BhY2UgY2FjaGUgc29tZSBvZiB0aGUgdGltZS4K
K0ByZXR1cm4JVFJVRSBpZiBvayBvciB0aGUgY2hlY2sgd2FzIHNraXBwZWQgKi8KK3N0YXRpYwor
aWJvb2wKK2ZpbF92YWxpZGF0ZV9za2lwKHZvaWQpCisvKj09PT09PT09PT09PT09PT09PT0qLwor
eworCS8qKiBUaGUgZmlsX3ZhbGlkYXRlKCkgY2FsbCBza2lwIGNvdW50ZXIuIFVzZSBhIHNpZ25l
ZCB0eXBlCisJYmVjYXVzZSBvZiB0aGUgcmFjZSBjb25kaXRpb24gYmVsb3cuICovCisJc3RhdGlj
IGludCBmaWxfdmFsaWRhdGVfY291bnQgPSBGSUxfVkFMSURBVEVfU0tJUDsKKworCS8qIFRoZXJl
IGlzIGEgcmFjZSBjb25kaXRpb24gYmVsb3csIGJ1dCBpdCBkb2VzIG5vdCBtYXR0ZXIsCisJYmVj
YXVzZSB0aGlzIGNhbGwgaXMgb25seSBmb3IgaGV1cmlzdGljIHB1cnBvc2VzLiBXZSB3YW50IHRv
CisJcmVkdWNlIHRoZSBjYWxsIGZyZXF1ZW5jeSBvZiB0aGUgY29zdGx5IGZpbF92YWxpZGF0ZSgp
IGNoZWNrCisJaW4gZGVidWcgYnVpbGRzLiAqLworCWlmICgtLWZpbF92YWxpZGF0ZV9jb3VudCA+
IDApIHsKKwkJcmV0dXJuKFRSVUUpOworCX0KKworCWZpbF92YWxpZGF0ZV9jb3VudCA9IEZJTF9W
QUxJREFURV9TS0lQOworCXJldHVybihmaWxfdmFsaWRhdGUoKSk7Cit9CisjZW5kaWYgLyogVU5J
Vl9ERUJVRyAqLwogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBOT1RFOiB5b3UgbXVzdCBjYWxsIGZpbF9t
dXRleF9lbnRlcl9hbmRfcHJlcGFyZV9mb3JfaW8oKSBmaXJzdCEKQEAgLTQzMDcsNyArNDMzNSw3
IEBAIGZpbF9pbygKICNpZiAoMSA8PCBVTklWX1BBR0VfU0laRV9TSElGVCkgIT0gVU5JVl9QQUdF
X1NJWkUKICMgZXJyb3IgIigxIDw8IFVOSVZfUEFHRV9TSVpFX1NISUZUKSAhPSBVTklWX1BBR0Vf
U0laRSIKICNlbmRpZgotCXV0X2FkKGZpbF92YWxpZGF0ZSgpKTsKKwl1dF9hZChmaWxfdmFsaWRh
dGVfc2tpcCgpKTsKICNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKICMgaWZuZGVmIFVOSVZfTE9HX0RF
QlVHCiAJLyogaWJ1ZiBiaXRtYXAgcGFnZXMgbXVzdCBiZSByZWFkIGluIHRoZSBzeW5jIGFpbyBt
b2RlOiAqLwpAQCAtNDQ2Niw3ICs0NDk0LDcgQEAgZmlsX2lvKAogCiAJCW11dGV4X2V4aXQoJmZp
bF9zeXN0ZW0tPm11dGV4KTsKIAotCQl1dF9hZChmaWxfdmFsaWRhdGUoKSk7CisJCXV0X2FkKGZp
bF92YWxpZGF0ZV9za2lwKCkpOwogCX0KIAogCXJldHVybihEQl9TVUNDRVNTKTsKQEAgLTQ0OTAs
NyArNDUxOCw3IEBAIGZpbF9haW9fd2FpdCgKIAl2b2lkKgkJbWVzc2FnZTsKIAl1bGludAkJdHlw
ZTsKIAotCXV0X2FkKGZpbF92YWxpZGF0ZSgpKTsKKwl1dF9hZChmaWxfdmFsaWRhdGVfc2tpcCgp
KTsKIAogCWlmIChzcnZfdXNlX25hdGl2ZV9haW8pIHsKIAkJc3J2X3NldF9pb190aHJlYWRfb3Bf
aW5mbyhzZWdtZW50LCAibmF0aXZlIGFpbyBoYW5kbGUiKTsKQEAgLTQ1MjEsNyArNDU0OSw3IEBA
IGZpbF9haW9fd2FpdCgKIAogCW11dGV4X2V4aXQoJmZpbF9zeXN0ZW0tPm11dGV4KTsKIAotCXV0
X2FkKGZpbF92YWxpZGF0ZSgpKTsKKwl1dF9hZChmaWxfdmFsaWRhdGVfc2tpcCgpKTsKIAogCS8q
IERvIHRoZSBpL28gaGFuZGxpbmcgKi8KIAkvKiBJTVBPUlRBTlQ6IHNpbmNlIGkvbyBoYW5kbGlu
ZyBmb3IgcmVhZHMgd2lsbCByZWFkIGFsc28gdGhlIGluc2VydAoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tdHIwbXRyLmljJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvbXRyMG10ci5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MTIwMTA4MzY1NC1mdzZnNW52dmoxM2NudTA0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9tdHIwbXRyLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0MzMz
LWM1aWxrcmV3cWJsZm9wZzcKQEAgLTE2MCw3ICsxNjAsNyBAQCBtdHJfbWVtb19jb250YWlucygK
IAl3aGlsZSAob2Zmc2V0ID4gMCkgewogCQlvZmZzZXQgLT0gc2l6ZW9mKG10cl9tZW1vX3Nsb3Rf
dCk7CiAKLQkJc2xvdCA9IGR5bl9hcnJheV9nZXRfZWxlbWVudChtZW1vLCBvZmZzZXQpOworCQlz
bG90ID0gKG10cl9tZW1vX3Nsb3RfdCopIGR5bl9hcnJheV9nZXRfZWxlbWVudChtZW1vLCBvZmZz
ZXQpOwogCiAJCWlmICgob2JqZWN0ID09IHNsb3QtPm9iamVjdCkgJiYgKHR5cGUgPT0gc2xvdC0+
dHlwZSkpIHsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9v
czBmaWxlLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9vczBmaWxlLmgJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODM2NTQtZnc2ZzVudnZqMTNjbnUwNAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwZmlsZS5oCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0MzMzLWM1aWxrcmV3cWJsZm9wZzcKQEAgLTM3Myw2ICsz
NzMsNyBAQCB0eXBlZGVmIEhBTkRMRQlvc19maWxlX2Rpcl90OwkvKiE8IGRpcmVjCiB0eXBlZGVm
IERJUioJb3NfZmlsZV9kaXJfdDsJLyohPCBkaXJlY3Rvcnkgc3RyZWFtICovCiAjZW5kaWYKIAor
I2lmZGVmIF9fV0lOX18KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIEdldHMgdGhlIG9wZXJhdGluZyBz
eXN0ZW0gdmVyc2lvbi4gQ3VycmVudGx5IHdvcmtzIG9ubHkgb24gV2luZG93cy4KIEByZXR1cm4J
T1NfV0lOOTUsIE9TX1dJTjMxLCBPU19XSU5OVCwgT1NfV0lOMjAwMCwgT1NfV0lOWFAsIE9TX1dJ
TlZJU1RBLApAQCAtMzgxLDYgKzM4Miw3IEBAIFVOSVZfSU5URVJOCiB1bGludAogb3NfZ2V0X29z
X3ZlcnNpb24odm9pZCk7CiAvKj09PT09PT09PT09PT09PT09PT0qLworI2VuZGlmIC8qIF9fV0lO
X18gKi8KICNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogQ3JlYXRlcyB0aGUg
c2VlayBtdXRleGVzIHVzZWQgaW4gcG9zaXRpb25lZCByZWFkcyBhbmQgd3JpdGVzLiAqLwoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDEyMDEwODM2NTQtZnc2ZzVudnZqMTNjbnUwNAorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0
MzMzLWM1aWxrcmV3cWJsZm9wZzcKQEAgLTI1Myw3ICsyNTMsNyBAQCBlYXN5IHdheSB0byBnZXQg
aXQgdG8gd29yay4gU2VlIGh0dHA6Ly9iCiAjIGRlZmluZSBVTklWX0lOVEVSTgogI2VuZGlmCiAK
LSNpZiAoIWRlZmluZWQoVU5JVl9ERUJVRykgJiYgIWRlZmluZWQoVU5JVl9NVVNUX05PVF9JTkxJ
TkUpKQorI2lmbmRlZiBVTklWX01VU1RfTk9UX0lOTElORQogLyogRGVmaW5pdGlvbiBmb3IgaW5s
aW5lIHZlcnNpb24gKi8KIAogI2lmZGVmIF9fV0lOX18KCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL29zL29zMGZpbGUuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9vcy9vczBm
aWxlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDEwODM2NTQtZnc2ZzVu
dnZqMTNjbnUwNAorKysgYi9zdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4NDMzMy1jNWlsa3Jld3FibGZvcGc3CkBAIC0z
MDIsNiArMzAyLDM2IEBAIFVOSVZfSU5URVJOIHVsaW50CW9zX25fcGVuZGluZ193cml0ZXMgPQog
LyoqIE51bWJlciBvZiBwZW5kaW5nIHJlYWQgb3BlcmF0aW9ucyAqLwogVU5JVl9JTlRFUk4gdWxp
bnQJb3Nfbl9wZW5kaW5nX3JlYWRzID0gMDsKIAorI2lmZGVmIFVOSVZfREVCVUcKKy8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgorVmFsaWRhdGVzIHRoZSBjb25zaXN0ZW5jeSB0aGUgYWlvIHN5c3RlbSBzb21l
IG9mIHRoZSB0aW1lLgorQHJldHVybglUUlVFIGlmIG9rIG9yIHRoZSBjaGVjayB3YXMgc2tpcHBl
ZCAqLworVU5JVl9JTlRFUk4KK2lib29sCitvc19haW9fdmFsaWRhdGVfc2tpcCh2b2lkKQorLyo9
PT09PT09PT09PT09PT09PT09PT09Ki8KK3sKKy8qKiBUcnkgb3NfYWlvX3ZhbGlkYXRlKCkgZXZl
cnkgdGhpcyBtYW55IHRpbWVzICovCisjIGRlZmluZSBPU19BSU9fVkFMSURBVEVfU0tJUAkxMwor
CisJLyoqIFRoZSBvc19haW9fdmFsaWRhdGUoKSBjYWxsIHNraXAgY291bnRlci4KKwlVc2UgYSBz
aWduZWQgdHlwZSBiZWNhdXNlIG9mIHRoZSByYWNlIGNvbmRpdGlvbiBiZWxvdy4gKi8KKwlzdGF0
aWMgaW50IG9zX2Fpb192YWxpZGF0ZV9jb3VudCA9IE9TX0FJT19WQUxJREFURV9TS0lQOworCisJ
LyogVGhlcmUgaXMgYSByYWNlIGNvbmRpdGlvbiBiZWxvdywgYnV0IGl0IGRvZXMgbm90IG1hdHRl
ciwKKwliZWNhdXNlIHRoaXMgY2FsbCBpcyBvbmx5IGZvciBoZXVyaXN0aWMgcHVycG9zZXMuIFdl
IHdhbnQgdG8KKwlyZWR1Y2UgdGhlIGNhbGwgZnJlcXVlbmN5IG9mIHRoZSBjb3N0bHkgb3NfYWlv
X3ZhbGlkYXRlKCkKKwljaGVjayBpbiBkZWJ1ZyBidWlsZHMuICovCisJaWYgKC0tb3NfYWlvX3Zh
bGlkYXRlX2NvdW50ID4gMCkgeworCQlyZXR1cm4oVFJVRSk7CisJfQorCisJb3NfYWlvX3ZhbGlk
YXRlX2NvdW50ID0gT1NfQUlPX1ZBTElEQVRFX1NLSVA7CisJcmV0dXJuKG9zX2Fpb192YWxpZGF0
ZSgpKTsKK30KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisKKyNpZmRlZiBfX1dJTl9fCiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCiBHZXRzIHRoZSBvcGVyYXRpbmcgc3lzdGVtIHZlcnNpb24uIEN1cnJl
bnRseSB3b3JrcyBvbmx5IG9uIFdpbmRvd3MuCiBAcmV0dXJuCU9TX1dJTjk1LCBPU19XSU4zMSwg
T1NfV0lOTlQsIE9TX1dJTjIwMDAsIE9TX1dJTlhQLCBPU19XSU5WSVNUQSwKQEAgLTMxMSw3ICsz
NDEsNiBAQCB1bGludAogb3NfZ2V0X29zX3ZlcnNpb24odm9pZCkKIC8qPT09PT09PT09PT09PT09
PT09PSovCiB7Ci0jaWZkZWYgX19XSU5fXwogCU9TVkVSU0lPTklORk8JICBvc19pbmZvOwogCiAJ
b3NfaW5mby5kd09TVmVyc2lvbkluZm9TaXplID0gc2l6ZW9mKE9TVkVSU0lPTklORk8pOwpAQCAt
MzQwLDEyICszNjksOCBAQCBvc19nZXRfb3NfdmVyc2lvbih2b2lkKQogCQl1dF9lcnJvcjsKIAkJ
cmV0dXJuKDApOwogCX0KLSNlbHNlCi0JdXRfZXJyb3I7Ci0KLQlyZXR1cm4oMCk7Ci0jZW5kaWYK
IH0KKyNlbmRpZiAvKiBfX1dJTl9fICovCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHJpZXZl
cyB0aGUgbGFzdCBlcnJvciBudW1iZXIgaWYgYW4gZXJyb3Igb2NjdXJzIGluIGEgZmlsZSBpbyBm
dW5jdGlvbi4KQEAgLTQwMDgsNyArNDAzMyw3IEBAIG9zX2Fpb19mdW5jKAogCXV0X2FkKG4gPiAw
KTsKIAl1dF9hZChuICUgT1NfRklMRV9MT0dfQkxPQ0tfU0laRSA9PSAwKTsKIAl1dF9hZChvZmZz
ZXQgJSBPU19GSUxFX0xPR19CTE9DS19TSVpFID09IDApOwotCXV0X2FkKG9zX2Fpb192YWxpZGF0
ZSgpKTsKKwl1dF9hZChvc19haW9fdmFsaWRhdGVfc2tpcCgpKTsKICNpZmRlZiBXSU5fQVNZTkNf
SU8KIAl1dF9hZCgobiAmIDB4RkZGRkZGRkZVTCkgPT0gbik7CiAjZW5kaWYKQEAgLTQyMTAsNyAr
NDIzNSw3IEBAIG9zX2Fpb193aW5kb3dzX2hhbmRsZSgKIAkvKiBOT1RFISBXZSBvbmx5IGFjY2Vz
cyBjb25zdGFudCBmaWVsZHMgaW4gb3NfYWlvX2FycmF5LiBUaGVyZWZvcmUKIAl3ZSBkbyBub3Qg
aGF2ZSB0byBhY3F1aXJlIHRoZSBwcm90ZWN0aW5nIG11dGV4IHlldCAqLwogCi0JdXRfYWQob3Nf
YWlvX3ZhbGlkYXRlKCkpOworCXV0X2FkKG9zX2Fpb192YWxpZGF0ZV9za2lwKCkpOwogCXV0X2Fk
KHNlZ21lbnQgPCBhcnJheS0+bl9zZWdtZW50cyk7CiAKIAluID0gYXJyYXktPm5fc2xvdHMgLyBh
cnJheS0+bl9zZWdtZW50czsKQEAgLTQ2MzAsNyArNDY1NSw3IEBAIHJlc3RhcnQ6CiAKIAlzcnZf
c2V0X2lvX3RocmVhZF9vcF9pbmZvKGdsb2JhbF9zZWdtZW50LAogCQkJCSAgImxvb2tpbmcgZm9y
IGkvbyByZXF1ZXN0cyAoYSkiKTsKLQl1dF9hZChvc19haW9fdmFsaWRhdGUoKSk7CisJdXRfYWQo
b3NfYWlvX3ZhbGlkYXRlX3NraXAoKSk7CiAJdXRfYWQoc2VnbWVudCA8IGFycmF5LT5uX3NlZ21l
bnRzKTsKIAogCW4gPSBhcnJheS0+bl9zbG90cyAvIGFycmF5LT5uX3NlZ21lbnRzOwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMGFyci5jJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3N5bmMvc3luYzBhcnIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMTIwMTA4MzY1NC1mdzZnNW52dmoxM2NudTA0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
c3luYy9zeW5jMGFyci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0
MzMzLWM1aWxrcmV3cWJsZm9wZzcKQEAgLTU5MCw5ICs1OTAsNiBAQCBzeW5jX2FycmF5X2RlYWRs
b2NrX3N0ZXAoCiAJdWxpbnQJCWRlcHRoKQkvKiE8IGluOiByZWN1cnNpb24gZGVwdGggKi8KIHsK
IAlzeW5jX2NlbGxfdCoJbmV3OwotCWlib29sCQlyZXQ7Ci0KLQlkZXB0aCsrOwogCiAJaWYgKHBh
c3MgIT0gMCkgewogCQkvKiBJZiBwYXNzICE9IDAsIHRoZW4gd2UgZG8gbm90IGtub3cgd2hpY2gg
dGhyZWFkcyBhcmUKQEAgLTYwNCw3ICs2MDEsNyBAQCBzeW5jX2FycmF5X2RlYWRsb2NrX3N0ZXAo
CiAKIAluZXcgPSBzeW5jX2FycmF5X2ZpbmRfdGhyZWFkKGFyciwgdGhyZWFkKTsKIAotCWlmIChu
ZXcgPT0gc3RhcnQpIHsKKwlpZiAoVU5JVl9VTkxJS0VMWShuZXcgPT0gc3RhcnQpKSB7CiAJCS8q
IFN0b3AgcnVubmluZyBvZiBvdGhlciB0aHJlYWRzICovCiAKIAkJdXRfZGJnX3N0b3BfdGhyZWFk
cyA9IFRSVUU7CkBAIC02MTYsMTEgKzYxMyw3IEBAIHN5bmNfYXJyYXlfZGVhZGxvY2tfc3RlcCgK
IAkJcmV0dXJuKFRSVUUpOwogCiAJfSBlbHNlIGlmIChuZXcpIHsKLQkJcmV0ID0gc3luY19hcnJh
eV9kZXRlY3RfZGVhZGxvY2soYXJyLCBzdGFydCwgbmV3LCBkZXB0aCk7Ci0KLQkJaWYgKHJldCkg
ewotCQkJcmV0dXJuKFRSVUUpOwotCQl9CisJCXJldHVybihzeW5jX2FycmF5X2RldGVjdF9kZWFk
bG9jayhhcnIsIHN0YXJ0LCBuZXcsIGRlcHRoICsgMSkpOwogCX0KIAlyZXR1cm4oRkFMU0UpOwog
fQoK

--===============0252734154==
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 10:43:40 +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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


--===============0252734154==--