From: marko.makela
Date: April 6 2011 11:07am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3567)
List-Archive: http://lists.mysql.com/commits/134798
Message-Id: <201104061108.p36B81qj016711@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1404354180=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNjA3MzcxMC11bzRj
MGIzYW82a2Y4M2FoCgogMzU2NyBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTA2CiAgICAgIFJlbW92
ZSB1bnVzZWQgTE9HX0NIRUNLUE9JTlRfRlNQX0ZSRUVfTElNSVQgYW5kIHVzZWxlc3MgY2hlY2tw
b2ludGluZwogICAgICB0aGF0IHdhcyBhZGRlZCBpbiBNeVNRTCAzLjIzLjUwLgogICAgICAKICAg
ICAgQWNjb3JkaW5nIHRvIEhlaWtraSBUdXVyaSwgdGhlIGZpZWxkIExPR19DSEVDS1BPSU5UX0ZT
UF9GUkVFX0xJTUlUIG1heQogICAgICBoYXZlIGJlZW4gdXNlZCBpbiBvcmRlciB0byBzaG9ydGVu
IGJhY2t1cCBmaWxlcyBiZWZvcmUgWmxpYgogICAgICBjb21wcmVzc2lvbiAoaWJiYWNrdXAgLS1j
b21wcmVzcykgd2FzIGltcGxlbWVudGVkIGluIElubm9EQiBIb3QgQmFja3VwCiAgICAgIChub3cg
a25vd24gYXMgTXlTUUwgRW50ZXJwcmlzZSBCYWNrdXApLgogICAgICAKICAgICAgcmVjdl9yZWFk
X2NoZWNrcG9pbnRfaW5mb19mb3JfYmFja3VwKCk6IFJlbmFtZSBmcm9tCiAgICAgIHJlY3ZfcmVh
ZF9jcF9pbmZvX2Zvcl9iYWNrdXAoKSBhbmQgcmVtb3ZlIHRoZSB1bnVzZWQgb3V0cHV0IHBhcmFt
ZXRlcgogICAgICBmc3BfbGltaXQuCiAgICAgIAogICAgICBsb2dfZnNwX2N1cnJlbnRfZnJlZV9s
aW1pdF9zZXRfYW5kX2NoZWNrcG9pbnQoKTogUmVtb3ZlLgogICAgICAKICAgICAgbG9nX2ZzcF9j
dXJyZW50X2ZyZWVfbGltaXQ6IFJlbW92ZS4KICAgICAgCiAgICAgIExPR19DSEVDS1BPSU5UX0ZT
UF9GUkVFX0xJTUlULCBMT0dfQ0hFQ0tQT0lOVF9GU1BfTUFHSUNfTiwKICAgICAgTE9HX0NIRUNL
UE9JTlRfRlNQX01BR0lDX05fVkFMOiBSZW1vdmUuCiAgICAgIAogICAgICBmc3BfaGVhZGVyX2dl
dF9mcmVlX2xpbWl0KCk6IFJlbW92ZS4KICAgICAgCiAgICAgIGZzcF9maWxsX2ZyZWVfbGlzdCgp
OiBObyBsb25nZXIgbWFrZSBhIHJlZG8gbG9nIGNoZWNrcG9pbnQuCiAgICAgIFByZXZpb3VzbHks
IHdlIGRpZCB0aGF0IHdoZW4gZXh0ZW5kaW5nIHRoZSBzeXN0ZW0gdGFibGVzcGFjZSAoc3BhY2Ug
MCkuCiAgICAgIAogICAgICByYjo2NDMgYXBwcm92ZWQgYnkgSmltbXkgWWFuZwoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2ZzcC9mc3AwZnNwLmMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2ZzcDBmc3AuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
bG9nMGxvZy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBsb2cuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL2xvZy9sb2cwcmVjdi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny
djBzdGFydC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2ZzcC9mc3AwZnNw
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZnNwL2ZzcDBmc3AuYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDQwNjA3MzcxMC11bzRjMGIzYW82a2Y4M2FoCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvZnNwL2ZzcDBmc3AuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDQwNjExMDc0NC1jZnVvYjNsZmRwOGJ1Nm1vCkBAIC0xMDk3LDM4ICsxMDk3LDYgQEAgZnNw
X2hlYWRlcl9pbmNfc2l6ZSgKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1HZXRzIHRoZSBjdXJy
ZW50IGZyZWUgbGltaXQgb2YgdGhlIHN5c3RlbSB0YWJsZXNwYWNlLiAgVGhlIGZyZWUgbGltaXQK
LW1lYW5zIHRoZSBwbGFjZSBvZiB0aGUgZmlyc3QgcGFnZSB3aGljaCBoYXMgbmV2ZXIgYmVlbiBw
dXQgdG8gdGhlCi1mcmVlIGxpc3QgZm9yIGFsbG9jYXRpb24uICBUaGUgc3BhY2UgYWJvdmUgdGhh
dCBhZGRyZXNzIGlzIGluaXRpYWxpemVkCi10byB6ZXJvLiAgU2V0cyBhbHNvIHRoZSBnbG9iYWwg
dmFyaWFibGUgbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXQuCi1AcmV0dXJuCWZyZWUgbGltaXQg
aW4gbWVnYWJ5dGVzICovCi1VTklWX0lOVEVSTgotdWxpbnQKLWZzcF9oZWFkZXJfZ2V0X2ZyZWVf
bGltaXQodm9pZCkKLS8qPT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLXsKLQlmc3BfaGVh
ZGVyX3QqCWhlYWRlcjsKLQl1bGludAkJbGltaXQ7Ci0JbXRyX3QJCW10cjsKLQotCW10cl9zdGFy
dCgmbXRyKTsKLQotCW10cl94X2xvY2soZmlsX3NwYWNlX2dldF9sYXRjaCgwLCBOVUxMKSwgJm10
cik7Ci0KLQloZWFkZXIgPSBmc3BfZ2V0X3NwYWNlX2hlYWRlcigwLCAwLCAmbXRyKTsKLQotCWxp
bWl0ID0gbXRyX3JlYWRfdWxpbnQoaGVhZGVyICsgRlNQX0ZSRUVfTElNSVQsIE1MT0dfNEJZVEVT
LCAmbXRyKTsKLQotCWxpbWl0IC89ICgoMTAyNCAqIDEwMjQpIC8gVU5JVl9QQUdFX1NJWkUpOwot
Ci0JbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXRfc2V0X2FuZF9jaGVja3BvaW50KGxpbWl0KTsK
LQotCW10cl9jb21taXQoJm10cik7Ci0KLQlyZXR1cm4obGltaXQpOwotfQotCi0vKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKIEdldHMgdGhlIHNpemUgb2YgdGhlIHN5c3RlbSB0YWJsZXNwYWNlIGZyb20gdGhl
IHRhYmxlc3BhY2UgaGVhZGVyLiAgSWYKIHdlIGRvIG5vdCBoYXZlIGFuIGF1dG8tZXh0ZW5kaW5n
IGRhdGEgZmlsZSwgdGhpcyBzaG91bGQgYmUgZXF1YWwgdG8KIHRoZSBzaXplIG9mIHRoZSBkYXRh
IGZpbGVzLiAgSWYgdGhlcmUgaXMgYW4gYXV0by1leHRlbmRpbmcgZGF0YSBmaWxlLApAQCAtMTM5
NSwxNSArMTM2Myw2IEBAIGZzcF9maWxsX2ZyZWVfbGlzdCgKIAkJbWxvZ193cml0ZV91bGludCho
ZWFkZXIgKyBGU1BfRlJFRV9MSU1JVCwgaSArIEZTUF9FWFRFTlRfU0laRSwKIAkJCQkgTUxPR180
QllURVMsIG10cik7CiAKLQkJLyogVXBkYXRlIHRoZSBmcmVlIGxpbWl0IGluZm8gaW4gdGhlIGxv
ZyBzeXN0ZW0gYW5kIG1ha2UKLQkJYSBjaGVja3BvaW50ICovCi0JCWlmIChzcGFjZSA9PSAwKSB7
Ci0JCQl1dF9hKCF6aXBfc2l6ZSk7Ci0JCQlsb2dfZnNwX2N1cnJlbnRfZnJlZV9saW1pdF9zZXRf
YW5kX2NoZWNrcG9pbnQoCi0JCQkJKGkgKyBGU1BfRVhURU5UX1NJWkUpCi0JCQkJLyAoKDEwMjQg
KiAxMDI0KSAvIFVOSVZfUEFHRV9TSVpFKSk7Ci0JCX0KLQogCQlpZiAoVU5JVl9VTkxJS0VMWShp
bml0X3hkZXMpKSB7CiAKIAkJCWJ1Zl9ibG9ja190KglibG9jazsKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZnNwMGZzcC5oJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZnNwMGZzcC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
NDA2MDczNzEwLXVvNGMwYjNhbzZrZjgzYWgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L2ZzcDBmc3AuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNjExMDc0NC1j
ZnVvYjNsZmRwOGJ1Nm1vCkBAIC00MSwxNiArNDEsNiBAQCB2b2lkCiBmc3BfaW5pdCh2b2lkKTsK
IC8qPT09PT09PT09PSovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLUdldHMgdGhlIGN1cnJlbnQgZnJl
ZSBsaW1pdCBvZiB0aGUgc3lzdGVtIHRhYmxlc3BhY2UuICBUaGUgZnJlZSBsaW1pdAotbWVhbnMg
dGhlIHBsYWNlIG9mIHRoZSBmaXJzdCBwYWdlIHdoaWNoIGhhcyBuZXZlciBiZWVuIHB1dCB0byB0
aGUKLWZyZWUgbGlzdCBmb3IgYWxsb2NhdGlvbi4gIFRoZSBzcGFjZSBhYm92ZSB0aGF0IGFkZHJl
c3MgaXMgaW5pdGlhbGl6ZWQKLXRvIHplcm8uICBTZXRzIGFsc28gdGhlIGdsb2JhbCB2YXJpYWJs
ZSBsb2dfZnNwX2N1cnJlbnRfZnJlZV9saW1pdC4KLUByZXR1cm4JZnJlZSBsaW1pdCBpbiBtZWdh
Ynl0ZXMgKi8KLVVOSVZfSU5URVJOCi11bGludAotZnNwX2hlYWRlcl9nZXRfZnJlZV9saW1pdCh2
b2lkKTsKLS8qPT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLS8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgogR2V0cyB0aGUgc2l6ZSBvZiB0aGUgc3lzdGVtIHRhYmxlc3BhY2UgZnJvbSB0aGUgdGFibGVz
cGFjZSBoZWFkZXIuICBJZgogd2UgZG8gbm90IGhhdmUgYW4gYXV0by1leHRlbmRpbmcgZGF0YSBm
aWxlLCB0aGlzIHNob3VsZCBiZSBlcXVhbCB0bwogdGhlIHNpemUgb2YgdGhlIGRhdGEgZmlsZXMu
ICBJZiB0aGVyZSBpcyBhbiBhdXRvLWV4dGVuZGluZyBkYXRhIGZpbGUsCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvZzBsb2cuaCcKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2xvZzBsb2cuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDQwNjA3MzcxMC11bzRjMGIzYW82a2Y4M2FoCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9sb2cwbG9nLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYxMTA3
NDQtY2Z1b2IzbGZkcDhidTZtbwpAQCAtNjksMTcgKzY5LDYgQEAgZXh0ZXJuCWlib29sCWxvZ19k
ZWJ1Z193cml0ZXM7CiAvKiogTWF4aW11bSBudW1iZXIgb2YgbG9nIGdyb3VwcyBpbiBsb2dfZ3Jv
dXBfc3RydWN0OjpjaGVja3BvaW50X2J1ZiAqLwogI2RlZmluZSBMT0dfTUFYX05fR1JPVVBTCTMy
CiAKLSNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotU2V0cyB0aGUgZ2xvYmFs
IHZhcmlhYmxlIGxvZ19mc3BfY3VycmVudF9mcmVlX2xpbWl0LiBBbHNvIG1ha2VzIGEgY2hlY2tw
b2ludCwKLXNvIHRoYXQgd2Uga25vdyB0aGF0IHRoZSBsaW1pdCBoYXMgYmVlbiB3cml0dGVuIHRv
IGEgbG9nIGNoZWNrcG9pbnQgZmllbGQKLW9uIGRpc2suICovCi1VTklWX0lOVEVSTgotdm9pZAot
bG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXRfc2V0X2FuZF9jaGVja3BvaW50KAotLyo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCXVsaW50CWxpbWl0KTsJLyoh
PCBpbjogbGltaXQgdG8gc2V0ICovCi0jZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKIENhbGN1bGF0ZXMgd2hlcmUgaW4gbG9nIGZpbGVzIHdlIGZpbmQgYSBzcGVj
aWZpZWQgbHNuLgogQHJldHVybglsb2cgZmlsZSBudW1iZXIgKi8KQEAgLTYzOCwyMyArNjI3LDM4
IEBAIGV4dGVybiBsb2dfdCoJbG9nX3N5czsKIAkJCQkJCQkrIExPR19NQVhfTl9HUk9VUFMgKiA4
KQogI2RlZmluZSBMT0dfQ0hFQ0tQT0lOVF9DSEVDS1NVTV8xCUxPR19DSEVDS1BPSU5UX0FSUkFZ
X0VORAogI2RlZmluZSBMT0dfQ0hFQ0tQT0lOVF9DSEVDS1NVTV8yCSg0ICsgTE9HX0NIRUNLUE9J
TlRfQVJSQVlfRU5EKQorI2lmIDAKICNkZWZpbmUgTE9HX0NIRUNLUE9JTlRfRlNQX0ZSRUVfTElN
SVQJKDggKyBMT0dfQ0hFQ0tQT0lOVF9BUlJBWV9FTkQpCi0JCQkJCS8qIGN1cnJlbnQgZnNwIGZy
ZWUgbGltaXQgaW4KKwkJCQkJLyohPCBOb3QgdXNlZCAoMCk7CisJCQkJCVRoaXMgdXNlZCB0byBj
b250YWluIHRoZQorCQkJCQljdXJyZW50IGZzcCBmcmVlIGxpbWl0IGluCiAJCQkJCXRhYmxlc3Bh
Y2UgMCwgaW4gdW5pdHMgb2Ygb25lCi0JCQkJCW1lZ2FieXRlOyB0aGlzIGluZm9ybWF0aW9uIGlz
IG9ubHkgdXNlZAotCQkJCQlieSBpYmJhY2t1cCB0byBkZWNpZGUgaWYgaXQgY2FuCi0JCQkJCXRy
dW5jYXRlIHVudXNlZCBlbmRzIG9mCi0JCQkJCW5vbi1hdXRvLWV4dGVuZGluZyBkYXRhIGZpbGVz
IGluIHNwYWNlCi0JCQkJCTAgKi8KKwkJCQkJbWVnYWJ5dGUuCisKKwkJCQkJVGhpcyBpbmZvcm1h
dGlvbiBtaWdodCBoYXZlIGJlZW4gdXNlZAorCQkJCQlzaW5jZSBpYmJhY2t1cCB2ZXJzaW9uIDAu
MzUgYnV0CisJCQkJCWJlZm9yZSAxLjQxIHRvIGRlY2lkZSBpZiB1bnVzZWQgZW5kcyBvZgorCQkJ
CQlub24tYXV0by1leHRlbmRpbmcgZGF0YSBmaWxlcworCQkJCQlpbiBzcGFjZSAwIGNhbiBiZSB0
cnVuY2F0ZWQuCisKKwkJCQkJVGhpcyBpbmZvcm1hdGlvbiB3YXMgbWFkZSBvYnNvbGV0ZQorCQkJ
CQlieSBpYmJhY2t1cCAtLWNvbXByZXNzLiAqLwogI2RlZmluZSBMT0dfQ0hFQ0tQT0lOVF9GU1Bf
TUFHSUNfTgkoMTIgKyBMT0dfQ0hFQ0tQT0lOVF9BUlJBWV9FTkQpCi0JCQkJCS8qIHRoaXMgbWFn
aWMgbnVtYmVyIHRlbGxzIGlmIHRoZQorCQkJCQkvKiE8IE5vdCB1c2VkICgwKTsKKwkJCQkJVGhp
cyBtYWdpYyBudW1iZXIgdGVsbHMgaWYgdGhlCiAJCQkJCWNoZWNrcG9pbnQgY29udGFpbnMgdGhl
IGFib3ZlIGZpZWxkOgogCQkJCQl0aGUgZmllbGQgd2FzIGFkZGVkIHRvCi0JCQkJCUlubm9EQi0z
LjIzLjUwICovCisJCQkJCUlubm9EQi0zLjIzLjUwIGFuZAorCQkJCQlyZW1vdmVkIGZyb20gTXlT
UUwgNS42ICovCisjZGVmaW5lIExPR19DSEVDS1BPSU5UX0ZTUF9NQUdJQ19OX1ZBTAkxNDQxMjMx
MjQzCisJCQkJCS8qITwgaWYgTE9HX0NIRUNLUE9JTlRfRlNQX01BR0lDX04KKwkJCQkJY29udGFp
bnMgdGhpcyB2YWx1ZSwgdGhlbgorCQkJCQlMT0dfQ0hFQ0tQT0lOVF9GU1BfRlJFRV9MSU1JVAor
CQkJCQlpcyB2YWxpZCAqLworI2VuZGlmCiAjZGVmaW5lIExPR19DSEVDS1BPSU5UX09GRlNFVF9I
SUdIMzIJKDE2ICsgTE9HX0NIRUNLUE9JTlRfQVJSQVlfRU5EKQogI2RlZmluZSBMT0dfQ0hFQ0tQ
T0lOVF9TSVpFCQkoMjAgKyBMT0dfQ0hFQ0tQT0lOVF9BUlJBWV9FTkQpCiAKLSNkZWZpbmUgTE9H
X0NIRUNLUE9JTlRfRlNQX01BR0lDX05fVkFMCTE0NDEyMzEyNDMKIAogLyogT2Zmc2V0cyBvZiBh
IGxvZyBmaWxlIGhlYWRlciAqLwogI2RlZmluZSBMT0dfR1JPVVBfSUQJCTAJLyogbG9nIGdyb3Vw
IG51bWJlciAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBs
b2cuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMGxvZy5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNDA2MDczNzEwLXVvNGMwYjNhbzZrZjgzYWgKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9sb2cvbG9nMGxvZy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwNDA2MTEwNzQ0LWNmdW9iM2xmZHA4YnU2bW8KQEAgLTc2LDEwICs3Niw2IEBAIHJlZHVj
ZSB0aGUgc2l6ZSBvZiB0aGUgbG9nLgogCiAqLwogCi0vKiBDdXJyZW50IGZyZWUgbGltaXQgb2Yg
c3BhY2UgMDsgcHJvdGVjdGVkIGJ5IHRoZSBsb2cgc3lzIG11dGV4OyAwIG1lYW5zCi11bmluaXRp
YWxpemVkICovCi1VTklWX0lOVEVSTiB1bGludAlsb2dfZnNwX2N1cnJlbnRfZnJlZV9saW1pdAkJ
PSAwOwotCiAvKiBHbG9iYWwgbG9nIHN5c3RlbSB2YXJpYWJsZSAqLwogVU5JVl9JTlRFUk4gbG9n
X3QqCWxvZ19zeXMJPSBOVUxMOwogCkBAIC0xNjUsMzMgKzE2MSw2IEBAIGxvZ19pb19jb21wbGV0
ZV9hcmNoaXZlKHZvaWQpOwogI2VuZGlmIC8qIFVOSVZfTE9HX0FSQ0hJVkUgKi8KIAogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCi1TZXRzIHRoZSBnbG9iYWwgdmFyaWFibGUgbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGlt
aXQuIEFsc28gbWFrZXMgYSBjaGVja3BvaW50LAotc28gdGhhdCB3ZSBrbm93IHRoYXQgdGhlIGxp
bWl0IGhhcyBiZWVuIHdyaXR0ZW4gdG8gYSBsb2cgY2hlY2twb2ludCBmaWVsZAotb24gZGlzay4g
Ki8KLVVOSVZfSU5URVJOCi12b2lkCi1sb2dfZnNwX2N1cnJlbnRfZnJlZV9saW1pdF9zZXRfYW5k
X2NoZWNrcG9pbnQoCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PSovCi0JdWxpbnQJbGltaXQpCS8qITwgaW46IGxpbWl0IHRvIHNldCAqLwotewotCWlib29sCXN1
Y2Nlc3M7Ci0KLQltdXRleF9lbnRlcigmKGxvZ19zeXMtPm11dGV4KSk7Ci0KLQlsb2dfZnNwX2N1
cnJlbnRfZnJlZV9saW1pdCA9IGxpbWl0OwotCi0JbXV0ZXhfZXhpdCgmKGxvZ19zeXMtPm11dGV4
KSk7Ci0KLQkvKiBUcnkgdG8gbWFrZSBhIHN5bmNocm9ub3VzIGNoZWNrcG9pbnQgKi8KLQotCXN1
Y2Nlc3MgPSBGQUxTRTsKLQotCXdoaWxlICghc3VjY2VzcykgewotCQlzdWNjZXNzID0gbG9nX2No
ZWNrcG9pbnQoVFJVRSwgVFJVRSk7Ci0JfQotfQotCi0vKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgdGhl
IG9sZGVzdCBtb2RpZmllZCBibG9jayBsc24gaW4gdGhlIHBvb2wsIG9yIGxvZ19zeXMtPmxzbiBp
ZiBub25lCiBleGlzdHMuCiBAcmV0dXJuCUxTTiBvZiBvbGRlc3QgbW9kaWZpY2F0aW9uICovCkBA
IC0xODQwLDE1ICsxODA5LDYgQEAgbG9nX2dyb3VwX2NoZWNrcG9pbnQoCiAJCQkgICAgICBMT0df
Q0hFQ0tQT0lOVF9DSEVDS1NVTV8yIC0gTE9HX0NIRUNLUE9JTlRfTFNOKTsKIAltYWNoX3dyaXRl
X3RvXzQoYnVmICsgTE9HX0NIRUNLUE9JTlRfQ0hFQ0tTVU1fMiwgZm9sZCk7CiAKLQkvKiBTdGFy
dGluZyBmcm9tIElubm9EQi0zLjIzLjUwLCB3ZSBhbHNvIHdyaXRlIGluZm8gb24gYWxsb2NhdGVk
Ci0Jc2l6ZSBpbiB0aGUgdGFibGVzcGFjZSAqLwotCi0JbWFjaF93cml0ZV90b180KGJ1ZiArIExP
R19DSEVDS1BPSU5UX0ZTUF9GUkVFX0xJTUlULAotCQkJbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGlt
aXQpOwotCi0JbWFjaF93cml0ZV90b180KGJ1ZiArIExPR19DSEVDS1BPSU5UX0ZTUF9NQUdJQ19O
LAotCQkJTE9HX0NIRUNLUE9JTlRfRlNQX01BR0lDX05fVkFMKTsKLQogCS8qIFdlIGFsdGVybmF0
ZSB0aGUgcGh5c2ljYWwgcGxhY2Ugb2YgdGhlIGNoZWNrcG9pbnQgaW5mbyBpbiB0aGUgZmlyc3QK
IAlsb2cgZmlsZSAqLwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2cv
bG9nMHJlY3YuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNjA3MzcxMC11bzRjMGIzYW82a2Y4M2FoCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzByZWN2LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MDYxMTA3NDQtY2Z1b2IzbGZkcDhidTZtbwpAQCAtNzYyLDE1ICs3NjIs
MTIgQEAgUmVhZHMgdGhlIGNoZWNrcG9pbnQgaW5mbyBuZWVkZWQgaW4gaG90CiBAcmV0dXJuCVRS
VUUgaWYgc3VjY2VzcyAqLwogVU5JVl9JTlRFUk4KIGlib29sCi1yZWN2X3JlYWRfY3BfaW5mb19m
b3JfYmFja3VwKAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09Ki8KK3JlY3ZfcmVhZF9jaGVj
a3BvaW50X2luZm9fZm9yX2JhY2t1cCgKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ki8KIAljb25zdCBieXRlKgloZHIsCS8qITwgaW46IGJ1ZmZlciBjb250YWluaW5nIHRoZSBs
b2cgZ3JvdXAKIAkJCQloZWFkZXIgKi8KIAlsc25fdCoJCWxzbiwJLyohPCBvdXQ6IGNoZWNrcG9p
bnQgbHNuICovCiAJbHNuX3QqCQlvZmZzZXQsCS8qITwgb3V0OiBjaGVja3BvaW50IG9mZnNldCBp
biB0aGUgbG9nIGdyb3VwICovCi0JdWxpbnQqCQlmc3BfbGltaXQsLyohPCBvdXQ6IGZzcCBsaW1p
dCBvZiBzcGFjZSAwLAotCQkJCTEwMDAwMDAwMDAgaWYgdGhlIGRhdGFiYXNlIGlzIHJ1bm5pbmcK
LQkJCQl3aXRoIDwgdmVyc2lvbiAzLjIzLjUwIG9mIElubm9EQiAqLwogCWliX3VpbnQ2NF90Kglj
cF9ubywJLyohPCBvdXQ6IGNoZWNrcG9pbnQgbnVtYmVyICovCiAJaWJfdWludDY0X3QqCWZpcnN0
X2hlYWRlcl9sc24pCiAJCQkJLyohPCBvdXQ6IGxzbiBvZiBvZiB0aGUgc3RhcnQgb2YgdGhlCkBA
IC04MDcsMjMgKzgwNCw2IEBAIHJlY3ZfcmVhZF9jcF9pbmZvX2Zvcl9iYWNrdXAoCiAJKm9mZnNl
dCB8PSBtYWNoX3JlYWRfZnJvbV80KAogCQljcF9idWYgKyBMT0dfQ0hFQ0tQT0lOVF9PRkZTRVRf
SElHSDMyKSA8PCAzMjsKIAotCS8qIElmIHRoZSB1c2VyIGlzIHJ1bm5pbmcgYSBwcmUtMy4yMy41
MCB2ZXJzaW9uIG9mIElubm9EQiwgaXRzCi0JY2hlY2twb2ludCBkYXRhIGRvZXMgbm90IGNvbnRh
aW4gdGhlIGZzcCBsaW1pdCBpbmZvICovCi0JaWYgKG1hY2hfcmVhZF9mcm9tXzQoY3BfYnVmICsg
TE9HX0NIRUNLUE9JTlRfRlNQX01BR0lDX04pCi0JICAgID09IExPR19DSEVDS1BPSU5UX0ZTUF9N
QUdJQ19OX1ZBTCkgewotCi0JCSpmc3BfbGltaXQgPSBtYWNoX3JlYWRfZnJvbV80KAotCQkJY3Bf
YnVmICsgTE9HX0NIRUNLUE9JTlRfRlNQX0ZSRUVfTElNSVQpOwotCi0JCWlmICgqZnNwX2xpbWl0
ID09IDApIHsKLQkJCSpmc3BfbGltaXQgPSAxMDAwMDAwMDAwOwotCQl9Ci0JfSBlbHNlIHsKLQkJ
KmZzcF9saW1pdCA9IDEwMDAwMDAwMDA7Ci0JfQotCi0JLyoJZnByaW50ZihzdGRlcnIsICJmc3Ag
bGltaXQgJWx1IE1CXG4iLCAqZnNwX2xpbWl0KTsgKi8KLQogCSpjcF9ubyA9IG1hY2hfcmVhZF9m
cm9tXzgoY3BfYnVmICsgTE9HX0NIRUNLUE9JTlRfTk8pOwogCiAJKmZpcnN0X2hlYWRlcl9sc24g
PSBtYWNoX3JlYWRfZnJvbV84KGhkciArIExPR19GSUxFX1NUQVJUX0xTTik7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwNDA2MDczNzEwLXVvNGMwYjNhbzZrZjgzYWgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYv
c3J2MHN0YXJ0LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYxMTA3NDQt
Y2Z1b2IzbGZkcDhidTZtbwpAQCAtMTY3OCwxMCArMTY3OCw2IEBAIGlubm9iYXNlX3N0YXJ0X29y
X2NyZWF0ZV9mb3JfbXlzcWwodm9pZCkKIAogCQlzcnZfc3RhcnR1cF9pc19iZWZvcmVfdHJ4X3Jv
bGxiYWNrX3BoYXNlID0gRkFMU0U7CiAKLQkJLyogSW5pdGlhbGl6ZSB0aGUgZnNwIGZyZWUgbGlt
aXQgZ2xvYmFsIHZhcmlhYmxlIGluIHRoZSBsb2cKLQkJc3lzdGVtICovCi0JCWZzcF9oZWFkZXJf
Z2V0X2ZyZWVfbGltaXQoKTsKLQogCQlyZWN2X3JlY292ZXJ5X2Zyb21fYXJjaGl2ZV9maW5pc2go
KTsKICNlbmRpZiAvKiBVTklWX0xPR19BUkNISVZFICovCiAJfSBlbHNlIHsKQEAgLTE3MzksMTAg
KzE3MzUsNiBAQCBpbm5vYmFzZV9zdGFydF9vcl9jcmVhdGVfZm9yX215c3FsKHZvaWQpCiAKIAkJ
dHJ4X3B1cmdlX3N5c19jcmVhdGUoc3J2X25fcHVyZ2VfdGhyZWFkcywgaWJfYmgpOwogCi0JCS8q
IEluaXRpYWxpemUgdGhlIGZzcCBmcmVlIGxpbWl0IGdsb2JhbCB2YXJpYWJsZSBpbiB0aGUgbG9n
Ci0JCXN5c3RlbSAqLwotCQlmc3BfaGVhZGVyX2dldF9mcmVlX2xpbWl0KCk7Ci0KIAkJLyogcmVj
dl9yZWNvdmVyeV9mcm9tX2NoZWNrcG9pbnRfZmluaXNoIG5lZWRzIHRyeCBsaXN0cyB3aGljaAog
CQlhcmUgaW5pdGlhbGl6ZWQgaW4gdHJ4X3N5c19pbml0X2F0X2RiX3N0YXJ0KCkuICovCiAKCg==

--===============1404354180==
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.6-innodb/
# testament_sha1: e48519f7d896e3f26f0332eb4049671c2da4f61d
# timestamp: 2011-04-06 14:07:56 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   uo4c0b3ao6kf83ah
# 
# Begin bundle
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


--===============1404354180==--