From: marko.makela
Date: May 19 2010 8:19am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3468 to 3473)
List-Archive: http://lists.mysql.com/commits/108583
Message-Id: <201005190819.o4J8Hxpu010431@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1346018148=="

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

IDM0NzMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBNYWtlIFVOSVZfREVCVUcgVmFs
Z3JpbmQgZnJpZW5kbHkgaW4gdGhlIGJ1aWx0LWluIElubm9EQi4KICAgICAgVXNlIHwgaW5zdGVh
ZCBvZiArLCBhbmQgbWFzayBvdXQgdGhlIGRvbnQtY2FyZSBiaXRzIGluIGRlYnVnIGFzc2VydGlv
bnMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tYWNoMGRh
dGEuaWMKIDM0NzIgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBNYWtlIFVOSVZfREVC
VUcgVmFsZ3JpbmQgZnJpZW5kbHkuIFVzZSB8IGluc3RlYWQgb2YgKywKICAgICAgYW5kIG1hc2sg
b3V0IHRoZSBkb250LWNhcmUgYml0cyBpbiBkZWJ1ZyBhc3NlcnRpb25zLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9tYWNoMGRhdGEuaWMKIDM0NzEg
TWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBTaWxlbmNlIHNvbWUgbW9yZSBib2d1cyBW
YWxncmluZCB3YXJuaW5ncyBvbiBub24tMzItYml0IHN5c3RlbXMuIChCdWcgIzUzMzA3KQoKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBidWRkeS5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9wYWdl
L3BhZ2UwemlwLmMKIDM0NzAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBBZGQgVmFs
Z3JpbmQgY2hlY2tzIHRvIGNvbXByZXNzZWQgQkxPQiBhY2Nlc3MuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCiAzNDY5IE1hcmtvIE3DpGtl
bMOkCTIwMTAtMDUtMTkKICAgICAgV29yayBhcm91bmQgQnVnICM1Mzc1MCBpbiBpbm5vZGIuaW5u
b2RiX2J1ZzQ4MDI0CgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QKIDM0NjggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOAog
ICAgICBXb3JrIGFyb3VuZCBCdWcgIzUzNzUwIGluIGlubm9kYl9idWc0ODAyNC50ZXN0CgogICAg
bW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9i
dWc0ODAyNC50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYl9idWc0ODAyNC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lu
bm9kYl9idWc0ODAyNC50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE4
MTMwNjU4LXJkMDBxbDdoMDJvb2FraDEKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9p
bm5vZGJfYnVnNDgwMjQudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUx
OTA4MTYxOC1oMzhxMDJxeHV2Y293YnRrCkBAIC0xMCw2ICsxMCw4IEBAIEFERCBDT05TVFJBSU5U
IEZPUkVJR04gS0VZKGIpIFJFRkVSRU5DRVMKIAogRFJPUCBUQUJMRSBidWc0ODAyNCxidWc0ODAy
NF9iOwogCisjIFdvcmsgYXJvdW5kIEJ1ZyAjNTM3NTAgKGZhaWx1cmUgaW4gbXlzcWwtdGVzdC1y
dW4gLS1wcy1wcm90b2NvbCkKKy0tIGRpc2FibGVfcHNfcHJvdG9jb2wKIGRlbGltaXRlciB8Owog
Q1JFQVRFIFRBQkxFIGJ1ZzQ4MDI0KGEgaW50IFBSSU1BUlkgS0VZLGIgaW50IE5PVCBOVUxMLEtF
WShiKSkgRU5HSU5FPUlubm9EQjsKIENSRUFURSBUQUJMRSBidWc0ODAyNF9iKGIgaW50IFBSSU1B
UlkgS0VZKSBFTkdJTkU9SW5ub0RCOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9tYWNoMGRhdGEuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9t
YWNoMGRhdGEuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTgxMzA2NTgt
cmQwMHFsN2gwMm9vYWtoMQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbWFjaDBkYXRh
LmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgxNjE4LWgzOHEwMnF4
dXZjb3didGsKQEAgLTE5LDcgKzE5LDcgQEAgbWFjaF93cml0ZV90b18xKAogCXVsaW50CW4pCS8q
IGluOiB1bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCwgPj0gMCwgPCAyNTYgKi8KIHsKIAl1dF9h
ZChiKTsKLQl1dF9hZChuIDw9IDB4RkZVTCk7CisJdXRfYWQoKG4gfCAweEZGVUwpIDw9IDB4RkZV
TCk7CiAKIAliWzBdID0gKGJ5dGUpbjsKIH0KQEAgLTQ4LDcgKzQ4LDcgQEAgbWFjaF93cml0ZV90
b18yKAogCXVsaW50CW4pCS8qIGluOiB1bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCAqLwogewog
CXV0X2FkKGIpOwotCXV0X2FkKG4gPD0gMHhGRkZGVUwpOworCXV0X2FkKChuIHwgMHhGRkZGVUwp
IDw9IDB4RkZGRlVMKTsKIAogCWJbMF0gPSAoYnl0ZSkobiA+PiA4KTsKIAliWzFdID0gKGJ5dGUp
KG4pOwpAQCAtNjQsMTAgKzY0LDcgQEAgbWFjaF9yZWFkX2Zyb21fMigKIAkJCS8qIG91dDogdWxp
bnQgaW50ZWdlciAqLwogCWJ5dGUqCWIpCS8qIGluOiBwb2ludGVyIHRvIDIgYnl0ZXMgKi8KIHsK
LQl1dF9hZChiKTsKLQlyZXR1cm4oICgodWxpbnQpKGJbMF0pIDw8IDgpCi0JCSsgKHVsaW50KShi
WzFdKQotCQkpOworCXJldHVybigoKHVsaW50KShiWzBdKSA8PCA4KSB8ICh1bGludCkoYlsxXSkp
OwogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqCkBAIC0xMTIsNyArMTA5LDcgQEAgbWFjaF93cml0ZV90b18zKAogCXVsaW50
CW4pCS8qIGluOiB1bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCAqLwogewogCXV0X2FkKGIpOwot
CXV0X2FkKG4gPD0gMHhGRkZGRkZVTCk7CisJdXRfYWQoKG4gfCAweEZGRkZGRlVMKSA8PSAweEZG
RkZGRlVMKTsKIAogCWJbMF0gPSAoYnl0ZSkobiA+PiAxNik7CiAJYlsxXSA9IChieXRlKShuID4+
IDgpOwpAQCAtMTMxLDggKzEyOCw4IEBAIG1hY2hfcmVhZF9mcm9tXzMoCiB7CiAJdXRfYWQoYik7
CiAJcmV0dXJuKCAoKHVsaW50KShiWzBdKSA8PCAxNikKLQkJKyAoKHVsaW50KShiWzFdKSA8PCA4
KQotCQkrICh1bGludCkoYlsyXSkKKwkJfCAoKHVsaW50KShiWzFdKSA8PCA4KQorCQl8ICh1bGlu
dCkoYlsyXSkKIAkJKTsKIH0KIApAQCAtMTY2LDkgKzE2Myw5IEBAIG1hY2hfcmVhZF9mcm9tXzQo
CiB7CiAJdXRfYWQoYik7CiAJcmV0dXJuKCAoKHVsaW50KShiWzBdKSA8PCAyNCkKLQkJKyAoKHVs
aW50KShiWzFdKSA8PCAxNikKLQkJKyAoKHVsaW50KShiWzJdKSA8PCA4KQotCQkrICh1bGludCko
YlszXSkKKwkJfCAoKHVsaW50KShiWzFdKSA8PCAxNikKKwkJfCAoKHVsaW50KShiWzJdKSA8PCA4
KQorCQl8ICh1bGludCkoYlszXSkKIAkJKTsKIH0KIApAQCAtNjcwLDcgKzY2Nyw3IEBAIG1hY2hf
cmVhZF9mcm9tXzJfbGl0dGxlX2VuZGlhbigKIAkJCQkvKiBvdXQ6IHVuc2lnbmVkIGxvbmcgaW50
ICovCiAJYnl0ZSoJYnVmKQkJLyogaW46IGZyb20gd2hlcmUgdG8gcmVhZCAqLwogewotCXJldHVy
bigodWxpbnQpKCpidWYpICsgKCh1bGludCkoKihidWYgKyAxKSkpICogMjU2KTsKKwlyZXR1cm4o
KHVsaW50KShidWZbMF0pIHwgKCh1bGludCkoYnVmWzFdKSA8PCA4KSk7CiB9CiAKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTE4MTMwNjU4LXJkMDBxbDdoMDJvb2FraDEKKysrIGIvc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA1MTkwODE2MTgtaDM4cTAycXh1dmNvd2J0awpAQCAtMzg3MSw2ICszODcxLDggQEAg
YnRyX3N0b3JlX2JpZ19yZWNfZXh0ZXJuX2ZpZWxkcygKIAkJCWZpZWxkX3JlZiArPSBsb2NhbF9s
ZW47CiAJCX0KIAkJZXh0ZXJuX2xlbiA9IGJpZ19yZWNfdmVjLT5maWVsZHNbaV0ubGVuOworCQlV
TklWX01FTV9BU1NFUlRfUlcoYmlnX3JlY192ZWMtPmZpZWxkc1tpXS5kYXRhLAorCQkJCSAgIGV4
dGVybl9sZW4pOwogCiAJCXV0X2EoZXh0ZXJuX2xlbiA+IDApOwogCkBAIC00NTA3LDYgKzQ1MDks
NyBAQCBidHJfY29weV9ibG9iX3ByZWZpeCgKIAkJbXRyX2NvbW1pdCgmbXRyKTsKIAogCQlpZiAo
cGFnZV9ubyA9PSBGSUxfTlVMTCB8fCBjb3B5X2xlbiAhPSBwYXJ0X2xlbikgeworCQkJVU5JVl9N
RU1fQVNTRVJUX1JXKGJ1ZiwgY29waWVkX2xlbik7CiAJCQlyZXR1cm4oY29waWVkX2xlbik7CiAJ
CX0KIApAQCAtNDY5MCw2ICs0NjkzLDcgQEAgYnRyX2NvcHlfZXh0ZXJuYWxseV9zdG9yZWRfZmll
bGRfcHJlZml4XwogCQkJCSAgICAgIHNwYWNlX2lkLCBwYWdlX25vLCBvZmZzZXQpOwogCQlpbmZs
YXRlRW5kKCZkX3N0cmVhbSk7CiAJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CisJCVVOSVZfTUVNX0FT
U0VSVF9SVyhidWYsIGRfc3RyZWFtLnRvdGFsX291dCk7CiAJCXJldHVybihkX3N0cmVhbS50b3Rh
bF9vdXQpOwogCX0gZWxzZSB7CiAJCXJldHVybihidHJfY29weV9ibG9iX3ByZWZpeChidWYsIGxl
biwgc3BhY2VfaWQsCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1
Zi9idWYwYnVkZHkuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVkZHku
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxODEzMDY1OC1yZDAwcWw3aDAy
b29ha2gxCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1ZGR5LmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwODE2MTgtaDM4cTAycXh1dmNvd2J0awpA
QCAtNDk1LDcgKzQ5NSwxMiBAQCBzdWNjZXNzOgogCQltdXRleF9leGl0KG11dGV4KTsKIAl9IGVs
c2UgaWYgKGkgPT0gYnVmX2J1ZGR5X2dldF9zbG90KHNpemVvZihidWZfcGFnZV90KSkpIHsKIAkJ
LyogVGhpcyBtdXN0IGJlIGEgYnVmX3BhZ2VfdCBvYmplY3QuICovCisjaWYgVU5JVl9XT1JEX1NJ
WkUgPT0gNAorCQkvKiBPbiAzMi1iaXQgc3lzdGVtcywgdGhlcmUgaXMgbm8gcGFkZGluZyBpbgor
CQlidWZfcGFnZV90LiAgT24gb3RoZXIgc3lzdGVtcywgVmFsZ3JpbmQgY291bGQgY29tcGxhaW4K
KwkJYWJvdXQgdW5pbml0aWFsaXplZCBwYWQgYnl0ZXMuICovCiAJCVVOSVZfTUVNX0FTU0VSVF9S
VyhzcmMsIHNpemUpOworI2VuZGlmCiAJCWlmIChidWZfYnVkZHlfcmVsb2NhdGVfYmxvY2soc3Jj
LCBkc3QpKSB7CiAKIAkJCWdvdG8gc3VjY2VzczsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2J1Zi9idWYwYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTgxMzA2
NTgtcmQwMHFsN2gwMm9vYWtoMQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBi
dWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA4MTYxOC1oMzhxMDJx
eHV2Y293YnRrCkBAIC0yMjgwLDcgKzIyODAsMTIgQEAgd2FpdF91bnRpbF91bmZpeGVkOgogCXV0
X2FkKGJ1Zl9ibG9ja19nZXRfc3RhdGUoYmxvY2spID09IEJVRl9CTE9DS19GSUxFX1BBR0UpOwog
CiAJbXV0ZXhfZW50ZXIoJmJsb2NrLT5tdXRleCk7CisjaWYgVU5JVl9XT1JEX1NJWkUgPT0gNAor
CS8qIE9uIDMyLWJpdCBzeXN0ZW1zLCB0aGVyZSBpcyBubyBwYWRkaW5nIGluIGJ1Zl9wYWdlX3Qu
ICBPbgorCW90aGVyIHN5c3RlbXMsIFZhbGdyaW5kIGNvdWxkIGNvbXBsYWluIGFib3V0IHVuaW5p
dGlhbGl6ZWQgcGFkCisJYnl0ZXMuICovCiAJVU5JVl9NRU1fQVNTRVJUX1JXKCZibG9jay0+cGFn
ZSwgc2l6ZW9mIGJsb2NrLT5wYWdlKTsKKyNlbmRpZgogCiAJYnVmX2Jsb2NrX2J1Zl9maXhfaW5j
KGJsb2NrLCBmaWxlLCBsaW5lKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9idWYvYnVmMGxydS5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1
ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxODEzMDY1OC1yZDAw
cWw3aDAyb29ha2gxCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgxNjE4LWgzOHEwMnF4dXZjb3di
dGsKQEAgLTE0OTQsOCArMTQ5NCwxMyBAQCBhbGxvYzoKIAogCQkJCXV0X2FkKHByZXZfYi0+aW5f
TFJVX2xpc3QpOwogCQkJCXV0X2FkKGJ1Zl9wYWdlX2luX2ZpbGUocHJldl9iKSk7CisjaWYgVU5J
Vl9XT1JEX1NJWkUgPT0gNAorCQkJCS8qIE9uIDMyLWJpdCBzeXN0ZW1zLCB0aGVyZSBpcyBubwor
CQkJCXBhZGRpbmcgaW4gYnVmX3BhZ2VfdC4gIE9uIG90aGVyCisJCQkJc3lzdGVtcywgVmFsZ3Jp
bmQgY291bGQgY29tcGxhaW4gYWJvdXQKKwkJCQl1bmluaXRpYWxpemVkIHBhZCBieXRlcy4gKi8K
IAkJCQlVTklWX01FTV9BU1NFUlRfUlcocHJldl9iLCBzaXplb2YgKnByZXZfYik7Ci0KKyNlbmRp
ZgogCQkJCVVUX0xJU1RfSU5TRVJUX0FGVEVSKExSVSwgYnVmX3Bvb2wtPkxSVSwKIAkJCQkJCSAg
ICAgcHJldl9iLCBiKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9pbmNsdWRlL21hY2gwZGF0YS5pYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1
ZGUvbWFjaDBkYXRhLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE4MTMw
NjU4LXJkMDBxbDdoMDJvb2FraDEKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
bWFjaDBkYXRhLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgxNjE4
LWgzOHEwMnF4dXZjb3didGsKQEAgLTM2LDcgKzM2LDcgQEAgbWFjaF93cml0ZV90b18xKAogCXVs
aW50CW4pCS8qITwgaW46IHVsaW50IGludGVnZXIgdG8gYmUgc3RvcmVkLCA+PSAwLCA8IDI1NiAq
LwogewogCXV0X2FkKGIpOwotCXV0X2FkKG4gPD0gMHhGRlVMKTsKKwl1dF9hZCgobiB8IDB4RkZV
TCkgPD0gMHhGRlVMKTsKIAogCWJbMF0gPSAoYnl0ZSluOwogfQpAQCAtNjUsNyArNjUsNyBAQCBt
YWNoX3dyaXRlX3RvXzIoCiAJdWxpbnQJbikJLyohPCBpbjogdWxpbnQgaW50ZWdlciB0byBiZSBz
dG9yZWQgKi8KIHsKIAl1dF9hZChiKTsKLQl1dF9hZChuIDw9IDB4RkZGRlVMKTsKKwl1dF9hZCgo
biB8IDB4RkZGRlVMKSA8PSAweEZGRkZVTCk7CiAKIAliWzBdID0gKGJ5dGUpKG4gPj4gOCk7CiAJ
YlsxXSA9IChieXRlKShuKTsKQEAgLTgxLDEwICs4MSw3IEBAIG1hY2hfcmVhZF9mcm9tXzIoCiAv
Kj09PT09PT09PT09PT0qLwogCWNvbnN0IGJ5dGUqCWIpCS8qITwgaW46IHBvaW50ZXIgdG8gMiBi
eXRlcyAqLwogewotCXV0X2FkKGIpOwotCXJldHVybiggKCh1bGludCkoYlswXSkgPDwgOCkKLQkJ
KyAodWxpbnQpKGJbMV0pCi0JCSk7CisJcmV0dXJuKCgodWxpbnQpKGJbMF0pIDw8IDgpIHwgKHVs
aW50KShiWzFdKSk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKQEAgLTEyOSw3ICsxMjYsNyBAQCBtYWNoX3dyaXRlX3Rv
XzMoCiAJdWxpbnQJbikJLyohPCBpbjogdWxpbnQgaW50ZWdlciB0byBiZSBzdG9yZWQgKi8KIHsK
IAl1dF9hZChiKTsKLQl1dF9hZChuIDw9IDB4RkZGRkZGVUwpOworCXV0X2FkKChuIHwgMHhGRkZG
RkZVTCkgPD0gMHhGRkZGRkZVTCk7CiAKIAliWzBdID0gKGJ5dGUpKG4gPj4gMTYpOwogCWJbMV0g
PSAoYnl0ZSkobiA+PiA4KTsKQEAgLTE0OCw4ICsxNDUsOCBAQCBtYWNoX3JlYWRfZnJvbV8zKAog
ewogCXV0X2FkKGIpOwogCXJldHVybiggKCh1bGludCkoYlswXSkgPDwgMTYpCi0JCSsgKCh1bGlu
dCkoYlsxXSkgPDwgOCkKLQkJKyAodWxpbnQpKGJbMl0pCisJCXwgKCh1bGludCkoYlsxXSkgPDwg
OCkKKwkJfCAodWxpbnQpKGJbMl0pCiAJCSk7CiB9CiAKQEAgLTE4Myw5ICsxODAsOSBAQCBtYWNo
X3JlYWRfZnJvbV80KAogewogCXV0X2FkKGIpOwogCXJldHVybiggKCh1bGludCkoYlswXSkgPDwg
MjQpCi0JCSsgKCh1bGludCkoYlsxXSkgPDwgMTYpCi0JCSsgKCh1bGludCkoYlsyXSkgPDwgOCkK
LQkJKyAodWxpbnQpKGJbM10pCisJCXwgKCh1bGludCkoYlsxXSkgPDwgMTYpCisJCXwgKCh1bGlu
dCkoYlsyXSkgPDwgOCkKKwkJfCAodWxpbnQpKGJbM10pCiAJCSk7CiB9CiAKQEAgLTcyMSw3ICs3
MTgsNyBAQCBtYWNoX3JlYWRfZnJvbV8yX2xpdHRsZV9lbmRpYW4oCiAvKj09PT09PT09PT09PT09
PT09PT09PT09PT09PSovCiAJY29uc3QgYnl0ZSoJYnVmKQkJLyohPCBpbjogZnJvbSB3aGVyZSB0
byByZWFkICovCiB7Ci0JcmV0dXJuKCh1bGludCkoKmJ1ZikgKyAoKHVsaW50KSgqKGJ1ZiArIDEp
KSkgKiAyNTYpOworCXJldHVybigodWxpbnQpKGJ1ZlswXSkgfCAoKHVsaW50KShidWZbMV0pIDw8
IDgpKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn
aW4vcGFnZS9wYWdlMHppcC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcGFnZS9wYWdl
MHppcC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE4MTMwNjU4LXJkMDBx
bDdoMDJvb2FraDEKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3BhZ2UvcGFnZTB6aXAuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA4MTYxOC1oMzhxMDJxeHV2Y293
YnRrCkBAIC0zMTE3LDggKzMxMTcsMTMgQEAgcGFnZV96aXBfdmFsaWRhdGVfbG93KAogCXRlbXBf
cGFnZV96aXAgaW4gYSBkZWJ1Z2dlciB3aGVuIHJ1bm5pbmcgdmFsZ3JpbmQgLS1kYi1hdHRhY2gu
ICovCiAJVkFMR1JJTkRfR0VUX1ZCSVRTKHBhZ2UsIHRlbXBfcGFnZSwgVU5JVl9QQUdFX1NJWkUp
OwogCVVOSVZfTUVNX0FTU0VSVF9SVyhwYWdlLCBVTklWX1BBR0VfU0laRSk7CisjIGlmIFVOSVZf
V09SRF9TSVpFID09IDQKIAlWQUxHUklORF9HRVRfVkJJVFMocGFnZV96aXAsICZ0ZW1wX3BhZ2Vf
emlwLCBzaXplb2YgdGVtcF9wYWdlX3ppcCk7CisJLyogT24gMzItYml0IHN5c3RlbXMsIHRoZXJl
IGlzIG5vIHBhZGRpbmcgaW4gcGFnZV96aXBfZGVzX3QuCisJT24gb3RoZXIgc3lzdGVtcywgVmFs
Z3JpbmQgY291bGQgY29tcGxhaW4gYWJvdXQgdW5pbml0aWFsaXplZAorCXBhZCBieXRlcy4gKi8K
IAlVTklWX01FTV9BU1NFUlRfUlcocGFnZV96aXAsIHNpemVvZiAqcGFnZV96aXApOworIyBlbmRp
ZgogCVZBTEdSSU5EX0dFVF9WQklUUyhwYWdlX3ppcC0+ZGF0YSwgdGVtcF9wYWdlLAogCQkJICAg
cGFnZV96aXBfZ2V0X3NpemUocGFnZV96aXApKTsKIAlVTklWX01FTV9BU1NFUlRfUlcocGFnZV96
aXAtPmRhdGEsIHBhZ2VfemlwX2dldF9zaXplKHBhZ2VfemlwKSk7Cgo=

--===============1346018148==
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/mysql/5.1-innodb/
# testament_sha1: 22b1d3abf64c90e58ebcc95304f706b19b5999ae
# timestamp: 2010-05-19 11:19:27 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   rd00ql7h02ooakh1
# 
# Begin bundle
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
XwJdAA==


--===============1346018148==--