From: marko.makela
Date: January 24 2011 12:52pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3455) WL#5458
List-Archive: http://lists.mysql.com/commits/129440
Message-Id: <201101241252.p0OCpmgg005824@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0702946088=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNDExMzkwOS1zdTUx
ZWV2cmVrb3YwYmd0CgogMzQ1NSBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI0CiAgICAgIEZpeCBz
b21lIHRoaW5ncyBhZnRlciBXTCM1NDU4LgogICAgICAKICAgICAgbG9ja19yZWNfdmFsaWRhdGVf
cGFnZSgpOiBSZW5hbWUgdGhlIG1pc2xlYWRpbmcgcGFyYW1ldGVyCiAgICAgIGhhdmVfbG9ja190
cnhfc3lzX211dGV4IHRvIGxvY2tlZF9sb2NrX3RyeF9zeXMuIFRoZXJlIGlzIG5vCiAgICAgIHRy
eF9zeXMtPm11dGV4LCBpdCBpcyB0cnhfc3lzLT5sb2NrLgogICAgICAKICAgICAgbG9ja19zeXNf
Y3JlYXRlKCk6IFJlbW92ZSBzb21lIGNvbW1lbnRlZC1vdXQgY29kZS4KICAgICAgCiAgICAgIGxv
Y2tfc2V0X2xvY2tfYW5kX3RyeF93YWl0KCk6IEFkZCBkZWJ1ZyBhc3NlcnRpb25zLiBBc3NlcnQg
dGhhdAogICAgICB0cngtPm11dGV4IGlzIGJlaW5nIGhlbGQuIFByZXZpb3VzbHksIHRoaXMgY29u
c3RyYWludCB3YXMgYmVpbmcKICAgICAgdmlvbGF0ZWQuCiAgICAgIAogICAgICBsb2NrX3JlY19j
cmVhdGUoKTogQWRkIGRlYnVnIGFzc2VydGlvbnMuIFByb3RlY3QKICAgICAgbG9ja19zZXRfbG9j
a19hbmRfdHJ4X3dhaXQoKSB3aXRoIHRyeC0+bXV0ZXguCiAgICAgIAogICAgICBsb2NrX3JlY19h
ZGRfdG9fcXVldWUoKTogQWRkIGEgZGVidWcgYXNzZXJ0aW9uIG9uIGNhbGxlcl9vd25zX3RyeF9t
dXRleC4KICAgICAgCiAgICAgIGxvY2tfbW92ZV9yZWNfbGlzdF9lbmQoKTogUmVtb3ZlIHVubmVj
ZXNzYXJ5IGFjcXVpc2l0aW9uIG9mIHRyeC0+bXV0ZXgKICAgICAgYXJvdW5kIGxvY2tfcmVzZXRf
bG9ja19hbmRfdHJ4X3dhaXQoKS4gQSBydW5uaW5nIHRyYW5zYWN0aW9uIGNhbm5vdAogICAgICBo
YXZlIGxvY2sgd2FpdHM7IHRoZXJlZm9yZSB0aGUgbG9jayB3YWl0cyBjYW4gc2FmZWx5IGJlIHJl
c2V0IHdoaWxlCiAgICAgIHRoZSB0cmFuc2FjdGlvbiBpcyBub3QgcnVubmluZywgd2hpbGUgaG9s
ZGluZyBqdXN0IGxvY2tfc3lzLT5tdXRleC4KICAgICAgCiAgICAgIGxvY2tfZGVhZGxvY2tfcmVj
dXJzaXZlKCk6IFByb3RlY3QKICAgICAgdHJ4LT5sb2NrLndhc19jaG9zZW5fYXNfZGVhZGxvY2tf
dmljdGltIHdpdGggdHJ4LT5tdXRleC4KICAgICAgCiAgICAgIGxvY2tfcmVjX3F1ZXVlX3ZhbGlk
YXRlKCk6IFJlbmFtZSBoYXZlX2xvY2tfdHJ4X3N5c19tdXRleCB0bwogICAgICBsb2NrZWRfbG9j
a190cnhfc3lzLiBBZGQgZGVidWcgYXNzZXJ0aW9ucy4gUmVtb3ZlIHNvbWUgZHVwbGljYXRlZCBj
b2RlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2Nr
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYycK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTEwMTI0MTEzOTA5LXN1NTFlZXZyZWtvdjBiZ3QKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwMTI0MTI1MjI2LXRlY2pnb2RhOHVyejVsa24KQEAgLTM2OCwxNCArMzY4LDEzIEBAIHN0
YXRpYwogaWJvb2wKIGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoCiAvKj09PT09PT09PT09PT09PT09
PT0qLwotCWlib29sCWhhdmVfbG9ja190cnhfc3lzX211dGV4LAkvKiE8IGluOiBpZiB0aGUgY2Fs
bGVyIGhvbGRzCi0JCQkJCQlib3RoIHRoZSBsb2NrIG11dGV4IGFuZAotCQkJCQkJdHJ4X3N5c190
Ojpsb2NrLiAqLwotCXVsaW50CXNwYWNlLAkJCQkvKiE8IGluOiBzcGFjZSBpZCAqLwotCXVsaW50
CXppcF9zaXplLAkJCS8qITwgaW46IGNvbXByZXNzZWQgcGFnZSBzaXplCi0JCQkJCQlpbiBieXRl
cyBvciAwIGZvciB1bmNvbXByZXNzZWQKLQkJCQkJCXBhZ2VzICovCi0JdWxpbnQJcGFnZV9ubyk7
CQkJLyohPCBpbjogcGFnZSBudW1iZXIgKi8KKwlpYm9vbAlsb2NrZWRfbG9ja190cnhfc3lzLAkv
KiE8IGluOiBpZiB0aGUgY2FsbGVyIGhvbGRzCisJCQkJCWJvdGggdGhlIGxvY2sgbXV0ZXggYW5k
CisJCQkJCXRyeF9zeXNfdC0+bG9jay4gKi8KKwl1bGludAlzcGFjZSwJCQkvKiE8IGluOiBzcGFj
ZSBpZCAqLworCXVsaW50CXppcF9zaXplLAkJLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUK
KwkJCQkJaW4gYnl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2VkIHBhZ2VzICovCisJdWxpbnQJcGFn
ZV9ubyk7CQkvKiE8IGluOiBwYWdlIG51bWJlciAqLwogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8K
IAogLyogVGhlIGxvY2sgc3lzdGVtICovCkBAIC01ODcsMTAgKzU4NiwxMCBAQCBsb2NrX3N5c19j
cmVhdGUoCiAJc3J2X25fbG9ja193YWl0X3RpbWUgPSAwOwogCXNydl9uX2xvY2tfbWF4X3dhaXRf
dGltZSA9IDA7CiAJc3J2X2xvY2tfdGltZW91dF9hY3RpdmUgPSBGQUxTRTsKLQlzcnZfbl9sb2Nr
X3dhaXRfY3VycmVudF9jb3VudAk9IDA7CisJc3J2X25fbG9ja193YWl0X2N1cnJlbnRfY291bnQg
PSAwOwogCi0JbG9ja19zeXNfc3ogPSBzaXplb2YoKmxvY2tfc3lzKSAKLQkJICAgICsgKE9TX1RI
UkVBRF9NQVhfTiAqIHNpemVvZihzcnZfc2xvdF90KSk7CisJbG9ja19zeXNfc3ogPSBzaXplb2Yo
KmxvY2tfc3lzKQorCQkrIE9TX1RIUkVBRF9NQVhfTiAqIHNpemVvZihzcnZfc2xvdF90KTsKIAog
CWxvY2tfc3lzID0gbWVtX3phbGxvYyhsb2NrX3N5c19zeik7CiAKQEAgLTYwNSw4ICs2MDQsNiBA
QCBsb2NrX3N5c19jcmVhdGUoCiAKIAlsb2NrX3N5cy0+cmVjX2hhc2ggPSBoYXNoX2NyZWF0ZShu
X2NlbGxzKTsKIAotCS8qIGhhc2hfY3JlYXRlX211dGV4ZXMobG9ja19zeXMtPnJlY19oYXNoLCAy
LCBTWU5DX1JFQ19MT0NLKTsgKi8KLQogCWxvY2tfbGF0ZXN0X2Vycl9maWxlID0gb3NfZmlsZV9j
cmVhdGVfdG1wZmlsZSgpOwogCXV0X2EobG9ja19sYXRlc3RfZXJyX2ZpbGUpOwogCkBAIC04MjUs
NyArODIyLDEwIEBAIGxvY2tfc2V0X2xvY2tfYW5kX3RyeF93YWl0KAogCXRyeF90Kgl0cngpCS8q
ITwgaW4vb3V0OiB0cnggKi8KIHsKIAl1dF9hZChsb2NrKTsKKwl1dF9hZChsb2NrLT50cnggPT0g
dHJ4KTsKIAl1dF9hZCh0cngtPmxvY2sud2FpdF9sb2NrID09IE5VTEwpOworCXV0X2FkKGxvY2tf
bXV0ZXhfb3duKCkpOworCXV0X2FkKHRyeF9tdXRleF9vd24odHJ4KSk7CiAKIAl0cngtPmxvY2su
d2FpdF9sb2NrID0gbG9jazsKIAlsb2NrLT50eXBlX21vZGUgfD0gTE9DS19XQUlUOwpAQCAtMTcy
MSw2ICsxNzIxLDcgQEAgbG9ja19yZWNfY3JlYXRlKAogCWNvbnN0IHBhZ2VfdCoJcGFnZTsKIAog
CXV0X2FkKGxvY2tfbXV0ZXhfb3duKCkpOworCXV0X2FkKGNhbGxlcl9vd25zX3RyeF9tdXRleCA9
PSB0cnhfbXV0ZXhfb3duKHRyeCkpOwogCiAJc3BhY2UgPSBidWZfYmxvY2tfZ2V0X3NwYWNlKGJs
b2NrKTsKIAlwYWdlX25vCT0gYnVmX2Jsb2NrX2dldF9wYWdlX25vKGJsb2NrKTsKQEAgLTE3Njgs
MTUgKzE3NjksMTYgQEAgbG9ja19yZWNfY3JlYXRlKAogCUhBU0hfSU5TRVJUKGxvY2tfdCwgaGFz
aCwgbG9ja19zeXMtPnJlY19oYXNoLAogCQkgICAgbG9ja19yZWNfZm9sZChzcGFjZSwgcGFnZV9u
byksIGxvY2spOwogCisJaWYgKCFjYWxsZXJfb3duc190cnhfbXV0ZXgpIHsKKwkJdHJ4X211dGV4
X2VudGVyKHRyeCk7CisJfQorCXV0X2FkKHRyeF9tdXRleF9vd24odHJ4KSk7CisKIAlpZiAoVU5J
Vl9VTkxJS0VMWSh0eXBlX21vZGUgJiBMT0NLX1dBSVQpKSB7CiAKIAkJbG9ja19zZXRfbG9ja19h
bmRfdHJ4X3dhaXQobG9jaywgdHJ4KTsKIAl9CiAKLQlpZiAoIWNhbGxlcl9vd25zX3RyeF9tdXRl
eCkgewotCQl0cnhfbXV0ZXhfZW50ZXIodHJ4KTsKLQl9Ci0KIAlVVF9MSVNUX0FERF9MQVNUKHRy
eF9sb2NrcywgdHJ4LT5sb2NrLnRyeF9sb2NrcywgbG9jayk7CiAKIAlpZiAoIWNhbGxlcl9vd25z
X3RyeF9tdXRleCkgewpAQCAtMTkyMSw2ICsxOTIzLDcgQEAgbG9ja19yZWNfYWRkX3RvX3F1ZXVl
KAogCWxvY2tfdCoJZmlyc3RfbG9jazsKIAogCXV0X2FkKGxvY2tfbXV0ZXhfb3duKCkpOworCXV0
X2FkKGNhbGxlcl9vd25zX3RyeF9tdXRleCA9PSB0cnhfbXV0ZXhfb3duKHRyeCkpOwogI2lmZGVm
IFVOSVZfREVCVUcKIAlzd2l0Y2ggKHR5cGVfbW9kZSAmIExPQ0tfTU9ERV9NQVNLKSB7CiAJY2Fz
ZSBMT0NLX1g6CkBAIC0yODMyLDkgKzI4MzUsNyBAQCBsb2NrX21vdmVfcmVjX2xpc3RfZW5kKAog
CQkJCWxvY2tfcmVjX3Jlc2V0X250aF9iaXQobG9jaywgaGVhcF9ubyk7CiAKIAkJCQlpZiAoVU5J
Vl9VTkxJS0VMWSh0eXBlX21vZGUgJiBMT0NLX1dBSVQpKSB7Ci0JCQkJCXRyeF9tdXRleF9lbnRl
cihsb2NrLT50cngpOwogCQkJCQlsb2NrX3Jlc2V0X2xvY2tfYW5kX3RyeF93YWl0KGxvY2spOwot
CQkJCQl0cnhfbXV0ZXhfZXhpdChsb2NrLT50cngpOwogCQkJCX0KIAogCQkJCWlmIChjb21wKSB7
CkBAIC0zNzE4LDE3ICszNzE5LDExIEBAIGxvY2tfZGVhZGxvY2tfcmVjdXJzaXZlKAogCQkJCWxv
Y2tfZGVhZGxvY2tfZnB1dHMoCiAJCQkJCSIqKiogV0UgUk9MTCBCQUNLIFRSQU5TQUNUSU9OICgx
KVxuIik7CiAKLQkJCQl3YWl0X2xvY2stPnRyeC0+bG9jay53YXNfY2hvc2VuX2FzX2RlYWRsb2Nr
X3ZpY3RpbQotCQkJCQk9IFRSVUU7Ci0KLQkJCQkvKiBXZSBuZWVkIHRvIHJlbGVhc2UgdGhlIHRy
YW5zYWN0aW9uIG11dGV4LAotCQkJCWluIGNhc2UgIHN0YXJ0IGlzIGdyYW50ZWQgaXRzIGxvY2tz
IG9uY2Ugd2UKLQkJCQlyZWxlYXNlIHdhaXRfbG9jay4gKi8KLQogCQkJCXRyeF9tdXRleF9lbnRl
cih3YWl0X2xvY2stPnRyeCk7CisJCQkJd2FpdF9sb2NrLT50cngtPmxvY2sKKwkJCQkJLndhc19j
aG9zZW5fYXNfZGVhZGxvY2tfdmljdGltID0gVFJVRTsKIAogCQkJCWxvY2tfY2FuY2VsX3dhaXRp
bmdfYW5kX3JlbGVhc2Uod2FpdF9sb2NrKTsKLQogCQkJCXRyeF9tdXRleF9leGl0KHdhaXRfbG9j
ay0+dHJ4KTsKIAogCQkJCXRyeF9tdXRleF9lbnRlcihzdGFydCk7CkBAIC00OTU0LDkgKzQ5NDks
MTAgQEAgc3RhdGljCiBpYm9vbAogbG9ja19yZWNfcXVldWVfdmFsaWRhdGUoCiAvKj09PT09PT09
PT09PT09PT09PT09Ki8KLQlpYm9vbAkJCWhhdmVfbG9ja190cnhfc3lzX211dGV4LAorCWlib29s
CQkJbG9ja2VkX2xvY2tfdHJ4X3N5cywKIAkJCQkJLyohPCBpbjogaWYgdGhlIGNhbGxlciBob2xk
cwotCQkJCQlib3RoIHRoZSBsb2NrIGFuZCB0cnggc3lzIG11dGV4ZXMuICovCisJCQkJCWJvdGgg
dGhlIGxvY2sgbXV0ZXggYW5kCisJCQkJCXRyeF9zeXNfdC0+bG9jay4gKi8KIAljb25zdCBidWZf
YmxvY2tfdCoJYmxvY2ssCS8qITwgaW46IGJ1ZmZlciBibG9jayBjb250YWluaW5nIHJlYyAqLwog
CWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNvcmQgdG8gbG9vayBhdCAqLwogCWRpY3Rf
aW5kZXhfdCoJCWluZGV4LAkvKiE8IGluOiBpbmRleCwgb3IgTlVMTCBpZiBub3Qga25vd24gKi8K
QEAgLTQ5NzAsMTYgKzQ5NjYsMjAgQEAgbG9ja19yZWNfcXVldWVfdmFsaWRhdGUoCiAJdXRfYShi
bG9jay0+ZnJhbWUgPT0gcGFnZV9hbGlnbihyZWMpKTsKIAl1dF9hZChyZWNfb2Zmc192YWxpZGF0
ZShyZWMsIGluZGV4LCBvZmZzZXRzKSk7CiAJdXRfYWQoIXBhZ2VfcmVjX2lzX2NvbXAocmVjKSA9
PSAhcmVjX29mZnNfY29tcChvZmZzZXRzKSk7CisJdXRfYWQobG9ja19tdXRleF9vd24oKSA9PSBs
b2NrZWRfbG9ja190cnhfc3lzKTsKKyNpZmRlZiBVTklWX1NZTkNfREVCVUcKKwl1dF9hZChyd19s
b2NrX293bigmdHJ4X3N5cy0+bG9jaywgUldfTE9DS19TSEFSRUQpCisJICAgICAgPT0gbG9ja2Vk
X2xvY2tfdHJ4X3N5cyk7CisjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiAKIAloZWFwX25v
ID0gcGFnZV9yZWNfZ2V0X2hlYXBfbm8ocmVjKTsKIAotCWlmICghcGFnZV9yZWNfaXNfdXNlcl9y
ZWMocmVjKSkgewotCi0JCWlmICghaGF2ZV9sb2NrX3RyeF9zeXNfbXV0ZXgpIHsKLQkJCWxvY2tf
bXV0ZXhfZW50ZXIoKTsKKwlpZiAoIWxvY2tlZF9sb2NrX3RyeF9zeXMpIHsKKwkJbG9ja19tdXRl
eF9lbnRlcigpOworCQlyd19sb2NrX3NfbG9jaygmdHJ4X3N5cy0+bG9jayk7CisJfQogCi0JCQly
d19sb2NrX3NfbG9jaygmdHJ4X3N5cy0+bG9jayk7Ci0JCX0KKwlpZiAoIXBhZ2VfcmVjX2lzX3Vz
ZXJfcmVjKHJlYykpIHsKIAogCQlmb3IgKGxvY2sgPSBsb2NrX3JlY19nZXRfZmlyc3QoYmxvY2ss
IGhlYXBfbm8pOwogCQkgICAgIGxvY2sgIT0gTlVMTDsKQEAgLTQ5OTYsMTkgKzQ5OTYsNyBAQCBs
b2NrX3JlY19xdWV1ZV92YWxpZGF0ZSgKIAkJCX0KIAkJfQogCi0JCWlmICghaGF2ZV9sb2NrX3Ry
eF9zeXNfbXV0ZXgpIHsKLQkJCXJ3X2xvY2tfc191bmxvY2soJnRyeF9zeXMtPmxvY2spOwotCi0J
CQlsb2NrX211dGV4X2V4aXQoKTsKLQkJfQotCi0JCXJldHVybihUUlVFKTsKLQl9Ci0KLQlpZiAo
IWhhdmVfbG9ja190cnhfc3lzX211dGV4KSB7Ci0JCWxvY2tfbXV0ZXhfZW50ZXIoKTsKLQotCQly
d19sb2NrX3NfbG9jaygmdHJ4X3N5cy0+bG9jayk7CisJCWdvdG8gZnVuY19leGl0OwogCX0KIAog
CWlmICghaW5kZXgpOwpAQCAtNTA2MiwxMSArNTA1MCwxMCBAQCBsb2NrX3JlY19xdWV1ZV92YWxp
ZGF0ZSgKIAkJfQogCX0KIAotCWlmICghaGF2ZV9sb2NrX3RyeF9zeXNfbXV0ZXgpIHsKLQotCQly
d19sb2NrX3NfdW5sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKLQorZnVuY19leGl0OgorCWlmICghbG9j
a2VkX2xvY2tfdHJ4X3N5cykgewogCQlsb2NrX211dGV4X2V4aXQoKTsKKwkJcndfbG9ja19zX3Vu
bG9jaygmdHJ4X3N5cy0+bG9jayk7CiAJfQogCiAJcmV0dXJuKFRSVUUpOwpAQCAtNTA3OSwxNCAr
NTA2NiwxMyBAQCBzdGF0aWMKIGlib29sCiBsb2NrX3JlY192YWxpZGF0ZV9wYWdlKAogLyo9PT09
PT09PT09PT09PT09PT09Ki8KLQlpYm9vbAloYXZlX2xvY2tfdHJ4X3N5c19tdXRleCwJLyohPCBp
bjogaWYgdGhlIGNhbGxlciBob2xkcwotCQkJCQkJYm90aCB0aGUgbG9jayBhbmQgdHJ4IHN5cwot
CQkJCQkJbXV0ZXhlcy4gKi8KLQl1bGludAlzcGFjZSwJCQkJLyohPCBpbjogc3BhY2UgaWQgKi8K
LQl1bGludAl6aXBfc2l6ZSwJCQkvKiE8IGluOiBjb21wcmVzc2VkIHBhZ2Ugc2l6ZQotCQkJCQkJ
aW4gYnl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2VkCi0JCQkJCQlwYWdlcyAqLwotCXVsaW50CXBh
Z2Vfbm8pCQkJLyohPCBpbjogcGFnZSBudW1iZXIgKi8KKwlpYm9vbAlsb2NrZWRfbG9ja190cnhf
c3lzLAkvKiE8IGluOiBpZiB0aGUgY2FsbGVyIGhvbGRzCisJCQkJCWJvdGggdGhlIGxvY2sgbXV0
ZXggYW5kCisJCQkJCXRyeF9zeXNfdC0+bG9jay4gKi8KKwl1bGludAlzcGFjZSwJCQkvKiE8IGlu
OiBzcGFjZSBpZCAqLworCXVsaW50CXppcF9zaXplLAkJLyohPCBpbjogY29tcHJlc3NlZCBwYWdl
IHNpemUKKwkJCQkJaW4gYnl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2VkIHBhZ2VzICovCisJdWxp
bnQJcGFnZV9ubykJCS8qITwgaW46IHBhZ2UgbnVtYmVyICovCiB7CiAJZGljdF9pbmRleF90Kglp
bmRleDsKIAlidWZfYmxvY2tfdCoJYmxvY2s7CkBAIC01MTAzLDEwICs1MDg5LDkgQEAgbG9ja19y
ZWNfdmFsaWRhdGVfcGFnZSgKIAlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsKIAogCS8qIFRoaXMg
aXMgdG8gcHJlc2VydmUgbGF0Y2hpbmcgb3JkZXIuICovCi0JaWYgKGhhdmVfbG9ja190cnhfc3lz
X211dGV4KSB7Ci0JCXJ3X2xvY2tfc191bmxvY2soJnRyeF9zeXMtPmxvY2spOwotCisJaWYgKGxv
Y2tlZF9sb2NrX3RyeF9zeXMpIHsKIAkJbG9ja19tdXRleF9leGl0KCk7CisJCXJ3X2xvY2tfc191
bmxvY2soJnRyeF9zeXMtPmxvY2spOwogCX0KIAogCXV0X2FkKCFsb2NrX211dGV4X293bigpKTsK
QEAgLTUxOTAsMTAgKzUxNzUsOSBAQCBmdW5jdGlvbl9leGl0OgogCiAJbXRyX2NvbW1pdCgmbXRy
KTsKIAotCWlmICghaGF2ZV9sb2NrX3RyeF9zeXNfbXV0ZXgpIHsKLQkJcndfbG9ja19zX3VubG9j
aygmdHJ4X3N5cy0+bG9jayk7Ci0KKwlpZiAoIWxvY2tlZF9sb2NrX3RyeF9zeXMpIHsKIAkJbG9j
a19tdXRleF9leGl0KCk7CisJCXJ3X2xvY2tfc191bmxvY2soJnRyeF9zeXMtPmxvY2spOwogCX0K
IAogCWlmIChVTklWX0xJS0VMWV9OVUxMKGhlYXApKSB7Cgo=

--===============0702946088==
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: bf559dadc2392aabc07b9c09050ec8722dd95986
# timestamp: 2011-01-24 14:52:34 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   su51eevrekov0bgt
# 
# Begin bundle
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
gA==


--===============0702946088==--