From: marko.makela
Date: August 9 2010 8:58am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3149 to 3150) Bug#54914
List-Archive: http://lists.mysql.com/commits/115330
X-Bug: 54914
Message-Id: <201008090859.o798SjJZ024503@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0266554411=="

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

IDMxNTAgTWFya28gTcOka2Vsw6QJMjAxMC0wOC0wOQogICAgICBSZWR1Y2UgdGhlIGlidWZfbXV0
ZXggaG9sZCB0aW1lLiBUaGlzIGRvZXMgbm90IGZpeCB0aGUgdXBkYXRlCiAgICAgIHJlZ3Jlc3Np
b24gaW4gQnVnICM1NDkxNCwgYnV0IGl0IGRvZXMgc3BlZWQgdXAgdGhlIGV4ZWN1dGlvbiBmb3IK
ICAgICAgaW5ub2RiX2NoYW5nZV9idWZmZXJpbmc9aW5zZXJ0cy4KICAgICAgCiAgICAgIGlidWZf
YWRkX29wcygpLCBpYnVmX21lcmdlX29yX2RlbGV0ZV9mb3JfcGFnZSgpLAogICAgICBpYnVmX2Rl
bGV0ZV9mb3JfZGlzY2FyZGVkX3NwYWNlKCk6IFVzZSBhdG9taWMgYnVpbHQtaW5zIGluc3RlYWQg
b2YKICAgICAgaWJ1Zl9tdXRleCwgd2hlbiBhdmFpbGFibGUuCiAgICAgIAogICAgICBpYnVmX2Fk
ZF9mcmVlX3BhZ2UoKSwgaWJ1Zl9yZW1vdmVfZnJlZV9wYWdlKCksIGlidWZfY29udHJhY3RfZXh0
KCk6CiAgICAgIFJlbGVhc2UgaWJ1Zl9tdXRleCBlYXJsaWVyLgogICAgICAKICAgICAgaWJ1Zl9m
cmVlX2V4Y2Vzc19wYWdlcygpOiBSZWxlYXNlIGlidWZfbXV0ZXggYmVmb3JlIGEgY29uZGl0aW9u
YWwgYnJhbmNoLgogICAgICAKICAgICAgaWJ1Zl9pbnNlcnRfbG93KCk6IFJlbGVhc2UgaWJ1Zl9t
dXRleCBiZWZvcmUgYSBjb25kaXRpb25hbAogICAgICBicmFuY2guIENyZWF0ZSBpYnVmX2VudHJ5
IGJlZm9yZSByZS1hY3F1aXJpbmcgaWJ1Zl9tdXRleC4gU2ltcGxpZnkgYQogICAgICBsb29wIHRv
IHJlZHVjZSBjb2RlIGZvb3RwcmludC4gUmVsZWFzZSBpYnVmX211dGV4IGJlZm9yZSBtdHJfY29t
bWl0KCkKICAgICAgW2J0cl9wY3VyX2Nsb3NlKCldLgogICAgICAKICAgICAgaWJ1Zl9pc19lbXB0
eSgpOiBSZWxlYXNlIGlidWZfbXV0ZXggYmVmb3JlIG10cl9jb21taXQoKS4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCiAzMTQ5IEluYWFtIFJh
bmEJMjAxMC0wOC0wNSBbbWVyZ2VdCiAgICAgIG1lcmdlCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9p
YnVmL2lidWYwaWJ1Zi5jCXJldmlkOmluYWFtLnJhbmFAb3JhY2xlLmNvbS0yMDEwMDgwNTE1NDIx
MS1mYTlnNnFhZ3F6YmtwZmJrCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYu
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDgwOTA4NTgzNy1zMW5meDZnamY3
bDZ0dGFiCkBAIC0xMzUwLDEwICsxMzUwLDE4IEBAIGlidWZfYWRkX29wcygKIAljb25zdCB1bGlu
dCoJb3BzKQkvKiE8IGluOiBvcGVyYXRpb24gY291bnRzICovCiAKIHsKKyNpZm5kZWYgSEFWRV9B
VE9NSUNfQlVJTFRJTlMKKwl1dF9hZChtdXRleF9vd24oJmlidWZfbXV0ZXgpKTsKKyNlbmRpZiAv
KiAhSEFWRV9BVE9NSUNfQlVJTFRJTlMgKi8KKwogCXVsaW50CWk7CiAKIAlmb3IgKGkgPSAwOyBp
IDwgSUJVRl9PUF9DT1VOVDsgaSsrKSB7CisjaWZkZWYgSEFWRV9BVE9NSUNfQlVJTFRJTlMKKwkJ
b3NfYXRvbWljX2luY3JlbWVudF91bGludCgmYXJyW2ldLCBvcHNbaV0pOworI2Vsc2UgLyogSEFW
RV9BVE9NSUNfQlVJTFRJTlMgKi8KIAkJYXJyW2ldICs9IG9wc1tpXTsKKyNlbmRpZiAvKiBIQVZF
X0FUT01JQ19CVUlMVElOUyAqLwogCX0KIH0KIApAQCAtMjA5NiwxMyArMjEwNCwxMyBAQCBpYnVm
X2FkZF9mcmVlX3BhZ2Uodm9pZCkKIAliaXRtYXBfcGFnZSA9IGlidWZfYml0bWFwX2dldF9tYXBf
cGFnZSgKIAkJSUJVRl9TUEFDRV9JRCwgcGFnZV9ubywgemlwX3NpemUsICZtdHIpOwogCisJbXV0
ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CisKIAlpYnVmX2JpdG1hcF9wYWdlX3NldF9iaXRzKAogCQli
aXRtYXBfcGFnZSwgcGFnZV9ubywgemlwX3NpemUsIElCVUZfQklUTUFQX0lCVUYsIFRSVUUsICZt
dHIpOwogCiAJbXRyX2NvbW1pdCgmbXRyKTsKIAotCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwot
CiAJaWJ1Zl9leGl0KCk7CiAKIAlyZXR1cm4oREJfU1VDQ0VTUyk7CkBAIC0yMTU4LDYgKzIxNjYs
OCBAQCBpYnVmX3JlbW92ZV9mcmVlX3BhZ2Uodm9pZCkKIAogCXJvb3QgPSBpYnVmX3RyZWVfcm9v
dF9nZXQoJm10cjIpOwogCisJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CisKIAlwYWdlX25vID0g
ZmxzdF9nZXRfbGFzdChyb290ICsgUEFHRV9IRUFERVIgKyBQQUdFX0JUUl9JQlVGX0ZSRUVfTElT
VCwKIAkJCQkmbXRyMikucGFnZTsKIApAQCAtMjE2Niw3ICsyMTc2LDYgQEAgaWJ1Zl9yZW1vdmVf
ZnJlZV9wYWdlKHZvaWQpCiAJaXMgYSBsZXZlbCAyIHBhZ2UuICovCiAKIAltdHJfY29tbWl0KCZt
dHIyKTsKLQltdXRleF9leGl0KCZpYnVmX211dGV4KTsKIAogCWlidWZfZXhpdCgpOwogCkBAIC0y
MjIwLDYgKzIyMjksOCBAQCBpYnVmX3JlbW92ZV9mcmVlX3BhZ2Uodm9pZCkKIAliaXRtYXBfcGFn
ZSA9IGlidWZfYml0bWFwX2dldF9tYXBfcGFnZSgKIAkJSUJVRl9TUEFDRV9JRCwgcGFnZV9ubywg
emlwX3NpemUsICZtdHIpOwogCisJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CisKIAlpYnVmX2Jp
dG1hcF9wYWdlX3NldF9iaXRzKAogCQliaXRtYXBfcGFnZSwgcGFnZV9ubywgemlwX3NpemUsIElC
VUZfQklUTUFQX0lCVUYsIEZBTFNFLCAmbXRyKTsKIApAQCAtMjIyOCw4ICsyMjM5LDYgQEAgaWJ1
Zl9yZW1vdmVfZnJlZV9wYWdlKHZvaWQpCiAjZW5kaWYKIAltdHJfY29tbWl0KCZtdHIpOwogCi0J
bXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7Ci0KIAlpYnVmX2V4aXQoKTsKIH0KIApAQCAtMjI3MCwx
NyArMjI3OSwxNiBAQCBpYnVmX2ZyZWVfZXhjZXNzX3BhZ2VzKHZvaWQpCiAKIAlmb3IgKGkgPSAw
OyBpIDwgNDsgaSsrKSB7CiAKLQkJbXV0ZXhfZW50ZXIoJmlidWZfbXV0ZXgpOwotCi0JCWlmICgh
aWJ1Zl9kYXRhX3Rvb19tdWNoX2ZyZWUoKSkgeworCQlpYm9vbAl0b29fbXVjaF9mcmVlOwogCi0J
CQltdXRleF9leGl0KCZpYnVmX211dGV4KTsKKwkJbXV0ZXhfZW50ZXIoJmlidWZfbXV0ZXgpOwor
CQl0b29fbXVjaF9mcmVlID0gaWJ1Zl9kYXRhX3Rvb19tdWNoX2ZyZWUoKTsKKwkJbXV0ZXhfZXhp
dCgmaWJ1Zl9tdXRleCk7CiAKKwkJaWYgKCF0b29fbXVjaF9mcmVlKSB7CiAJCQlyZXR1cm47CiAJ
CX0KIAotCQltdXRleF9leGl0KCZpYnVmX211dGV4KTsKLQogCQlpYnVmX3JlbW92ZV9mcmVlX3Bh
Z2UoKTsKIAl9CiB9CkBAIC0yNDg2LDggKzI0OTQsOCBAQCBpYnVmX2NvbnRyYWN0X2V4dCgKIAlt
dXRleF9lbnRlcigmaWJ1Zl9tdXRleCk7CiAKIAlpZiAoaWJ1Zi0+ZW1wdHkpIHsKLWlidWZfaXNf
ZW1wdHk6CiAJCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOworaWJ1Zl9pc19lbXB0eToKIAogI2lm
IDAgLyogVE9ETyAqLwogCQlpZiAoc3J2X3NodXRkb3duX3N0YXRlKSB7CkBAIC0yNTE1LDYgKzI1
MjMsNyBAQCBpYnVmX2lzX2VtcHR5OgogCXBvc2l0aW9uIHdpdGhpbiB0aGUgbGVhZiAqLwogCiAJ
YnRyX3BjdXJfb3Blbl9hdF9ybmRfcG9zKGlidWYtPmluZGV4LCBCVFJfU0VBUkNIX0xFQUYsICZw
Y3VyLCAmbXRyKTsKKwltdXRleF9leGl0KCZpYnVmX211dGV4KTsKIAogCXV0X2FkKHBhZ2VfdmFs
aWRhdGUoYnRyX3BjdXJfZ2V0X3BhZ2UoJnBjdXIpLCBpYnVmLT5pbmRleCkpOwogCkBAIC0yNTM1
LDggKzI1NDQsNiBAQCBpYnVmX2lzX2VtcHR5OgogCQlnb3RvIGlidWZfaXNfZW1wdHk7CiAJfQog
Ci0JbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7Ci0KIAlzdW1fc2l6ZXMgPSBpYnVmX2dldF9tZXJn
ZV9wYWdlX25vcyhUUlVFLCBidHJfcGN1cl9nZXRfcmVjKCZwY3VyKSwKIAkJCQkJICAgIHNwYWNl
X2lkcywgc3BhY2VfdmVyc2lvbnMsCiAJCQkJCSAgICBwYWdlX25vcywgJm5fc3RvcmVkKTsKQEAg
LTMzMDQsNiArMzMxMSw3IEBAIGlidWZfaW5zZXJ0X2xvdygKIAl1bGludAkJbl9zdG9yZWQ7CiAJ
bXRyX3QJCW10cjsKIAltdHJfdAkJYml0bWFwX210cjsKKwlpYm9vbAkJdG9vX2JpZzsKIAogCXV0
X2EoIWRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpKTsKIAl1dF9hZChkdHVwbGVfY2hlY2tfdHlw
ZWQoZW50cnkpKTsKQEAgLTMzMTYsMTIgKzMzMjQsMTMgQEAgaWJ1Zl9pbnNlcnRfbG93KAogCWRv
X21lcmdlID0gRkFMU0U7CiAKIAltdXRleF9lbnRlcigmaWJ1Zl9tdXRleCk7CisJdG9vX2JpZyA9
IGlidWYtPnNpemUgPj0gaWJ1Zi0+bWF4X3NpemUgKyBJQlVGX0NPTlRSQUNUX0RPX05PVF9JTlNF
UlQ7CisJbXV0ZXhfZXhpdCgmaWJ1Zl9tdXRleCk7CiAKLQlpZiAoaWJ1Zi0+c2l6ZSA+PSBpYnVm
LT5tYXhfc2l6ZSArIElCVUZfQ09OVFJBQ1RfRE9fTk9UX0lOU0VSVCkgeworCWlmICh0b29fYmln
KSB7CiAJCS8qIEluc2VydCBidWZmZXIgaXMgbm93IHRvbyBiaWcsIGNvbnRyYWN0IGl0IGJ1dCBk
byBub3QgdHJ5CiAJCXRvIGluc2VydCAqLwogCi0JCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwog
CiAjaWZkZWYgVU5JVl9JQlVGX0RFQlVHCiAJCWZwdXRzKCJJYnVmIHRvbyBiaWdcbiIsIHN0ZGVy
cik7CkBAIC0zMzMyLDE2ICszMzQxLDM2IEBAIGlidWZfaW5zZXJ0X2xvdygKIAkJcmV0dXJuKERC
X1NUUk9OR19GQUlMKTsKIAl9CiAKLQltdXRleF9leGl0KCZpYnVmX211dGV4KTsKKwloZWFwID0g
bWVtX2hlYXBfY3JlYXRlKDUxMik7CisKKwkvKiBCdWlsZCB0aGUgZW50cnkgd2hpY2ggY29udGFp
bnMgdGhlIHNwYWNlIGlkIGFuZCB0aGUgcGFnZSBudW1iZXIKKwlhcyB0aGUgZmlyc3QgZmllbGRz
IGFuZCB0aGUgdHlwZSBpbmZvcm1hdGlvbiBmb3Igb3RoZXIgZmllbGRzLCBhbmQKKwl3aGljaCB3
aWxsIGJlIGluc2VydGVkIHRvIHRoZSBpbnNlcnQgYnVmZmVyLiBVc2luZyBhIGNvdW50ZXIgdmFs
dWUKKwlvZiAweEZGRkYgd2UgZmluZCB0aGUgbGFzdCByZWNvcmQgZm9yIChzcGFjZSwgcGFnZV9u
byksIGZyb20gd2hpY2gKKwl3ZSBjYW4gdGhlbiByZWFkIHRoZSBjb3VudGVyIHZhbHVlIE4gYW5k
IHVzZSBOICsgMSBpbiB0aGUgcmVjb3JkIHdlCisJaW5zZXJ0LiAoV2UgcGF0Y2ggdGhlIGlidWZf
ZW50cnkncyBjb3VudGVyIGZpZWxkIHRvIHRoZSBjb3JyZWN0CisJdmFsdWUganVzdCBiZWZvcmUg
YWN0dWFsbHkgaW5zZXJ0aW5nIHRoZSBlbnRyeS4pICovCisKKwlpYnVmX2VudHJ5ID0gaWJ1Zl9l
bnRyeV9idWlsZCgKKwkJb3AsIGluZGV4LCBlbnRyeSwgc3BhY2UsIHBhZ2Vfbm8sCisJCW5vX2Nv
dW50ZXIgPyBVTElOVF9VTkRFRklORUQgOiAweEZGRkYsIGhlYXApOworCisJLyogT3BlbiBhIGN1
cnNvciB0byB0aGUgaW5zZXJ0IGJ1ZmZlciB0cmVlIHRvIGNhbGN1bGF0ZSBpZiB3ZSBjYW4gYWRk
CisJdGhlIG5ldyBlbnRyeSB0byBpdCB3aXRob3V0IGV4Y2VlZGluZyB0aGUgZnJlZSBzcGFjZSBs
aW1pdCBmb3IgdGhlCisJcGFnZS4gKi8KIAogCWlmIChtb2RlID09IEJUUl9NT0RJRllfVFJFRSkg
ewotCQltdXRleF9lbnRlcigmaWJ1Zl9wZXNzaW1pc3RpY19pbnNlcnRfbXV0ZXgpOworCQlmb3Ig
KDs7KSB7CisJCQltdXRleF9lbnRlcigmaWJ1Zl9wZXNzaW1pc3RpY19pbnNlcnRfbXV0ZXgpOwog
Ci0JCWlidWZfZW50ZXIoKTsKKwkJCWlidWZfZW50ZXIoKTsKIAotCQltdXRleF9lbnRlcigmaWJ1
Zl9tdXRleCk7CisJCQltdXRleF9lbnRlcigmaWJ1Zl9tdXRleCk7CiAKLQkJd2hpbGUgKCFpYnVm
X2RhdGFfZW5vdWdoX2ZyZWVfZm9yX2luc2VydCgpKSB7CisJCQlpZiAoVU5JVl9MSUtFTFkoaWJ1
Zl9kYXRhX2Vub3VnaF9mcmVlX2Zvcl9pbnNlcnQoKSkpIHsKKworCQkJCWJyZWFrOworCQkJfQog
CiAJCQltdXRleF9leGl0KCZpYnVmX211dGV4KTsKIApAQCAtMzM1MSwzOSArMzM4MCwxNiBAQCBp
YnVmX2luc2VydF9sb3coCiAKIAkJCWVyciA9IGlidWZfYWRkX2ZyZWVfcGFnZSgpOwogCi0JCQlp
ZiAoZXJyID09IERCX1NUUk9OR19GQUlMKSB7CisJCQlpZiAoVU5JVl9VTkxJS0VMWShlcnIgPT0g
REJfU1RST05HX0ZBSUwpKSB7CiAKKwkJCQltZW1faGVhcF9mcmVlKGhlYXApOwogCQkJCXJldHVy
bihlcnIpOwogCQkJfQotCi0JCQltdXRleF9lbnRlcigmaWJ1Zl9wZXNzaW1pc3RpY19pbnNlcnRf
bXV0ZXgpOwotCi0JCQlpYnVmX2VudGVyKCk7Ci0KLQkJCW11dGV4X2VudGVyKCZpYnVmX211dGV4
KTsKIAkJfQogCX0gZWxzZSB7CiAJCWlidWZfZW50ZXIoKTsKIAl9CiAKLQloZWFwID0gbWVtX2hl
YXBfY3JlYXRlKDUxMik7Ci0KLQkvKiBCdWlsZCB0aGUgZW50cnkgd2hpY2ggY29udGFpbnMgdGhl
IHNwYWNlIGlkIGFuZCB0aGUgcGFnZSBudW1iZXIKLQlhcyB0aGUgZmlyc3QgZmllbGRzIGFuZCB0
aGUgdHlwZSBpbmZvcm1hdGlvbiBmb3Igb3RoZXIgZmllbGRzLCBhbmQKLQl3aGljaCB3aWxsIGJl
IGluc2VydGVkIHRvIHRoZSBpbnNlcnQgYnVmZmVyLiBVc2luZyBhIGNvdW50ZXIgdmFsdWUKLQlv
ZiAweEZGRkYgd2UgZmluZCB0aGUgbGFzdCByZWNvcmQgZm9yIChzcGFjZSwgcGFnZV9ubyksIGZy
b20gd2hpY2gKLQl3ZSBjYW4gdGhlbiByZWFkIHRoZSBjb3VudGVyIHZhbHVlIE4gYW5kIHVzZSBO
ICsgMSBpbiB0aGUgcmVjb3JkIHdlCi0JaW5zZXJ0LiAoV2UgcGF0Y2ggdGhlIGlidWZfZW50cnkn
cyBjb3VudGVyIGZpZWxkIHRvIHRoZSBjb3JyZWN0Ci0JdmFsdWUganVzdCBiZWZvcmUgYWN0dWFs
bHkgaW5zZXJ0aW5nIHRoZSBlbnRyeS4pICovCi0KLQlpYnVmX2VudHJ5ID0gaWJ1Zl9lbnRyeV9i
dWlsZCgKLQkJb3AsIGluZGV4LCBlbnRyeSwgc3BhY2UsIHBhZ2Vfbm8sCi0JCW5vX2NvdW50ZXIg
PyBVTElOVF9VTkRFRklORUQgOiAweEZGRkYsIGhlYXApOwotCi0JLyogT3BlbiBhIGN1cnNvciB0
byB0aGUgaW5zZXJ0IGJ1ZmZlciB0cmVlIHRvIGNhbGN1bGF0ZSBpZiB3ZSBjYW4gYWRkCi0JdGhl
IG5ldyBlbnRyeSB0byBpdCB3aXRob3V0IGV4Y2VlZGluZyB0aGUgZnJlZSBzcGFjZSBsaW1pdCBm
b3IgdGhlCi0JcGFnZS4gKi8KLQogCW10cl9zdGFydCgmbXRyKTsKIAogCWJ0cl9wY3VyX29wZW4o
aWJ1Zi0+aW5kZXgsIGlidWZfZW50cnksIFBBR0VfQ1VSX0xFLCBtb2RlLCAmcGN1ciwgJm10cik7
CkBAIC00MTE4LDkgKzQxMjQsOCBAQCBpYnVmX2RlbGV0ZV9yZWMoCiAJYnRyX3BjdXJfY29tbWl0
X3NwZWNpZnlfbXRyKHBjdXIsIG10cik7CiAKIGZ1bmNfZXhpdDoKLQlidHJfcGN1cl9jbG9zZShw
Y3VyKTsKLQogCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOworCWJ0cl9wY3VyX2Nsb3NlKHBjdXIp
OwogCiAJcmV0dXJuKFRSVUUpOwogfQpAQCAtNDQ5NSw2ICs0NTAwLDExIEBAIHJlc2V0X2JpdDoK
IAlidHJfcGN1cl9jbG9zZSgmcGN1cik7CiAJbWVtX2hlYXBfZnJlZShoZWFwKTsKIAorI2lmZGVm
IEhBVkVfQVRPTUlDX0JVSUxUSU5TCisJb3NfYXRvbWljX2luY3JlbWVudF91bGludCgmaWJ1Zi0+
bl9tZXJnZXMsIDEpOworCWlidWZfYWRkX29wcyhpYnVmLT5uX21lcmdlZF9vcHMsIG1vcHMpOwor
CWlidWZfYWRkX29wcyhpYnVmLT5uX2Rpc2NhcmRlZF9vcHMsIGRvcHMpOworI2Vsc2UgLyogSEFW
RV9BVE9NSUNfQlVJTFRJTlMgKi8KIAkvKiBQcm90ZWN0IG91ciBzdGF0aXN0aWNzIGtlZXBpbmcg
ZnJvbSByYWNlIGNvbmRpdGlvbnMgKi8KIAltdXRleF9lbnRlcigmaWJ1Zl9tdXRleCk7CiAKQEAg
LTQ1MDMsNiArNDUxMyw3IEBAIHJlc2V0X2JpdDoKIAlpYnVmX2FkZF9vcHMoaWJ1Zi0+bl9kaXNj
YXJkZWRfb3BzLCBkb3BzKTsKIAogCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOworI2VuZGlmIC8q
IEhBVkVfQVRPTUlDX0JVSUxUSU5TICovCiAKIAlpZiAodXBkYXRlX2lidWZfYml0bWFwICYmICF0
YWJsZXNwYWNlX2JlaW5nX2RlbGV0ZWQpIHsKIApAQCAtNDYwNCwxMCArNDYxNSwxNCBAQCBsZWF2
ZV9sb29wOgogCW10cl9jb21taXQoJm10cik7CiAJYnRyX3BjdXJfY2xvc2UoJnBjdXIpOwogCisj
aWZkZWYgSEFWRV9BVE9NSUNfQlVJTFRJTlMKKwlpYnVmX2FkZF9vcHMoaWJ1Zi0+bl9kaXNjYXJk
ZWRfb3BzLCBkb3BzKTsKKyNlbHNlIC8qIEhBVkVfQVRPTUlDX0JVSUxUSU5TICovCiAJLyogUHJv
dGVjdCBvdXIgc3RhdGlzdGljcyBrZWVwaW5nIGZyb20gcmFjZSBjb25kaXRpb25zICovCiAJbXV0
ZXhfZW50ZXIoJmlidWZfbXV0ZXgpOwogCWlidWZfYWRkX29wcyhpYnVmLT5uX2Rpc2NhcmRlZF9v
cHMsIGRvcHMpOwogCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOworI2VuZGlmIC8qIEhBVkVfQVRP
TUlDX0JVSUxUSU5TICovCiAKIAlpYnVmX2V4aXQoKTsKIApAQCAtNDY1MiwxMCArNDY2NywxMCBA
QCBpYnVmX2lzX2VtcHR5KHZvaWQpCiAJCWlzX2VtcHR5ID0gRkFMU0U7CiAJfQogCi0JbXRyX2Nv
bW1pdCgmbXRyKTsKLQogCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwogCisJbXRyX2NvbW1pdCgm
bXRyKTsKKwogCWlidWZfZXhpdCgpOwogCiAJcmV0dXJuKGlzX2VtcHR5KTsKCg==

--===============0266554411==
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: b48147d9335c25064f7375b6455e55a5103ac7a2
# timestamp: 2010-08-09 11:58:59 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@stripped\
#   fa9g6qagqzbkpfbk
# 
# Begin bundle
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
akf4cv0/8XckU4UJBc5V4MA=


--===============0266554411==--