From: marko.makela
Date: November 16 2010 12:39pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3229) Bug#58226
List-Archive: http://lists.mysql.com/commits/124027
X-Bug: 58226
Message-Id: <201011161240.oAGA3PXC018357@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1244207851=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTExNjEyMjE0Ni1mNWls
cDd4emR3bDh0MTkwCgogMzIyOSBNYXJrbyBNw6RrZWzDpAkyMDEwLTExLTE2CiAgICAgIEJ1ZyM1
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
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMTYxMjIxNDYtZjVpbHA3eHpkd2w4dDE5MAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDExMTYxMjM5NTMtNjJiem11dXltenRqYWp3YQpAQCAtODgsNiArODgsMzQg
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
bC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTE2MTIyMTQ2LWY1aWxwN3h6
ZHdsOHQxOTAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTE2MTIzOTUzLTYyYnptdXV5bXp0amFqd2EKQEAgLTI5
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
MTExNjEyMjE0Ni1mNWlscDd4emR3bDh0MTkwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9tdHIwbXRyLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTE2MTIzOTUz
LTYyYnptdXV5bXp0amFqd2EKQEAgLTE2MCw3ICsxNjAsNyBAQCBtdHJfbWVtb19jb250YWlucygK
IAl3aGlsZSAob2Zmc2V0ID4gMCkgewogCQlvZmZzZXQgLT0gc2l6ZW9mKG10cl9tZW1vX3Nsb3Rf
dCk7CiAKLQkJc2xvdCA9IGR5bl9hcnJheV9nZXRfZWxlbWVudChtZW1vLCBvZmZzZXQpOworCQlz
bG90ID0gKG10cl9tZW1vX3Nsb3RfdCopIGR5bl9hcnJheV9nZXRfZWxlbWVudChtZW1vLCBvZmZz
ZXQpOwogCiAJCWlmICgob2JqZWN0ID09IHNsb3QtPm9iamVjdCkgJiYgKHR5cGUgPT0gc2xvdC0+
dHlwZSkpIHsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9v
czBmaWxlLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9vczBmaWxlLmgJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMTYxMjIxNDYtZjVpbHA3eHpkd2w4dDE5MAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3MwZmlsZS5oCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAxMTE2MTIzOTUzLTYyYnptdXV5bXp0amFqd2EKQEAgLTM3Myw2ICsz
NzMsNyBAQCB0eXBlZGVmIEhBTkRMRQlvc19maWxlX2Rpcl90OwkvKiE8IGRpcmVjCiB0eXBlZGVm
IERJUioJb3NfZmlsZV9kaXJfdDsJLyohPCBkaXJlY3Rvcnkgc3RyZWFtICovCiAjZW5kaWYKIAor
I2lmZGVmIF9fV0lOX18KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIEdldHMgdGhlIG9wZXJhdGluZyBz
eXN0ZW0gdmVyc2lvbi4gQ3VycmVudGx5IHdvcmtzIG9ubHkgb24gV2luZG93cy4KIEByZXR1cm4J
T1NfV0lOOTUsIE9TX1dJTjMxLCBPU19XSU5OVCwgT1NfV0lOMjAwMCwgT1NfV0lOWFAsIE9TX1dJ
TlZJU1RBLApAQCAtMzgxLDYgKzM4Miw3IEBAIFVOSVZfSU5URVJOCiB1bGludAogb3NfZ2V0X29z
X3ZlcnNpb24odm9pZCk7CiAvKj09PT09PT09PT09PT09PT09PT0qLworI2VuZGlmIC8qIF9fV0lO
X18gKi8KICNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogQ3JlYXRlcyB0aGUg
c2VlayBtdXRleGVzIHVzZWQgaW4gcG9zaXRpb25lZCByZWFkcyBhbmQgd3JpdGVzLiAqLwoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDExMTYxMjIxNDYtZjVpbHA3eHpkd2w4dDE5MAorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTE2MTIz
OTUzLTYyYnptdXV5bXp0amFqd2EKQEAgLTI1MCw3ICsyNTAsNyBAQCBlYXN5IHdheSB0byBnZXQg
aXQgdG8gd29yay4gU2VlIGh0dHA6Ly9iCiAjIGRlZmluZSBVTklWX0lOVEVSTgogI2VuZGlmCiAK
LSNpZiAoIWRlZmluZWQoVU5JVl9ERUJVRykgJiYgIWRlZmluZWQoVU5JVl9NVVNUX05PVF9JTkxJ
TkUpKQorI2lmbmRlZiBVTklWX01VU1RfTk9UX0lOTElORQogLyogRGVmaW5pdGlvbiBmb3IgaW5s
aW5lIHZlcnNpb24gKi8KIAogI2lmZGVmIF9fV0lOX18KCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL29zL29zMGZpbGUuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9vcy9vczBm
aWxlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMTYxMjIxNDYtZjVpbHA3
eHpkd2w4dDE5MAorKysgYi9zdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTExNjEyMzk1My02MmJ6bXV1eW16dGphandhCkBAIC0z
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
bS0yMDEwMTExNjEyMjE0Ni1mNWlscDd4emR3bDh0MTkwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
c3luYy9zeW5jMGFyci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTE2MTIz
OTUzLTYyYnptdXV5bXp0amFqd2EKQEAgLTU5MCw5ICs1OTAsNiBAQCBzeW5jX2FycmF5X2RlYWRs
b2NrX3N0ZXAoCiAJdWxpbnQJCWRlcHRoKQkvKiE8IGluOiByZWN1cnNpb24gZGVwdGggKi8KIHsK
IAlzeW5jX2NlbGxfdCoJbmV3OwotCWlib29sCQlyZXQ7Ci0KLQlkZXB0aCsrOwogCiAJaWYgKHBh
c3MgIT0gMCkgewogCQkvKiBJZiBwYXNzICE9IDAsIHRoZW4gd2UgZG8gbm90IGtub3cgd2hpY2gg
dGhyZWFkcyBhcmUKQEAgLTYwNCw3ICs2MDEsNyBAQCBzeW5jX2FycmF5X2RlYWRsb2NrX3N0ZXAo
CiAKIAluZXcgPSBzeW5jX2FycmF5X2ZpbmRfdGhyZWFkKGFyciwgdGhyZWFkKTsKIAotCWlmIChu
ZXcgPT0gc3RhcnQpIHsKKwlpZiAoVU5JVl9VTkxJS0VMWShuZXcgPT0gc3RhcnQpKSB7CiAJCS8q
IFN0b3AgcnVubmluZyBvZiBvdGhlciB0aHJlYWRzICovCiAKIAkJdXRfZGJnX3N0b3BfdGhyZWFk
cyA9IFRSVUU7CkBAIC02MTYsMTEgKzYxMyw3IEBAIHN5bmNfYXJyYXlfZGVhZGxvY2tfc3RlcCgK
IAkJcmV0dXJuKFRSVUUpOwogCiAJfSBlbHNlIGlmIChuZXcpIHsKLQkJcmV0ID0gc3luY19hcnJh
eV9kZXRlY3RfZGVhZGxvY2soYXJyLCBzdGFydCwgbmV3LCBkZXB0aCk7Ci0KLQkJaWYgKHJldCkg
ewotCQkJcmV0dXJuKFRSVUUpOwotCQl9CisJCXJldHVybihzeW5jX2FycmF5X2RldGVjdF9kZWFk
bG9jayhhcnIsIHN0YXJ0LCBuZXcsIGRlcHRoICsgMSkpOwogCX0KIAlyZXR1cm4oRkFMU0UpOwog
fQoK

