From: marko.makela
Date: January 31 2011 7:56am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3696) Bug#59230
List-Archive: http://lists.mysql.com/commits/129998
X-Bug: 59230
Message-Id: <201101310757.p0V6mQPZ019229@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0186108672=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNTUyLXRyZWcw
NHk4OWt0dXN0MWgKCiAzNjk2IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDEtMzEKICAgICAgQnVnIzU5
MjMwIGFzc2VydCAwIHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KCkgaW4gcG9zdC1j
cmFzaAogICAgICB0cnggcm9sbGJhY2sgb3IgcHVyZ2UKICAgICAgCiAgICAgIFRoaXMgcGF0Y2gg
ZG9lcyBub3QgcmVsYXggdGhlIGZhaWxpbmcgZGVidWcgYXNzZXJ0aW9uIGR1cmluZyBwdXJnZS4K
ICAgICAgVGhhdCB3aWxsIGJlIHJldmlzaXRlZCBvbmNlIHdlIGhhdmUgbWFuYWdlZCB0byByZXBl
YXQgdGhlIGFzc2VydGlvbiBmYWlsdXJlLgogICAgICAKICAgICAgcm93X3VwZF9jaGFuZ2VzX29y
ZF9maWVsZF9iaW5hcnlfZnVuYygpOiBSZW5hbWVkIGZyb20KICAgICAgcm93X3VwZF9jaGFuZ2Vz
X29yZF9maWVsZF9iaW5hcnkoKS4gQWRkIHRoZSBwYXJhbWV0ZXIgcXVlX3Rocl90KiBpbgogICAg
ICBVTklWX0RFQlVHIGJ1aWxkcy4gV2hlbiB0aGUgb2ZmLXBhZ2UgY29sdW1uIGNhbm5vdCBiZSBy
ZXRyaWV2ZWQsCiAgICAgIGFzc2VydCB0aGF0IHRoZSBjdXJyZW50IHRyYW5zYWN0aW9uIGlzIGEg
cmVjb3ZlcmVkIG9uZSBhbmQgdGhhdCBpdCBpcwogICAgICB0aGUgb25lIHRoYXQgaXMgY3VycmVu
dGx5IGJlaW5nIHJvbGxlZCBiYWNrLgogICAgICAKICAgICAgcm93X3VwZF9jaGFuZ2VzX29yZF9m
aWVsZF9iaW5hcnkoKTogQSB3cmFwcGVyIG1hY3JvIGZvcgogICAgICByb3dfdXBkX2NoYW5nZXNf
b3JkX2ZpZWxkX2JpbmFyeV9mdW5jKCkgdGhhdCBkaXNjYXJkcyB0aGUgcXVlX3Rocl90KgogICAg
ICBwYXJhbWV0ZXIgdW5sZXNzIFVOSVZfREVCVUcgaXMgZGVmaW5lZC4KICAgICAgCiAgICAgIHJv
d19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1bmMoKTogUmVuYW1lZCBmcm9tCiAgICAgIHJv
d19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuKCkuIEFkZCB0aGUgcGFyYW1ldGVyIHF1ZV90aHJf
dCogaW4KICAgICAgVU5JVl9ERUJVRyBidWlsZHMuCiAgICAgIAogICAgICByb3dfcHVyZ2VfdXBk
X2V4aXN0X29yX2V4dGVybigpOiBBIHdyYXBwZXIgbWFjcm8gZm9yCiAgICAgIHJvd19wdXJnZV91
cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1bmMoKSB0aGF0IGRpc2NhcmRzIHRoZSBxdWVfdGhyX3QqCiAg
ICAgIHBhcmFtZXRlciB1bmxlc3MgVU5JVl9ERUJVRyBpcyBkZWZpbmVkLgogICAgICAKICAgICAg
TWFrZSB0cnhfcm9sbF9jcmFzaF9yZWN2X3RyeCBjb25zdC4gSWYgdGhlcmUgd2VyZSBhICdkbyBu
b3QKICAgICAgZGVyZWZlcmVuY2UnIGF0dHJpYnV0ZSwgaXQgd291bGQgYmUgYXBwcm9wcmlhdGUg
YXMgd2VsbC4KICAgICAgCiAgICAgIHJiOi8vNTg4IGFwcHJvdmVkIGJ5IEppbW15IFlhbmcKCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAgICBz
dG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9kYl9w
bHVnaW4vaW5jbHVkZS9yb3cwdXBkLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9y
b3cwcHVyZ2UuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB1bW9kLmMKICAg
ICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdXBkLmMKICAgICAgc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3RyeC90cngwcm9sbC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9n
CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAxMzAxNzE1NTItdHJlZzA0eTg5a3R1
c3QxaAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwMTMxMDc1NjUxLTAzOTR0M3BwcjZhbzJlczMKQEAgLTEsMyAr
MSwxMCBAQAorMjAxMS0wMS0zMQlUaGUgSW5ub0RCIFRlYW0KKworCSogYnRyL2J0cjBjdXIuYywg
aW5jbHVkZS9yb3cwdXBkLmgsCisJcm93L3JvdzBwdXJnZS5jLCByb3cvcm93MHVtb2QuYywgcm93
L3JvdzB1cGQuYzoKKwlCdWcjNTkyMzAgYXNzZXJ0IDAgcm93X3VwZF9jaGFuZ2VzX29yZF9maWVs
ZF9iaW5hcnkoKQorCWluIHBvc3QtY3Jhc2ggcm9sbGJhY2sgb3IgcHVyZ2UKKwogMjAxMS0wMS0y
NwlUaGUgSW5ub0RCIFRlYW0KIAogCSogYnRyL2J0cjBjdXIuYzoKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEx
MDEzMDE3MTU1Mi10cmVnMDR5ODlrdHVzdDFoCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9i
dHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTMxMDc1NjUx
LTAzOTR0M3BwcjZhbzJlczMKQEAgLTE3NjgsOCArMTc2OCw4IEBAIGJ0cl9jdXJfdXBkYXRlX2lu
X3BsYWNlKAogCQlOT1QgY2FsbCBpdCBpZiBpbmRleCBpcyBzZWNvbmRhcnkgKi8KIAogCQlpZiAo
IWRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpCi0JCSAgICB8fCByb3dfdXBkX2NoYW5nZXNfb3Jk
X2ZpZWxkX2JpbmFyeShOVUxMLCBOVUxMLAotCQkJCQkJCWluZGV4LCB1cGRhdGUpKSB7CisJCSAg
ICB8fCByb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeShpbmRleCwgdXBkYXRlLCB0aHIs
CisJCQkJCQkJTlVMTCwgTlVMTCkpIHsKIAogCQkJLyogUmVtb3ZlIHBvc3NpYmxlIGhhc2ggaW5k
ZXggcG9pbnRlciB0byB0aGlzIHJlY29yZCAqLwogCQkJYnRyX3NlYXJjaF91cGRhdGVfaGFzaF9v
bl9kZWxldGUoY3Vyc29yKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn
aW4vaW5jbHVkZS9yb3cwdXBkLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRl
L3JvdzB1cGQuaAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNTUyLXRy
ZWcwNHk4OWt0dXN0MWgKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvcm93MHVw
ZC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTMxMDc1NjUxLTAzOTR0M3Bw
cjZhbzJlczMKQEAgLTI4MCwxOSArMjgwLDI5IEBAIE5PVEU6IHdlIGNvbXBhcmUgdGhlIGZpZWxk
cyBhcyBiaW5hcnkgc3QKIEByZXR1cm4gVFJVRSBpZiB1cGRhdGUgdmVjdG9yIGNoYW5nZXMgYW4g
b3JkZXJpbmcgZmllbGQgaW4gdGhlIGluZGV4IHJlY29yZCAqLwogVU5JVl9JTlRFUk4KIGlib29s
Ci1yb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeSgKLS8qPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0qLworcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnlfZnVuYygKKy8q
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJZGljdF9pbmRleF90KglpbmRl
eCwJLyohPCBpbjogaW5kZXggb2YgdGhlIHJlY29yZCAqLworCWNvbnN0IHVwZF90Kgl1cGRhdGUs
CS8qITwgaW46IHVwZGF0ZSB2ZWN0b3IgZm9yIHRoZSByb3c7IE5PVEU6IHRoZQorCQkJCWZpZWxk
IG51bWJlcnMgaW4gdGhpcyBNVVNUIGJlIGNsdXN0ZXJlZCBpbmRleAorCQkJCXBvc2l0aW9ucyEg
Ki8KKyNpZmRlZiBVTklWX0RFQlVHCisJY29uc3QgcXVlX3Rocl90KnRociwJLyohPCBpbjogcXVl
cnkgdGhyZWFkICovCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCWNvbnN0IGR0dXBsZV90Kgly
b3csCS8qITwgaW46IG9sZCB2YWx1ZSBvZiByb3csIG9yIE5VTEwgaWYgdGhlCiAJCQkJcm93IGFu
ZCB0aGUgZGF0YSB2YWx1ZXMgaW4gdXBkYXRlIGFyZSBub3QKIAkJCQlrbm93biB3aGVuIHRoaXMg
ZnVuY3Rpb24gaXMgY2FsbGVkLCBlLmcuLCBhdAogCQkJCWNvbXBpbGUgdGltZSAqLwotCWNvbnN0
IHJvd19leHRfdCpleHQsCS8qITwgTlVMTCwgb3IgcHJlZml4ZXMgb2YgdGhlIGV4dGVybmFsbHkK
Kwljb25zdCByb3dfZXh0X3QqZXh0KQkvKiE8IE5VTEwsIG9yIHByZWZpeGVzIG9mIHRoZSBleHRl
cm5hbGx5CiAJCQkJc3RvcmVkIGNvbHVtbnMgaW4gdGhlIG9sZCByb3cgKi8KLQlkaWN0X2luZGV4
X3QqCWluZGV4LAkvKiE8IGluOiBpbmRleCBvZiB0aGUgcmVjb3JkICovCi0JY29uc3QgdXBkX3Qq
CXVwZGF0ZSkJLyohPCBpbjogdXBkYXRlIHZlY3RvciBmb3IgdGhlIHJvdzsgTk9URTogdGhlCi0J
CQkJZmllbGQgbnVtYmVycyBpbiB0aGlzIE1VU1QgYmUgY2x1c3RlcmVkIGluZGV4Ci0JCQkJcG9z
aXRpb25zISAqLwotCV9fYXR0cmlidXRlX18oKG5vbm51bGwoMyw0KSwgd2Fybl91bnVzZWRfcmVz
dWx0KSk7CisJX19hdHRyaWJ1dGVfXygobm9ubnVsbCgxLDIpLCB3YXJuX3VudXNlZF9yZXN1bHQp
KTsKKyNpZmRlZiBVTklWX0RFQlVHCisjIGRlZmluZSByb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxk
X2JpbmFyeShpbmRleCx1cGRhdGUsdGhyLHJvdyxleHQpCVwKKwlyb3dfdXBkX2NoYW5nZXNfb3Jk
X2ZpZWxkX2JpbmFyeV9mdW5jKGluZGV4LHVwZGF0ZSx0aHIscm93LGV4dCkKKyNlbHNlIC8qIFVO
SVZfREVCVUcgKi8KKyMgZGVmaW5lIHJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KGlu
ZGV4LHVwZGF0ZSx0aHIscm93LGV4dCkJXAorCXJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmlu
YXJ5X2Z1bmMoaW5kZXgsdXBkYXRlLHJvdyxleHQpCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwog
LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqLy8qKgogQ2hlY2tzIGlmIGFuIHVwZGF0ZSB2ZWN0b3IgY2hhbmdlcyBhbiBvcmRlcmluZyBm
aWVsZCBvZiBhbiBpbmRleCByZWNvcmQuCiBUaGlzIGZ1bmN0aW9uIGlzIGZhc3QgaWYgdGhlIHVw
ZGF0ZSB2ZWN0b3IgaXMgc2hvcnQgb3IgdGhlIG51bWJlciBvZiBvcmRlcmluZwoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHB1cmdlLmMnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHB1cmdlLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3Jh
Y2xlLmNvbS0yMDExMDEzMDE3MTU1Mi10cmVnMDR5ODlrdHVzdDFoCisrKyBiL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yb3cvcm93MHB1cmdlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAxMzEwNzU2NTEtMDM5NHQzcHByNmFvMmVzMwpAQCAtMzg3LDggKzM4NywxMSBAQCBQdXJn
ZXMgYW4gdXBkYXRlIG9mIGFuIGV4aXN0aW5nIHJlY29yZC4KIG1hcmtlZCByZWNvcmQgaWYgdGhh
dCByZWNvcmQgY29udGFpbmVkIGFuIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkLiAqLwogc3RhdGlj
CiB2b2lkCi1yb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybigKLS8qPT09PT09PT09PT09PT09
PT09PT09PT09PT0qLworcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm5fZnVuYygKKy8qPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0
IHF1ZV90aHJfdCp0aHIsCS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLworI2VuZGlmIC8qIFVOSVZf
REVCVUcgKi8KIAlwdXJnZV9ub2RlX3QqCW5vZGUpCS8qITwgaW46IHJvdyBwdXJnZSBub2RlICov
CiB7CiAJbWVtX2hlYXBfdCoJaGVhcDsKQEAgLTQxMyw4ICs0MTYsOCBAQCByb3dfcHVyZ2VfdXBk
X2V4aXN0X29yX2V4dGVybigKIAl3aGlsZSAobm9kZS0+aW5kZXggIT0gTlVMTCkgewogCQlpbmRl
eCA9IG5vZGUtPmluZGV4OwogCi0JCWlmIChyb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFy
eShOVUxMLCBOVUxMLCBub2RlLT5pbmRleCwKLQkJCQkJCSAgICAgbm9kZS0+dXBkYXRlKSkgewor
CQlpZiAocm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkobm9kZS0+aW5kZXgsIG5vZGUt
PnVwZGF0ZSwKKwkJCQkJCSAgICAgdGhyLCBOVUxMLCBOVUxMKSkgewogCQkJLyogQnVpbGQgdGhl
IG9sZGVyIHZlcnNpb24gb2YgdGhlIGluZGV4IGVudHJ5ICovCiAJCQllbnRyeSA9IHJvd19idWls
ZF9pbmRleF9lbnRyeShub2RlLT5yb3csIE5VTEwsCiAJCQkJCQkgICAgICBpbmRleCwgaGVhcCk7
CkBAIC00OTYsNiArNDk5LDE0IEBAIHNraXBfc2Vjb25kYXJpZXM6CiAJfQogfQogCisjaWZkZWYg
VU5JVl9ERUJVRworIyBkZWZpbmUgcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm4odGhyLG5v
ZGUpCVwKKwlyb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybl9mdW5jKHRocixub2RlKQorI2Vs
c2UgLyogVU5JVl9ERUJVRyAqLworIyBkZWZpbmUgcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRl
cm4odGhyLG5vZGUpCVwKKwlyb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybl9mdW5jKG5vZGUp
CisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBQYXJzZXMgdGhlIHJvdyByZWZl
cmVuY2UgYW5kIG90aGVyIGluZm8gaW4gYSBtb2RpZnkgdW5kbyBsb2cgcmVjb3JkLgogQHJldHVy
biBUUlVFIGlmIHB1cmdlIG9wZXJhdGlvbiByZXF1aXJlZDogTk9URSB0aGF0IHRoZW4gdGhlIENB
TExFUgpAQCAtNjU0LDcgKzY2NSw3IEBAIHJvd19wdXJnZSgKIAkJfSBlbHNlIGlmICh1cGRhdGVk
X2V4dGVybgogCQkJICAgfHwgbm9kZS0+cmVjX3R5cGUgPT0gVFJYX1VORE9fVVBEX0VYSVNUX1JF
QykgewogCi0JCQlyb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybihub2RlKTsKKwkJCXJvd19w
dXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuKHRociwgbm9kZSk7CiAJCX0KIAogCQlpZiAobm9kZS0+
Zm91bmRfY2x1c3QpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4v
cm93L3JvdzB1bW9kLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVtb2Qu
YwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTMwMTcxNTUyLXRyZWcwNHk4OWt0
dXN0MWgKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdW1vZC5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTMxMDc1NjUxLTAzOTR0M3BwcjZhbzJlczMKQEAg
LTY2OCw4ICs2NjgsOSBAQCByb3dfdW5kb19tb2RfdXBkX2V4aXN0X3NlYygKIAl3aGlsZSAobm9k
ZS0+aW5kZXggIT0gTlVMTCkgewogCQlpbmRleCA9IG5vZGUtPmluZGV4OwogCi0JCWlmIChyb3df
dXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeSgKLQkJCSAgICBub2RlLT5yb3csIG5vZGUtPmV4
dCwgbm9kZS0+aW5kZXgsIG5vZGUtPnVwZGF0ZSkpIHsKKwkJaWYgKHJvd191cGRfY2hhbmdlc19v
cmRfZmllbGRfYmluYXJ5KG5vZGUtPmluZGV4LCBub2RlLT51cGRhdGUsCisJCQkJCQkgICAgIHRo
ciwKKwkJCQkJCSAgICAgbm9kZS0+cm93LCBub2RlLT5leHQpKSB7CiAKIAkJCS8qIEJ1aWxkIHRo
ZSBuZXdlc3QgdmVyc2lvbiBvZiB0aGUgaW5kZXggZW50cnkgKi8KIAkJCWVudHJ5ID0gcm93X2J1
aWxkX2luZGV4X2VudHJ5KG5vZGUtPnJvdywgbm9kZS0+ZXh0LAoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVwZC5jJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcm93L3JvdzB1cGQuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEw
MTMwMTcxNTUyLXRyZWcwNHk4OWt0dXN0MWgKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jv
dy9yb3cwdXBkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMzEwNzU2NTEt
MDM5NHQzcHByNmFvMmVzMwpAQCAtMTE5MiwyNSArMTE5MiwzMSBAQCBOT1RFOiB3ZSBjb21wYXJl
IHRoZSBmaWVsZHMgYXMgYmluYXJ5IHN0CiBAcmV0dXJuIFRSVUUgaWYgdXBkYXRlIHZlY3RvciBj
aGFuZ2VzIGFuIG9yZGVyaW5nIGZpZWxkIGluIHRoZSBpbmRleCByZWNvcmQgKi8KIFVOSVZfSU5U
RVJOCiBpYm9vbAotcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkoCi0vKj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ki8KK3Jvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5
X2Z1bmMoCisvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLworCWRpY3RfaW5k
ZXhfdCoJaW5kZXgsCS8qITwgaW46IGluZGV4IG9mIHRoZSByZWNvcmQgKi8KKwljb25zdCB1cGRf
dCoJdXBkYXRlLAkvKiE8IGluOiB1cGRhdGUgdmVjdG9yIGZvciB0aGUgcm93OyBOT1RFOiB0aGUK
KwkJCQlmaWVsZCBudW1iZXJzIGluIHRoaXMgTVVTVCBiZSBjbHVzdGVyZWQgaW5kZXgKKwkJCQlw
b3NpdGlvbnMhICovCisjaWZkZWYgVU5JVl9ERUJVRworCWNvbnN0IHF1ZV90aHJfdCp0aHIsCS8q
ITwgaW46IHF1ZXJ5IHRocmVhZCAqLworI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAljb25zdCBk
dHVwbGVfdCoJcm93LAkvKiE8IGluOiBvbGQgdmFsdWUgb2Ygcm93LCBvciBOVUxMIGlmIHRoZQog
CQkJCXJvdyBhbmQgdGhlIGRhdGEgdmFsdWVzIGluIHVwZGF0ZSBhcmUgbm90CiAJCQkJa25vd24g
d2hlbiB0aGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCwgZS5nLiwgYXQKIAkJCQljb21waWxlIHRpbWUg
Ki8KLQljb25zdCByb3dfZXh0X3QqZXh0LAkvKiE8IE5VTEwsIG9yIHByZWZpeGVzIG9mIHRoZSBl
eHRlcm5hbGx5CisJY29uc3Qgcm93X2V4dF90KmV4dCkJLyohPCBOVUxMLCBvciBwcmVmaXhlcyBv
ZiB0aGUgZXh0ZXJuYWxseQogCQkJCXN0b3JlZCBjb2x1bW5zIGluIHRoZSBvbGQgcm93ICovCi0J
ZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogaW5kZXggb2YgdGhlIHJlY29yZCAqLwotCWNv
bnN0IHVwZF90Kgl1cGRhdGUpCS8qITwgaW46IHVwZGF0ZSB2ZWN0b3IgZm9yIHRoZSByb3c7IE5P
VEU6IHRoZQotCQkJCWZpZWxkIG51bWJlcnMgaW4gdGhpcyBNVVNUIGJlIGNsdXN0ZXJlZCBpbmRl
eAotCQkJCXBvc2l0aW9ucyEgKi8KIHsKIAl1bGludAkJCW5fdW5pcXVlOwogCXVsaW50CQkJaTsK
IAljb25zdCBkaWN0X2luZGV4X3QqCWNsdXN0X2luZGV4OwogCi0JdXRfYWQodXBkYXRlKTsKIAl1
dF9hZChpbmRleCk7CisJdXRfYWQodXBkYXRlKTsKKwl1dF9hZCh0aHIpOworCXV0X2FkKHRoci0+
Z3JhcGgpOworCXV0X2FkKHRoci0+Z3JhcGgtPnRyeCk7CiAKIAluX3VuaXF1ZSA9IGRpY3RfaW5k
ZXhfZ2V0X25fdW5pcXVlKGluZGV4KTsKIApAQCAtMTI2Myw5ICsxMjY5LDE0IEBAIHJvd191cGRf
Y2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KAogCiAJCQlpZiAoVU5JVl9MSUtFTFlfTlVMTChidWYp
KSB7CiAJCQkJaWYgKFVOSVZfVU5MSUtFTFkoYnVmID09IGZpZWxkX3JlZl96ZXJvKSkgewotCQkJ
CQkvKiBUaGlzIHNob3VsZCBuZXZlciBoYXBwZW4sIGJ1dAotCQkJCQl3ZSB0cnkgdG8gZmFpbCBz
YWZlIGhlcmUuICovCi0JCQkJCXV0X2FkKDApOworCQkJCQkvKiBUaGUgZXh0ZXJuYWxseSBzdG9y
ZWQgZmllbGQKKwkJCQkJd2FzIG5vdCB3cml0dGVuIHlldC4gVGhpcworCQkJCQlyZWNvcmQgc2hv
dWxkIG9ubHkgYmUgc2VlbiBieQorCQkJCQlyZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgp
LAorCQkJCQl3aGVuIHRoZSBzZXJ2ZXIgaGFkIGNyYXNoZWQgYmVmb3JlCisJCQkJCXN0b3Jpbmcg
dGhlIGZpZWxkLiAqLworCQkJCQl1dF9hZCh0aHItPmdyYXBoLT50cngtPmlzX3JlY292ZXJlZCk7
CisJCQkJCXV0X2FkKHRyeF9pc19yZWN2KHRoci0+Z3JhcGgtPnRyeCkpOwogCQkJCQlyZXR1cm4o
VFJVRSk7CiAJCQkJfQogCkBAIC0xNjEyLDggKzE2MjMsOCBAQCByb3dfdXBkX3NlY19zdGVwKAog
CXV0X2FkKCFkaWN0X2luZGV4X2lzX2NsdXN0KG5vZGUtPmluZGV4KSk7CiAKIAlpZiAobm9kZS0+
c3RhdGUgPT0gVVBEX05PREVfVVBEQVRFX0FMTF9TRUMKLQkgICAgfHwgcm93X3VwZF9jaGFuZ2Vz
X29yZF9maWVsZF9iaW5hcnkobm9kZS0+cm93LCBub2RlLT5leHQsCi0JCQkJCQlub2RlLT5pbmRl
eCwgbm9kZS0+dXBkYXRlKSkgeworCSAgICB8fCByb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2Jp
bmFyeShub2RlLT5pbmRleCwgbm9kZS0+dXBkYXRlLAorCQkJCQkJdGhyLCBub2RlLT5yb3csIG5v
ZGUtPmV4dCkpIHsKIAkJcmV0dXJuKHJvd191cGRfc2VjX2luZGV4X2VudHJ5KG5vZGUsIHRocikp
OwogCX0KIApAQCAtMjE0MCw4ICsyMTUxLDggQEAgZXhpdF9mdW5jOgogCiAJcm93X3VwZF9zdG9y
ZV9yb3cobm9kZSk7CiAKLQlpZiAocm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkobm9k
ZS0+cm93LCBub2RlLT5leHQsIGluZGV4LAotCQkJCQkgICAgIG5vZGUtPnVwZGF0ZSkpIHsKKwlp
ZiAocm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9iaW5hcnkoaW5kZXgsIG5vZGUtPnVwZGF0ZSwg
dGhyLAorCQkJCQkgICAgIG5vZGUtPnJvdywgbm9kZS0+ZXh0KSkgewogCiAJCS8qIFVwZGF0ZSBj
YXVzZXMgYW4gb3JkZXJpbmcgZmllbGQgKG9yZGVyaW5nIGZpZWxkcyB3aXRoaW4KIAkJdGhlIEIt
dHJlZSkgb2YgdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQgdG8gY2hhbmdlOiBwZXJmb3JtCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwcm9sbC5jJwot
LS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDByb2xsLmMJcmV2aWQ6dmFzaWwuZGlt
b3ZAb3JhY2xlLmNvbS0yMDExMDEzMDE3MTU1Mi10cmVnMDR5ODlrdHVzdDFoCisrKyBiL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi90cngvdHJ4MHJvbGwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDEzMTA3NTY1MS0wMzk0dDNwcHI2YW8yZXMzCkBAIC00OCw4ICs0OCw4IEBAIENy
ZWF0ZWQgMy8yNi8xOTk2IEhlaWtraSBUdXVyaQogcm9sbGJhY2sgKi8KICNkZWZpbmUgVFJYX1JP
TExfVFJVTkNfVEhSRVNIT0xECTEKIAotLyoqIEluIGNyYXNoIHJlY292ZXJ5LCB0aGUgY3VycmVu
dCB0cnggdG8gYmUgcm9sbGVkIGJhY2sgKi8KLXN0YXRpYyB0cnhfdCoJCXRyeF9yb2xsX2NyYXNo
X3JlY3ZfdHJ4CT0gTlVMTDsKKy8qKiBJbiBjcmFzaCByZWNvdmVyeSwgdGhlIGN1cnJlbnQgdHJ4
IHRvIGJlIHJvbGxlZCBiYWNrOyBOVUxMIG90aGVyd2lzZSAqLworc3RhdGljIGNvbnN0IHRyeF90
Kgl0cnhfcm9sbF9jcmFzaF9yZWN2X3RyeAk9IE5VTEw7CiAKIC8qKiBJbiBjcmFzaCByZWNvdmVy
eSB3ZSBzZXQgdGhpcyB0byB0aGUgdW5kbyBuOm8gb2YgdGhlIGN1cnJlbnQgdHJ4IHRvIGJlCiBy
b2xsZWQgYmFjay4gVGhlbiB3ZSBjYW4gcHJpbnQgaG93IG1hbnkgJSB0aGUgcm9sbGJhY2sgaGFz
IHByb2dyZXNzZWQuICovCgo=

--===============0186108672==
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.1-innodb/
# testament_sha1: 834cfebd433356439cca896419883172bcbfbcfd
# timestamp: 2011-01-31 09:57:00 +0200
# base_revision_id: vasil.dimov@stripped\
#   treg04y89ktust1h
# 
# Begin bundle
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
ckU4UJCzID3b


--===============0186108672==--