From: marko.makela
Date: February 28 2011 2:04pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3714 to 3715) Bug#58549
List-Archive: http://lists.mysql.com/commits/132120
X-Bug: 58549
Message-Id: <201102281404.p1SE1KGn005109@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0994988150=="

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

IDM3MTUgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0yOAogICAgICBCdWcgIzU4NTQ5IFJhY2UgY29u
ZGl0aW9uIGluIGJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hfZm9yX3RhYmxlc3BhY2UoKQogICAgICBh
bmQgY29tcHJlc3NlZCB0YWJsZXMKICAgICAgCiAgICAgIGJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hf
Zm9yX3RhYmxlc3BhY2UoKTogYWZ0ZXIgcmVsZWFzaW5nIGFuZAogICAgICByZWFjcXVpcmluZyB0
aGUgYnVmZmVyIHBvb2wgbXV0ZXgsIGRvIG5vdCBkZXJlZmVyZW5jZSBhbnkgYmxvY2sKICAgICAg
ZGVzY3JpcHRvciBwb2ludGVyIHRoYXQgaXMgbm90IGtub3duIHRvIGJlIGEgcG9pbnRlciB0byBh
bgogICAgICB1bmNvbXByZXNzZWQgcGFnZSBmcmFtZSAodHlwZSBidWZfYmxvY2tfdDsgc3RhdGUg
PT0KICAgICAgQlVGX0JMT0NLX0ZJTEVfUEFHRSkuIEFsc28sIGRlZmVyIHRoZSBhY3F1aXNpdGlv
biBvZiB0aGUgYmxvY2tfbXV0ZXgKICAgICAgdW50aWwgaXQgaXMgbmVlZGVkLgogICAgICAKICAg
ICAgYnVmX3BhZ2VfZ2V0X2dlbigpOiBBZGQgbW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0xfUEVF
SyBmb3IKICAgICAgYnVmZmVyLWZpeGluZyBhIGJsb2NrIHdpdGhvdXQgbWFraW5nIGl0IHlvdW5n
IGluIHRoZSBMUlUgbGlzdC4KICAgICAgCiAgICAgIGJ1Zl9wYWdlX2dldF9nZW4oKSwgYnVmX3Bh
Z2VfaW5pdCgpLCBidWZfTFJVX2Jsb2NrX3JlbW92ZV9oYXNoZWRfcGFnZSgpOgogICAgICBTZXQg
YnBhZ2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJUF9GUkVFIGJlZm9yZSBidWZfYnVkZHlfZnJlZShi
cGFnZSksCiAgICAgIHNvIHRoYXQgc2ltaWxhciByYWNlIGNvbmRpdGlvbnMgbWlnaHQgYmUgZGV0
ZWN0ZWQgYSBsaXR0bGUgZWFzaWVyLgogICAgICAKICAgICAgYnRyX3NlYXJjaF9kcm9wX3BhZ2Vf
aGFzaF93aGVuX2ZyZWVkKCk6IFVzZSBCVUZfR0VUX0lGX0lOX1BPT0xfUEVFSwogICAgICB3aGVu
IGRyb3BwaW5nIHRoZSBoYXNoIGluZGV4ZXMuCiAgICAgIAogICAgICByYjovLzUyOCBhcHByb3Zl
ZCBieSBKaW1teSBZYW5nCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwc2VhLmMKICAg
ICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMKICAgICAgc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1
ZGUvYnVmMGJ1Zi5oCiAzNzE0IFZhc2lsIERpbW92CTIwMTEtMDItMjUKICAgICAgRml4IEJVRyMx
MTc5ODA4NSAtIElOQ09SUkVDVCBJTlRFR0VSIFRZUEVTIFVTRUQgSU4gQ0FMQ1VMQVRJT04gUkVT
VUxUCiAgICAgIElOIE9WRVJGTE9XCiAgICAgIAogICAgICBEbyBub3QgYXNzaWduIHRoZSByZXN1
bHQgb2YgdGhlIGRpZmZlcmVuY2UgdG8gYSBzaWduZWQgdmFyaWFibGUgYW5kCiAgICAgIGNoZWNr
aW5nIHdoZXRoZXIgaXQgaXMgbmVnYXRpdmUgYWZ0ZXJ3YXJkcyBiZWNhdXNlIHRoaXMgbGltaXRz
IHRoZSBtYXggZGlmZgogICAgICB0byAyRyBvbiAzMiBiaXQgc3lzdGVtcy4gRS5nLiAic2lnbmVk
ID0gMy41RyAtIDFHIiB3b3VsZCBiZSBuZWdhdGl2ZSBhbmQgdGhlCiAgICAgIGNvZGUgd291bGQg
YXNzdW1lIHRoYXQgMy41RyA8IDFHLiBJbnN0ZWFkIGNvbXBhcmUgdGhlIHR3byB2YXJpYWJsZXMg
ZGlyZWN0bHkKICAgICAgYW5kIGFzc2lnbiB0byB1bnNpZ25lZCBvbmx5IGlmIHdlIGtub3cgdGhh
dCB0aGUgcmVzdWx0IG9mIHRoZSBzdWJ0cmFjdGlvbgogICAgICB3aWxsIGJlIHBvc2l0aXZlLgog
ICAgICAKICAgICAgRGlzY3Vzc2VkIHdpdGg6CUppbW15IGFuZCBTdW5ueSAodmlhIElSQykKCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNv
bS0yMDExMDIyNTA5NTAxOC1qZ212MXBudXBycmp6YXQxCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMjgxMTUx
MTgtb2dzM2liMWVhejlic2drdApAQCAtMSwzICsxLDkgQEAKKzIwMTEtMDItMjgJVGhlIElubm9E
QiBUZWFtCisKKwkqIGJ0ci9idHIwc2VhLmMsIGJ1Zi9idWYwYnVmLmMsIGJ1Zi9idWYwbHJ1LmM6
CisJRml4IEJ1ZyM1ODU0OSBSYWNlIGNvbmRpdGlvbiBpbiBidWZfTFJVX2Ryb3BfcGFnZV9oYXNo
X2Zvcl90YWJsZXNwYWNlKCkKKwlhbmQgY29tcHJlc3NlZCB0YWJsZXMKKwogMjAxMS0wMi0xNQlU
aGUgSW5ub0RCIFRlYW0KIAogCSogc3luYy9zeW5jMHJ3LmMsIGlubm9kYl9idWc1OTMwNy50ZXN0
OgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMHNlYS5j
JwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBzZWEuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTEwMjI1MDk1MDE4LWpnbXYxcG51cHJyanphdDEKKysrIGIvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwc2VhLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTAyMjgxMTUxMTgtb2dzM2liMWVhejlic2drdApAQCAtMTIwMSw4ICsxMjAxLDgg
QEAgYnRyX3NlYXJjaF9kcm9wX3BhZ2VfaGFzaF93aGVuX2ZyZWVkKAogCWhhdmluZyB0byBmZWFy
IGEgZGVhZGxvY2suICovCiAKIAlibG9jayA9IGJ1Zl9wYWdlX2dldF9nZW4oc3BhY2UsIHppcF9z
aXplLCBwYWdlX25vLCBSV19TX0xBVENILCBOVUxMLAotCQkJCUJVRl9HRVRfSUZfSU5fUE9PTCwg
X19GSUxFX18sIF9fTElORV9fLAotCQkJCSZtdHIpOworCQkJCSBCVUZfUEVFS19JRl9JTl9QT09M
LCBfX0ZJTEVfXywgX19MSU5FX18sCisJCQkJICZtdHIpOwogCS8qIEJlY2F1c2UgdGhlIGJ1ZmZl
ciBwb29sIG11dGV4IHdhcyByZWxlYXNlZCBieQogCWJ1Zl9wYWdlX3BlZWtfaWZfc2VhcmNoX2hh
c2hlZCgpLCBpdCBpcyBwb3NzaWJsZSB0aGF0IHRoZQogCWJsb2NrIHdhcyByZW1vdmVkIGZyb20g
dGhlIGJ1ZmZlciBwb29sIGJ5IGFub3RoZXIgdGhyZWFkCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9idWYvYnVmMGJ1Zi5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAyMjUw
OTUwMTgtamdtdjFwbnVwcnJqemF0MQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1
ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIyODExNTExOC1vZ3Mz
aWIxZWF6OWJzZ2t0CkBAIC0yMDMxLDcgKzIwMzEsNyBAQCBidWZfcGFnZV9nZXRfZ2VuKAogCXVs
aW50CQlyd19sYXRjaCwvKiE8IGluOiBSV19TX0xBVENILCBSV19YX0xBVENILCBSV19OT19MQVRD
SCAqLwogCWJ1Zl9ibG9ja190KglndWVzcywJLyohPCBpbjogZ3Vlc3NlZCBibG9jayBvciBOVUxM
ICovCiAJdWxpbnQJCW1vZGUsCS8qITwgaW46IEJVRl9HRVQsIEJVRl9HRVRfSUZfSU5fUE9PTCwK
LQkJCQlCVUZfR0VUX05PX0xBVENIICovCisJCQkJQlVGX1BFRUtfSUZfSU5fUE9PTCwgQlVGX0dF
VF9OT19MQVRDSCAqLwogCWNvbnN0IGNoYXIqCWZpbGUsCS8qITwgaW46IGZpbGUgbmFtZSAqLwog
CXVsaW50CQlsaW5lLAkvKiE8IGluOiBsaW5lIHdoZXJlIGNhbGxlZCAqLwogCW10cl90KgkJbXRy
KQkvKiE8IGluOiBtaW5pLXRyYW5zYWN0aW9uICovCkBAIC0yMDQ3LDkgKzIwNDcsMTkgQEAgYnVm
X3BhZ2VfZ2V0X2dlbigKIAl1dF9hZCgocndfbGF0Y2ggPT0gUldfU19MQVRDSCkKIAkgICAgICB8
fCAocndfbGF0Y2ggPT0gUldfWF9MQVRDSCkKIAkgICAgICB8fCAocndfbGF0Y2ggPT0gUldfTk9f
TEFUQ0gpKTsKLQl1dF9hZCgobW9kZSAhPSBCVUZfR0VUX05PX0xBVENIKSB8fCAocndfbGF0Y2gg
PT0gUldfTk9fTEFUQ0gpKTsKLQl1dF9hZCgobW9kZSA9PSBCVUZfR0VUKSB8fCAobW9kZSA9PSBC
VUZfR0VUX0lGX0lOX1BPT0wpCi0JICAgICAgfHwgKG1vZGUgPT0gQlVGX0dFVF9OT19MQVRDSCkp
OworI2lmZGVmIFVOSVZfREVCVUcKKwlzd2l0Y2ggKG1vZGUpIHsKKwljYXNlIEJVRl9HRVRfTk9f
TEFUQ0g6CisJCXV0X2FkKHJ3X2xhdGNoID09IFJXX05PX0xBVENIKTsKKwkJYnJlYWs7CisJY2Fz
ZSBCVUZfR0VUOgorCWNhc2UgQlVGX0dFVF9JRl9JTl9QT09MOgorCWNhc2UgQlVGX1BFRUtfSUZf
SU5fUE9PTDoKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJdXRfZXJyb3I7CisJfQorI2VuZGlmIC8q
IFVOSVZfREVCVUcgKi8KIAl1dF9hZCh6aXBfc2l6ZSA9PSBmaWxfc3BhY2VfZ2V0X3ppcF9zaXpl
KHNwYWNlKSk7CiAJdXRfYWQodXRfaXNfMnBvdyh6aXBfc2l6ZSkpOwogI2lmbmRlZiBVTklWX0xP
R19ERUJVRwpAQCAtMjA5MSw3ICsyMTAxLDggQEAgbG9vcDI6CiAKIAkJYnVmX3Bvb2xfbXV0ZXhf
ZXhpdCgpOwogCi0JCWlmIChtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTCkgeworCQlpZiAobW9k
ZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0wKKwkJICAgIHx8IG1vZGUgPT0gQlVGX1BFRUtfSUZfSU5f
UE9PTCkgewogCiAJCQlyZXR1cm4oTlVMTCk7CiAJCX0KQEAgLTIxMzAsNyArMjE0MSw4IEBAIGxv
b3AyOgogCiAJbXVzdF9yZWFkID0gYnVmX2Jsb2NrX2dldF9pb19maXgoYmxvY2spID09IEJVRl9J
T19SRUFEOwogCi0JaWYgKG11c3RfcmVhZCAmJiBtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTCkg
eworCWlmIChtdXN0X3JlYWQgJiYgKG1vZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MCisJCQkgIHx8
IG1vZGUgPT0gQlVGX1BFRUtfSUZfSU5fUE9PTCkpIHsKIAkJLyogVGhlIHBhZ2UgaXMgb25seSBi
ZWluZyByZWFkIHRvIGJ1ZmZlciAqLwogCQlidWZfcG9vbF9tdXRleF9leGl0KCk7CiAKQEAgLTIy
NDgsNiArMjI2MCw3IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAkJbXV0ZXhfZXhpdCgmYnVmX3Bv
b2xfemlwX211dGV4KTsKIAkJYnVmX3Bvb2wtPm5fcGVuZF91bnppcCsrOwogCisJCWJwYWdlLT5z
dGF0ZSA9IEJVRl9CTE9DS19aSVBfRlJFRTsKIAkJYnVmX2J1ZGR5X2ZyZWUoYnBhZ2UsIHNpemVv
ZiAqYnBhZ2UpOwogCiAJCWJ1Zl9wb29sX211dGV4X2V4aXQoKTsKQEAgLTIzMjQsNyArMjMzNyw5
IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAogCWJ1Zl9wb29sX211dGV4X2V4aXQoKTsKIAotCWJ1
Zl9wYWdlX3NldF9hY2Nlc3NlZF9tYWtlX3lvdW5nKCZibG9jay0+cGFnZSwgYWNjZXNzX3RpbWUp
OworCWlmIChVTklWX0xJS0VMWShtb2RlICE9IEJVRl9QRUVLX0lGX0lOX1BPT0wpKSB7CisJCWJ1
Zl9wYWdlX3NldF9hY2Nlc3NlZF9tYWtlX3lvdW5nKCZibG9jay0+cGFnZSwgYWNjZXNzX3RpbWUp
OworCX0KIAogI2lmIGRlZmluZWQgVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTIHx8IGRlZmluZWQg
VU5JVl9ERUJVRwogCXV0X2EoIWJsb2NrLT5wYWdlLmZpbGVfcGFnZV93YXNfZnJlZWQpOwpAQCAt
MjM3Nyw3ICsyMzkyLDcgQEAgd2FpdF91bnRpbF91bmZpeGVkOgogCiAJbXRyX21lbW9fcHVzaCht
dHIsIGJsb2NrLCBmaXhfdHlwZSk7CiAKLQlpZiAoIWFjY2Vzc190aW1lKSB7CisJaWYgKFVOSVZf
TElLRUxZKG1vZGUgIT0gQlVGX1BFRUtfSUZfSU5fUE9PTCkgJiYgIWFjY2Vzc190aW1lKSB7CiAJ
CS8qIEluIHRoZSBjYXNlIG9mIGEgZmlyc3QgYWNjZXNzLCB0cnkgdG8gYXBwbHkgbGluZWFyCiAJ
CXJlYWQtYWhlYWQgKi8KIApAQCAtMjkyNiw2ICsyOTQxLDcgQEAgZXJyX2V4aXQ6CiAJCSAgICAm
JiBVTklWX0xJS0VMWV9OVUxMKGJ1Zl9wYWdlX2hhc2hfZ2V0KHNwYWNlLCBvZmZzZXQpKSkgewog
CiAJCQkvKiBUaGUgYmxvY2sgd2FzIGFkZGVkIGJ5IHNvbWUgb3RoZXIgdGhyZWFkLiAqLworCQkJ
YnBhZ2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJUF9GUkVFOwogCQkJYnVmX2J1ZGR5X2ZyZWUoYnBh
Z2UsIHNpemVvZiAqYnBhZ2UpOwogCQkJYnVmX2J1ZGR5X2ZyZWUoZGF0YSwgemlwX3NpemUpOwog
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCXJldmlkOnZhc2lsLmRp
bW92QG9yYWNsZS5jb20tMjAxMTAyMjUwOTUwMTgtamdtdjFwbnVwcnJqemF0MQorKysgYi9zdG9y
YWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDIyODExNTExOC1vZ3MzaWIxZWF6OWJzZ2t0CkBAIC0yNDYsNzEgKzI0Niw3NSBA
QCBidWZfTFJVX2Ryb3BfcGFnZV9oYXNoX2Zvcl90YWJsZXNwYWNlKAogCXBhZ2VfYXJyID0gdXRf
bWFsbG9jKHNpemVvZih1bGludCkKIAkJCSAgICAgKiBCVUZfTFJVX0RST1BfU0VBUkNIX0hBU0hf
U0laRSk7CiAJYnVmX3Bvb2xfbXV0ZXhfZW50ZXIoKTsKKwludW1fZW50cmllcyA9IDA7CiAKIHNj
YW5fYWdhaW46Ci0JbnVtX2VudHJpZXMgPSAwOwogCWJwYWdlID0gVVRfTElTVF9HRVRfTEFTVChi
dWZfcG9vbC0+TFJVKTsKIAogCXdoaWxlIChicGFnZSAhPSBOVUxMKSB7Ci0JCW11dGV4X3QqCWJs
b2NrX211dGV4ID0gYnVmX3BhZ2VfZ2V0X211dGV4KGJwYWdlKTsKIAkJYnVmX3BhZ2VfdCoJcHJl
dl9icGFnZTsKKwkJaWJvb2wJCWlzX2ZpeGVkOwogCi0JCW11dGV4X2VudGVyKGJsb2NrX211dGV4
KTsKIAkJcHJldl9icGFnZSA9IFVUX0xJU1RfR0VUX1BSRVYoTFJVLCBicGFnZSk7CiAKIAkJdXRf
YShidWZfcGFnZV9pbl9maWxlKGJwYWdlKSk7CiAKIAkJaWYgKGJ1Zl9wYWdlX2dldF9zdGF0ZShi
cGFnZSkgIT0gQlVGX0JMT0NLX0ZJTEVfUEFHRQogCQkgICAgfHwgYnBhZ2UtPnNwYWNlICE9IGlk
Ci0JCSAgICB8fCBicGFnZS0+YnVmX2ZpeF9jb3VudCA+IDAKIAkJICAgIHx8IGJwYWdlLT5pb19m
aXggIT0gQlVGX0lPX05PTkUpIHsKLQkJCS8qIFdlIGxlYXZlIHRoZSBmaXhlZCBwYWdlcyBhcyBp
cyBpbiB0aGlzIHNjYW4uCi0JCQlUbyBiZSBkZWFsdCB3aXRoIGxhdGVyIGluIHRoZSBmaW5hbCBz
Y2FuLiAqLwotCQkJbXV0ZXhfZXhpdChibG9ja19tdXRleCk7Ci0JCQlnb3RvIG5leHRfcGFnZTsK
KwkJCS8qIENvbXByZXNzZWQgcGFnZXMgYXJlIG5ldmVyIGhhc2hlZC4KKwkJCVNraXAgYmxvY2tz
IG9mIG90aGVyIHRhYmxlc3BhY2VzLgorCQkJU2tpcCBJL08tZml4ZWQgYmxvY2tzICh0byBiZSBk
ZWFsdCB3aXRoIGxhdGVyKS4gKi8KK25leHRfcGFnZToKKwkJCWJwYWdlID0gcHJldl9icGFnZTsK
KwkJCWNvbnRpbnVlOwogCQl9CiAKLQkJaWYgKCgoYnVmX2Jsb2NrX3QqKSBicGFnZSktPmlzX2hh
c2hlZCkgeworCQltdXRleF9lbnRlcigmKChidWZfYmxvY2tfdCopIGJwYWdlKS0+bXV0ZXgpOwor
CQlpc19maXhlZCA9IGJwYWdlLT5idWZfZml4X2NvdW50ID4gMAorCQkJfHwgISgoYnVmX2Jsb2Nr
X3QqKSBicGFnZSktPmlzX2hhc2hlZDsKKwkJbXV0ZXhfZXhpdCgmKChidWZfYmxvY2tfdCopIGJw
YWdlKS0+bXV0ZXgpOwogCi0JCQkvKiBTdG9yZSB0aGUgb2Zmc2V0KGkuZS46IHBhZ2Vfbm8pIGlu
IHRoZSBhcnJheQotCQkJc28gdGhhdCB3ZSBjYW4gZHJvcCBoYXNoIGluZGV4IGluIGEgYmF0Y2gK
LQkJCWxhdGVyLiAqLwotCQkJcGFnZV9hcnJbbnVtX2VudHJpZXNdID0gYnBhZ2UtPm9mZnNldDsK
LQkJCW11dGV4X2V4aXQoYmxvY2tfbXV0ZXgpOwotCQkJdXRfYShudW1fZW50cmllcyA8IEJVRl9M
UlVfRFJPUF9TRUFSQ0hfSEFTSF9TSVpFKTsKLQkJCSsrbnVtX2VudHJpZXM7CisJCWlmIChpc19m
aXhlZCkgeworCQkJZ290byBuZXh0X3BhZ2U7CisJCX0KIAotCQkJaWYgKG51bV9lbnRyaWVzIDwg
QlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNIX1NJWkUpIHsKLQkJCQlnb3RvIG5leHRfcGFnZTsKLQkJ
CX0KLQkJCS8qIEFycmF5IGZ1bGwuIFdlIHJlbGVhc2UgdGhlIGJ1Zl9wb29sX211dGV4IHRvCi0J
CQlvYmV5IHRoZSBsYXRjaGluZyBvcmRlci4gKi8KLQkJCWJ1Zl9wb29sX211dGV4X2V4aXQoKTsK
LQotCQkJYnVmX0xSVV9kcm9wX3BhZ2VfaGFzaF9iYXRjaChpZCwgemlwX3NpemUsIHBhZ2VfYXJy
LAotCQkJCQkJICAgICBudW1fZW50cmllcyk7Ci0JCQludW1fZW50cmllcyA9IDA7Ci0JCQlidWZf
cG9vbF9tdXRleF9lbnRlcigpOwotCQl9IGVsc2UgewotCQkJbXV0ZXhfZXhpdChibG9ja19tdXRl
eCk7CisJCS8qIFN0b3JlIHRoZSBwYWdlIG51bWJlciBzbyB0aGF0IHdlIGNhbiBkcm9wIHRoZSBo
YXNoCisJCWluZGV4IGluIGEgYmF0Y2ggbGF0ZXIuICovCisJCXBhZ2VfYXJyW251bV9lbnRyaWVz
XSA9IGJwYWdlLT5vZmZzZXQ7CisJCXV0X2EobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VB
UkNIX0hBU0hfU0laRSk7CisJCSsrbnVtX2VudHJpZXM7CisKKwkJaWYgKG51bV9lbnRyaWVzIDwg
QlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNIX1NJWkUpIHsKKwkJCWdvdG8gbmV4dF9wYWdlOwogCQl9
CiAKLW5leHRfcGFnZToKLQkJLyogTm90ZSB0aGF0IHdlIG1heSBoYXZlIHJlbGVhc2VkIHRoZSBi
dWZfcG9vbCBtdXRleAotCQlhYm92ZSBhZnRlciByZWFkaW5nIHRoZSBwcmV2X2JwYWdlIGR1cmlu
ZyBwcm9jZXNzaW5nCi0JCW9mIGEgcGFnZV9oYXNoX2JhdGNoIChpLmUuOiB3aGVuIHRoZSBhcnJh
eSB3YXMgZnVsbCkuCi0JCVRoaXMgbWVhbnMgdGhhdCBwcmV2X2JwYWdlIGNhbiBjaGFuZ2UgaW4g
TFJVIGxpc3QuCi0JCVRoaXMgaXMgT0sgYmVjYXVzZSB0aGlzIGZ1bmN0aW9uIGlzIGEgJ2Jlc3Qg
ZWZmb3J0JwotCQl0byBkcm9wIGFzIG1hbnkgc2VhcmNoIGhhc2ggZW50cmllcyBhcyBwb3NzaWJs
ZSBhbmQKLQkJaXQgZG9lcyBub3QgZ3VhcmFudGVlIHRoYXQgQUxMIHN1Y2ggZW50cmllcyB3aWxs
IGJlCi0JCWRyb3BwZWQuICovCi0JCWJwYWdlID0gcHJldl9icGFnZTsKKwkJLyogQXJyYXkgZnVs
bC4gV2UgcmVsZWFzZSB0aGUgYnVmX3Bvb2xfbXV0ZXggdG8KKwkJb2JleSB0aGUgbGF0Y2hpbmcg
b3JkZXIuICovCisJCWJ1Zl9wb29sX211dGV4X2V4aXQoKTsKKwkJYnVmX0xSVV9kcm9wX3BhZ2Vf
aGFzaF9iYXRjaChpZCwgemlwX3NpemUsIHBhZ2VfYXJyLAorCQkJCQkgICAgIG51bV9lbnRyaWVz
KTsKKwkJYnVmX3Bvb2xfbXV0ZXhfZW50ZXIoKTsKKwkJbnVtX2VudHJpZXMgPSAwOworCisJCS8q
IE5vdGUgdGhhdCB3ZSByZWxlYXNlZCB0aGUgYnVmX3Bvb2wgbXV0ZXggYWJvdmUKKwkJYWZ0ZXIg
cmVhZGluZyB0aGUgcHJldl9icGFnZSBkdXJpbmcgcHJvY2Vzc2luZyBvZiBhCisJCXBhZ2VfaGFz
aF9iYXRjaCAoaS5lLjogd2hlbiB0aGUgYXJyYXkgd2FzIGZ1bGwpLgorCQlCZWNhdXNlIHByZXZf
YnBhZ2UgY291bGQgYmVsb25nIHRvIGEgY29tcHJlc3NlZC1vbmx5CisJCWJsb2NrLCBpdCBtYXkg
aGF2ZSBiZWVuIHJlbG9jYXRlZCwgYW5kIHRodXMgdGhlCisJCXBvaW50ZXIgY2Fubm90IGJlIHRy
dXN0ZWQuIEJlY2F1c2UgYnBhZ2UgaXMgb2YgdHlwZQorCQlidWZfYmxvY2tfdCwgaXQgaXMgc2Fm
ZSB0byBkZXJlZmVyZW5jZS4KKworCQlicGFnZSBjYW4gY2hhbmdlIGluIHRoZSBMUlUgbGlzdC4g
VGhpcyBpcyBPSyBiZWNhdXNlCisJCXRoaXMgZnVuY3Rpb24gaXMgYSAnYmVzdCBlZmZvcnQnIHRv
IGRyb3AgYXMgbWFueQorCQlzZWFyY2ggaGFzaCBlbnRyaWVzIGFzIHBvc3NpYmxlIGFuZCBpdCBk
b2VzIG5vdAorCQlndWFyYW50ZWUgdGhhdCBBTEwgc3VjaCBlbnRyaWVzIHdpbGwgYmUgZHJvcHBl
ZC4gKi8KIAogCQkvKiBJZiwgaG93ZXZlciwgYnBhZ2UgaGFzIGJlZW4gcmVtb3ZlZCBmcm9tIExS
VSBsaXN0CiAJCXRvIHRoZSBmcmVlIGxpc3QgdGhlbiB3ZSBzaG91bGQgcmVzdGFydCB0aGUgc2Nh
bi4KIAkJYnBhZ2UtPnN0YXRlIGlzIHByb3RlY3RlZCBieSBidWZfcG9vbCBtdXRleC4gKi8KLQkJ
aWYgKGJwYWdlICYmICFidWZfcGFnZV9pbl9maWxlKGJwYWdlKSkgewotCQkJdXRfYShudW1fZW50
cmllcyA9PSAwKTsKKwkJaWYgKGJwYWdlCisJCSAgICAmJiBidWZfcGFnZV9nZXRfc3RhdGUoYnBh
Z2UpICE9IEJVRl9CTE9DS19GSUxFX1BBR0UpIHsKIAkJCWdvdG8gc2Nhbl9hZ2FpbjsKIAkJfQog
CX0KQEAgLTE3OTksNiArMTgwMyw3IEBAIGJ1Zl9MUlVfYmxvY2tfcmVtb3ZlX2hhc2hlZF9wYWdl
KAogCQlidWZfcG9vbF9tdXRleF9leGl0X2ZvcmJpZCgpOwogCQlidWZfYnVkZHlfZnJlZShicGFn
ZS0+emlwLmRhdGEsCiAJCQkgICAgICAgcGFnZV96aXBfZ2V0X3NpemUoJmJwYWdlLT56aXApKTsK
KwkJYnBhZ2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJUF9GUkVFOwogCQlidWZfYnVkZHlfZnJlZShi
cGFnZSwgc2l6ZW9mKCpicGFnZSkpOwogCQlidWZfcG9vbF9tdXRleF9leGl0X2FsbG93KCk7CiAJ
CVVOSVZfTUVNX1VOREVTQyhicGFnZSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2luY2x1ZGUvYnVmMGJ1Zi5oJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
aW5jbHVkZS9idWYwYnVmLmgJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIyNTA5
NTAxOC1qZ212MXBudXBycmp6YXQxCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRl
L2J1ZjBidWYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIyODExNTExOC1v
Z3MzaWIxZWF6OWJzZ2t0CkBAIC00MSw2ICs0MSw4IEBAIENyZWF0ZWQgMTEvNS8xOTk1IEhlaWtr
aSBUdXVyaQogLyogQHsgKi8KICNkZWZpbmUgQlVGX0dFVAkJCTEwCS8qITwgZ2V0IGFsd2F5cyAq
LwogI2RlZmluZQlCVUZfR0VUX0lGX0lOX1BPT0wJMTEJLyohPCBnZXQgaWYgaW4gcG9vbCAqLwor
I2RlZmluZSBCVUZfUEVFS19JRl9JTl9QT09MCTEyCS8qITwgZ2V0IGlmIGluIHBvb2wsIGRvIG5v
dCBtYWtlCisJCQkJCXRoZSBibG9jayB5b3VuZyBpbiB0aGUgTFJVIGxpc3QgKi8KICNkZWZpbmUg
QlVGX0dFVF9OT19MQVRDSAkxNAkvKiE8IGdldCBhbmQgYnVmZmVyZml4LCBidXQKIAkJCQkJc2V0
IG5vIGxhdGNoOyB3ZSBoYXZlCiAJCQkJCXNlcGFyYXRlZCB0aGlzIGNhc2UsIGJlY2F1c2UKQEAg
LTI4NCw3ICsyODYsNyBAQCBidWZfcGFnZV9nZXRfZ2VuKAogCXVsaW50CQlyd19sYXRjaCwvKiE8
IGluOiBSV19TX0xBVENILCBSV19YX0xBVENILCBSV19OT19MQVRDSCAqLwogCWJ1Zl9ibG9ja190
KglndWVzcywJLyohPCBpbjogZ3Vlc3NlZCBibG9jayBvciBOVUxMICovCiAJdWxpbnQJCW1vZGUs
CS8qITwgaW46IEJVRl9HRVQsIEJVRl9HRVRfSUZfSU5fUE9PTCwKLQkJCQlCVUZfR0VUX05PX0xB
VENIICovCisJCQkJQlVGX1BFRUtfSUZfSU5fUE9PTCwgQlVGX0dFVF9OT19MQVRDSCAqLwogCWNv
bnN0IGNoYXIqCWZpbGUsCS8qITwgaW46IGZpbGUgbmFtZSAqLwogCXVsaW50CQlsaW5lLAkvKiE8
IGluOiBsaW5lIHdoZXJlIGNhbGxlZCAqLwogCW10cl90KgkJbXRyKTsJLyohPCBpbjogbWluaS10
cmFuc2FjdGlvbiAqLwoK

--===============0994988150==
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: a558a70deb6d9fe78d4bdb9cddad7533b67afe6a
# timestamp: 2011-02-28 16:04:16 +0200
# base_revision_id: vasil.dimov@stripped\
#   jgmv1pnuprrjzat1
# 
# Begin bundle
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
e93/F3JFOFCQ2sd3Wg==


--===============0994988150==--