--===============1244207851==
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: 78391af81811c0d2e138e821234c645a8434fcaf
# timestamp: 2010-11-16 14:40:02 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   f5ilp7xzdwl8t190
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa8fwroAB+J/lGAw0AB6f///
f+/foL////oEAAgAYA4/e16D7y2u3u869gNRSoEJc87rQGhSiSlLpqtBqzhJJTKbU9TJ5I2SaaaN
GjT1AAaaPU0NMgAAAOYTRkaGhkMI0Mhpo0AGIyZAMIBgGSj9TUFBnqTQ0000AAAGQAAAAABhImRR
iRjU9PU00MJADQ0DQAA0AABFIEGoDRE0p+TGSCnpqaeU9TRpp6I9QaB6gPUeUBFIRoJk0AInpDRp
PU09UaeU00aGQ2o0yAAyOHCLENcPvftZLthG9hggYgD/rVkEo5H7uTG5rBs090cx1GZmAGDmH8Mt
GnXwPhGd7a6et2Vd50kwFVn0qceJdrdzdRHV2HBSWOPEUctAi4moDq+sz4EKkeToXdbFWzNr7HNA
4PfEwT2dlkjAgCJqe/IC5fVujwpwqQVLQdKVCoFTMo2ByzZN7PZaMZIt9z1xLbkOQbhnAqu8HKM4
3DzHn57QOMnGTkJSSQSSASBCQIS0nb0gA4t370jke9PLGZNX0ClZomLBcE3RkUdlVIRZSshwqXC7
LbBE0BNuqakFRVUlUI2oUtlFU1WYY/uAn9o+ADHlDej87kTCvWY8LkKyXOfECkd4IXhqAGICzaUb
QNZ9HqoT+puw9i0QDbs0ktVSqGwmEWC7m5NZUcYy5EgMPhSYfFk4vv9zga9WMOoKmVLyyQEn3x+N
tpedjPczL77Lyn1YZmPtcdT5cOGVWGzrqZsPLyWW+clzasQ06NArt2u666LLrcFizY9zJoBSbsbu
Lj3/GeXKuW6lxZusmyczcxlWa1sAg5WWZnYhF7OCRx7Jl6Dugb/F0en0nCvA3V10EnBlwg7eNPj6
r8WOVvEl1QbYUPc74Q4NSHUQhgCOEMM4QxxcDv4HCKQkShNTkxI0vfkLKteIITSxAehvZIs4vrgQ
1pCbTGwca8mRLWmkBOiVAjFR+ZhhJQDIcPp1gH0x9Vraz+U+B7Q4Bj25XPzRqyhEwJS+6EXRBeSR
ieQiZOsxTHHrv7MWhUG9talxQjByGRnOTR5+fDdbnp+g4iIiEQSwKs/s0exU49gJ73vCOTD6kPt+
uPUtlx3a106+PdEYKwQIeOBJQBKAqUyo/p66/kKWJAsqQA+tE9RKXefCZW2KR1u9eshEyNUHw9GG
FjvipqbBIdRTA2OoubTE0MIy2noPKiWOTyGj7eTwyOoG8AGsqYCrfuzM2EzOlXd3lcUBT0b1BTEA
8bU2xuVhz+ewuKkiFTVPQoiXz1ndS/DWYKlNhsRMTXZKfLhbTAxe+e47Dt4kkNw6yDIpQqy+bbkU
rvu3mCJNl9iJnbSzOUjbHp1kuyXL8TSu3Q4lCqwqbN5ywJ9N52VOh6opZSKpM2ymSjLVbLX5wWND
K6wzK3YWhrnfY6q1Odzyra2crhDcZ56sq3hMx2GRygniYmhUubdMK1Mry9Eu42iY+yCICIiIgiCI
+xQOFDG4zNRqNwhQma9RnffKKm0ldW3HC6ohPaeSDfBYyzneuZImcCVyZa+U3VqJzzmS/5G5EgMy
3CZEoEMjC5ElqKGhvLIOWy7MrF8qmE9NQSdIHeZkstxbAokiCL381C9S02QwbcJB0U3xbCbGZ5SZ
S8aFzaXOAGtNDgiULF7BIuYnm2acC9bRPt3c62K8K7tCRUQ6uU62mltWmsoHGhM4G8psMzXfYRK5
E/blM8j8Jmu+HWZ0TQ2kg2mCJvJnS4035RryrOW6151dDWe2mBWESWorod9dU6cT8AhUy2EaGNiM
TYVl1ymXxpXLJEtqg35eLeh2lpmbMETgcCw/DTxt0uylrpMt1mJutNRq8MDWXomJgSuZkihQpmiZ
V6UnAaaIVNCsGRt13mJo+LSc8yRhTLO6L5SLILZIkckS0qQE6VLyV99szIwKW8esRSvY2HTL20Nx
r75X8JHEn2cTaXG86HWkyZfM0MX8pt1ccY6oki6znEWvOm7GfCk4g12yNhgibpmwrkYCFhxrO+MD
obbbi3p02Ow1WEi4yJmJ6+JILrvd7w8INtvEMYcd0uEPPVFappMCySEXRYBeJFbovRJh9riwwL93
vA7fqYWPl3BxFh2pEEcFnJKtofqfH+NaMz08ET6HPzy5qm1xf3PyQ+CE4b7WwRDARERR94Ec4D+d
f7oe5us6H3jdc/8fITNxbPBQIX5PxE/0wVfmnwc0NamY7skKoUcnSrkaY/P+tTYDBYgbG8kyhD7S
V+watUII+9sLskPrfubDQtU8TWP5hJj0iIrjxfvKYlENqlSSUbcZpD1TdHS8CTBxQkb8fmRKUpZJ
xS6elDmAfWeXl3oT9oXLJEFRQdWdiSKKSVPFHKJAiER5RK4iVVBNyJsJL9NZQGUElMIMNtgoMBNt
huxHiZIDARjJTYScJyFBtj49QSvjz10nHDkIyiiXyUnKRXHhw8Xt2RJEBDgYolSUrYbAslzkJ5L2
3w3HPkcDG4THV0xALv0ftEIVPoVDwPhtR5LeWctUk7i7LNo93Qgeuip7Oh3tzMNwXa6gjqqHbBKq
dknRbdH3TRO7u3HM/Y+YtNx3FpaM8gLZAdbxCUdG2hFYOBmVZwn1JaWpl7iJN+CFsUM/TBBSGM1o
roIbDVBBVEIGREBEHrDoicpPLoc5WHT6wqiURIMS43mSO+NazRIOSJkdhThW7mvwbyPk2GhO3fXP
iQE76Ql84kTRbROCLjUXwhIQhwMbqocZMtsSiAiIgN27UubRlU5e2tep33HEuMjH5PQZoZIc987j
naXK45FCaCcu5E+jiJbzOa7TKCScoinaiZ2h7QO0KkwKkmXxJr2OnNtv9Xs34SieEurS0i0DykMi
cM4ssHnbBizXBm982n3M0Pw4wvpglYwIn3eruKw9mPOcpWZHQ4nsKnoh4cl1rqa6SSUkNF0EkCX7
th8ULxXuJlALebf8rG7jsZwbyvR6mPdzdeGiWEJhXd4RT+cjRU9OA6T1y5um+7vbT+IbK1A87CFk
Zw0w7bebVpBEV80snCpFYZOTzbFHw1Xt1xXtNdhNT1eDNSRK6uOp1AcEgJCbu2DFE9BJn5zqeYmT
NpBTqczxPYzLDAzLjFQ9R2ZGSJnqNA2a0LCYF+zyaMHjwTy9vlPpoFD4riMlqvFJsvMrr65p6YDd
Ks3HctmNnYpaXph49ez0zJdCbKAWpYHt+iREKRBEBZAaSX9PusdrakofDVuUYJnD10aUAgn7OPc9
uxWiCSr5g9AZh8YSAi3g9vmGQQ+MAE0hR8A+lpcTIMMxvBWDwQ9QnVdOjg7WWBv7zhMI8PDtwtWF
YjRd8MKQm7aA/RcIYISE4FBMyp0bA8+FR9e1iq3d/4ZiF3jAhgHcw4IkHuibRU/5uE1AOgDaWhkx
A+LIIE9QWEpI7GkiCsCyVOUk9cLxIckWBDGmFaM+/NBPp2PLSgnbhJzzNC1Mhyc2I9DoJABflxrE
gi+ZqRfRGfgqaPnD7DyAhZd/Rsfo3YB0yd6+XpN1at4O30c554OpmEr4gVD6X0GnHbnn7RDYIbWY
ZRlqGcTZxJKLEo58pzXddLBZM4S4sEmF6TSYnZMKjQoHv8mRS/OJhjDgAw1D3frZ07QwSzSCPCJE
QVQka41skKUaQVDIDLqZgV2Di3+tFPZaN2ZJFS7JBok7egTel3i/iYYfRqQ12POi+ibJLikD2ZBN
Jrsyekcix9vBzm/2RcRKOEnknKCOWAdsvZPuo0Jx8V70dj06BHKYPCxLLFOlBe6Aso79XhCwhQDy
hqHVuoHwMNqW8bqe9524btlmWs4Fns3VahBnBKGGAxgIegyLCLplw2qhd5NzV5umKBu62Oxqv79+
mwDPPg3AdrIS+412nRsuBBCUoQRyBqCxtMoC9HQgMpRuNthjKUBBskKmhixNlMcKSQOi8sjsx+92
LyylpXjTByeGABUDt4rk6BLxmwS5NasKwO1DTqpeqbNpdja3JXseIzeyxeHF3CYnrkZc053502ZZ
CbWV2ZG5m/VSzaJNpxLjpuJT+xwzQ54VW0vAXVrrqQyErCLaJh4mrEywvk7pOkKtM4TFvRegw3js
CxnXwELntvDOJiSfACDFEvkhc46CXBc2v2eQL9BQT8z6EH9ULHskluejCdx3cESnUDGx7BNjvXdo
AVye9DMQ6iHF+ctDzqh2AO84lJnjw4IJGcYqGKkBI6gQLZgBZSzLuZqJEnvnW2gsmu4KhFLOAnEJ
mRk2uhsHcxggYmAVw5WHUpKcGZNcTgIxBUsCCVXGYspl/EuD/F3JFOFCQrx/Cug=


--===============1244207851==--