From: marko.makela
Date: February 28 2011 2:04pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3524 to 3525)
List-Archive: http://lists.mysql.com/commits/132124
Message-Id: <201102281405.p1SDuqOg031873@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1403665381=="

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

IDM1MjUgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0yOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2J0ci9idHIwc2VhLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYv
YnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5oCiAzNTI0IEppbW15IFlhbmcJMjAxMS0wMi0y
OAogICAgICBGaXggYnVnICMxMTgxNjQwNSBBZGQgbWV0cmljcyBjb3VudGVycyB0byBJQ1AgY29k
ZQogICAgICBBZGRlZCBNT0RVTEVfSUNQIHRvIHRoZSBtZXRyaWNzIGNvdW50ZXIgYW5kIGZvbGxv
d2luZyA0IGNvdW50ZXJzIHRvIHRoZSBJQ1AKICAgICAgY29uZGl0aW9uIGNoZWNrIGNvZGUgcGF0
Y2gKICAgICAgCiAgICAgIAlpY3BfYXR0ZW1wdHMgLSBOdW1iZXIgb2YgYXR0ZW1wdHMgZm9yIGlu
ZGV4IHB1c2gtZG93biBjb25kaXRpb24gY2hlY2tzCiAgICAgIAlpY3Bfbm9fbWF0Y2ggLSBJbmRl
eCBwdXNoLWRvd24gY29uZGl0aW9uIGRvZXMgbm90IG1hdGNoCiAgICAgIAlpY3Bfb3V0X29mX3Jh
bmdlIC0gSW5kZXggcHVzaC1kb3duIGNvbmRpdGlvbiBvdXQgb2YgcmFuZ2UKICAgICAgCWljcF9t
YXRjaCAtICJJbmRleCBwdXNoLWRvd24gY29uZGl0aW9uIG1hdGNoZXMKICAgICAgCiAgICAgIHJi
Oi8vNjEyIGFwcHJvdmVkIGJ5IE1hcmtvCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiX21vbml0b3IucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiL3QvaW5ub2RiX21vbml0b3IudGVzdAogICAgICBzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvc3J2MG1vbi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwbW9uLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvYnRyL2J0cjBzZWEuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRy
MHNlYS5jCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDExMDIyODA5MzUwMS00eW92ajdm
dTRsN2QyZWpxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBzZWEuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIyODE0MDIyNy05dHQyYnRvOWM5M3RpY3VkCkBAIC0x
MjMyLDggKzEyMzIsOCBAQCBidHJfc2VhcmNoX2Ryb3BfcGFnZV9oYXNoX3doZW5fZnJlZWQoCiAJ
aGF2aW5nIHRvIGZlYXIgYSBkZWFkbG9jay4gKi8KIAogCWJsb2NrID0gYnVmX3BhZ2VfZ2V0X2dl
bihzcGFjZSwgemlwX3NpemUsIHBhZ2Vfbm8sIFJXX1NfTEFUQ0gsIE5VTEwsCi0JCQkJQlVGX0dF
VF9JRl9JTl9QT09MLCBfX0ZJTEVfXywgX19MSU5FX18sCi0JCQkJJm10cik7CisJCQkJIEJVRl9Q
RUVLX0lGX0lOX1BPT0wsIF9fRklMRV9fLCBfX0xJTkVfXywKKwkJCQkgJm10cik7CiAJLyogQmVj
YXVzZSB0aGUgYnVmZmVyIHBvb2wgbXV0ZXggd2FzIHJlbGVhc2VkIGJ5CiAJYnVmX3BhZ2VfcGVl
a19pZl9zZWFyY2hfaGFzaGVkKCksIGl0IGlzIHBvc3NpYmxlIHRoYXQgdGhlCiAJYmxvY2sgd2Fz
IHJlbW92ZWQgZnJvbSB0aGUgYnVmZmVyIHBvb2wgYnkgYW5vdGhlciB0aHJlYWQKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAy
MjgwOTM1MDEtNHlvdmo3ZnU0bDdkMmVqcQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYw
YnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMjgxNDAyMjctOXR0MmJ0
bzljOTN0aWN1ZApAQCAtMjg2OSw3ICsyODY5LDcgQEAgYnVmX3BhZ2VfZ2V0X2dlbigKIAl1bGlu
dAkJcndfbGF0Y2gsLyohPCBpbjogUldfU19MQVRDSCwgUldfWF9MQVRDSCwgUldfTk9fTEFUQ0gg
Ki8KIAlidWZfYmxvY2tfdCoJZ3Vlc3MsCS8qITwgaW46IGd1ZXNzZWQgYmxvY2sgb3IgTlVMTCAq
LwogCXVsaW50CQltb2RlLAkvKiE8IGluOiBCVUZfR0VULCBCVUZfR0VUX0lGX0lOX1BPT0wsCi0J
CQkJQlVGX0dFVF9OT19MQVRDSCwgb3IKKwkJCQlCVUZfUEVFS19JRl9JTl9QT09MLCBCVUZfR0VU
X05PX0xBVENILCBvcgogCQkJCUJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSCAqLwogCWNvbnN0
IGNoYXIqCWZpbGUsCS8qITwgaW46IGZpbGUgbmFtZSAqLwogCXVsaW50CQlsaW5lLAkvKiE8IGlu
OiBsaW5lIHdoZXJlIGNhbGxlZCAqLwpAQCAtMjg5MSwxMSArMjg5MSwyMCBAQCBidWZfcGFnZV9n
ZXRfZ2VuKAogCXV0X2FkKChyd19sYXRjaCA9PSBSV19TX0xBVENIKQogCSAgICAgIHx8IChyd19s
YXRjaCA9PSBSV19YX0xBVENIKQogCSAgICAgIHx8IChyd19sYXRjaCA9PSBSV19OT19MQVRDSCkp
OwotCXV0X2FkKChtb2RlICE9IEJVRl9HRVRfTk9fTEFUQ0gpIHx8IChyd19sYXRjaCA9PSBSV19O
T19MQVRDSCkpOwotCXV0X2FkKG1vZGUgPT0gQlVGX0dFVAotCSAgICAgIHx8IG1vZGUgPT0gQlVG
X0dFVF9JRl9JTl9QT09MCi0JICAgICAgfHwgbW9kZSA9PSBCVUZfR0VUX05PX0xBVENICi0JICAg
ICAgfHwgbW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0xfT1JfV0FUQ0gpOworI2lmZGVmIFVOSVZf
REVCVUcKKwlzd2l0Y2ggKG1vZGUpIHsKKwljYXNlIEJVRl9HRVRfTk9fTEFUQ0g6CisJCXV0X2Fk
KHJ3X2xhdGNoID09IFJXX05PX0xBVENIKTsKKwkJYnJlYWs7CisJY2FzZSBCVUZfR0VUOgorCWNh
c2UgQlVGX0dFVF9JRl9JTl9QT09MOgorCWNhc2UgQlVGX1BFRUtfSUZfSU5fUE9PTDoKKwljYXNl
IEJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSDoKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJdXRf
ZXJyb3I7CisJfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAl1dF9hZCh6aXBfc2l6ZSA9PSBm
aWxfc3BhY2VfZ2V0X3ppcF9zaXplKHNwYWNlKSk7CiAJdXRfYWQodXRfaXNfMnBvdyh6aXBfc2l6
ZSkpOwogI2lmbmRlZiBVTklWX0xPR19ERUJVRwpAQCAtMjk2Nyw2ICsyOTc2LDcgQEAgbG9vcDI6
CiAJCX0KIAogCQlpZiAobW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0wKKwkJICAgIHx8IG1vZGUg
PT0gQlVGX1BFRUtfSUZfSU5fUE9PTAogCQkgICAgfHwgbW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BP
T0xfT1JfV0FUQ0gpIHsKICNpZmRlZiBVTklWX1NZTkNfREVCVUcKIAkJCXV0X2FkKCFyd19sb2Nr
X293bihoYXNoX2xvY2ssIFJXX0xPQ0tfRVgpKTsKQEAgLTMwMjAsNyArMzAzMCw4IEBAIGdvdF9i
bG9jazoKIAogCW11c3RfcmVhZCA9IGJ1Zl9ibG9ja19nZXRfaW9fZml4KGJsb2NrKSA9PSBCVUZf
SU9fUkVBRDsKIAotCWlmIChtdXN0X3JlYWQgJiYgbW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0wp
IHsKKwlpZiAobXVzdF9yZWFkICYmIChtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTAorCQkJICB8
fCBtb2RlID09IEJVRl9QRUVLX0lGX0lOX1BPT0wpKSB7CiAKIAkJLyogVGhlIHBhZ2UgaXMgYmVp
bmcgcmVhZCB0byBidWZmZXIgcG9vbCwKIAkJYnV0IHdlIGNhbm5vdCB3YWl0IGFyb3VuZCBmb3Ig
dGhlIHJlYWQgdG8KQEAgLTMxNTEsNiArMzE2Miw3IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAkJ
bXV0ZXhfZXhpdCgmYnVmX3Bvb2wtPnppcF9tdXRleCk7CiAJCWJ1Zl9wb29sLT5uX3BlbmRfdW56
aXArKzsKIAorCQlicGFnZS0+c3RhdGUgPSBCVUZfQkxPQ0tfWklQX0ZSRUU7CiAJCWJ1Zl9idWRk
eV9mcmVlKGJ1Zl9wb29sLCBicGFnZSwgc2l6ZW9mICpicGFnZSk7CiAKIAkJYnVmX3Bvb2xfbXV0
ZXhfZXhpdChidWZfcG9vbCk7CkBAIC0zMjc2LDcgKzMyODgsOSBAQCB3YWl0X3VudGlsX3VuZml4
ZWQ6CiAKIAlhY2Nlc3NfdGltZSA9IGJ1Zl9wYWdlX2lzX2FjY2Vzc2VkKCZibG9jay0+cGFnZSk7
CiAKLQlidWZfcGFnZV9zZXRfYWNjZXNzZWRfbWFrZV95b3VuZygmYmxvY2stPnBhZ2UsIGFjY2Vz
c190aW1lKTsKKwlpZiAoVU5JVl9MSUtFTFkobW9kZSAhPSBCVUZfUEVFS19JRl9JTl9QT09MKSkg
eworCQlidWZfcGFnZV9zZXRfYWNjZXNzZWRfbWFrZV95b3VuZygmYmxvY2stPnBhZ2UsIGFjY2Vz
c190aW1lKTsKKwl9CiAKICNpZiBkZWZpbmVkIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBk
ZWZpbmVkIFVOSVZfREVCVUcKIAl1dF9hKCFibG9jay0+cGFnZS5maWxlX3BhZ2Vfd2FzX2ZyZWVk
KTsKQEAgLTMzMjksNyArMzM0Myw3IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAogCW10cl9tZW1v
X3B1c2gobXRyLCBibG9jaywgZml4X3R5cGUpOwogCi0JaWYgKCFhY2Nlc3NfdGltZSkgeworCWlm
IChVTklWX0xJS0VMWShtb2RlICE9IEJVRl9QRUVLX0lGX0lOX1BPT0wpICYmICFhY2Nlc3NfdGlt
ZSkgewogCQkvKiBJbiB0aGUgY2FzZSBvZiBhIGZpcnN0IGFjY2VzcywgdHJ5IHRvIGFwcGx5IGxp
bmVhcgogCQlyZWFkLWFoZWFkICovCiAKQEAgLTM5NDEsNiArMzk1NSw3IEBAIGVycl9leGl0Ogog
CQkJCS8qIFRoZSBibG9jayB3YXMgYWRkZWQgYnkgc29tZSBvdGhlciB0aHJlYWQuICovCiAJCQkJ
cndfbG9ja194X3VubG9jayhoYXNoX2xvY2spOwogCQkJCXdhdGNoX3BhZ2UgPSBOVUxMOworCQkJ
CWJwYWdlLT5zdGF0ZSA9IEJVRl9CTE9DS19aSVBfRlJFRTsKIAkJCQlidWZfYnVkZHlfZnJlZShi
dWZfcG9vbCwgYnBhZ2UsIHNpemVvZiAqYnBhZ2UpOwogCQkJCWJ1Zl9idWRkeV9mcmVlKGJ1Zl9w
b29sLCBkYXRhLCB6aXBfc2l6ZSk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2J1Zi9idWYwbHJ1LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwly
ZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMjgwOTM1MDEtNHlvdmo3ZnU0bDdkMmVq
cQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMTAyMjgxNDAyMjctOXR0MmJ0bzljOTN0aWN1ZApAQCAtMjUxLDc0ICsy
NTEsNzggQEAgYnVmX0xSVV9kcm9wX3BhZ2VfaGFzaF9mb3JfdGFibGVzcGFjZSgKIAkJc2l6ZW9m
KHVsaW50KSAqIEJVRl9MUlVfRFJPUF9TRUFSQ0hfSEFTSF9TSVpFKTsKIAogCWJ1Zl9wb29sX211
dGV4X2VudGVyKGJ1Zl9wb29sKTsKKwludW1fZW50cmllcyA9IDA7CiAKIHNjYW5fYWdhaW46Ci0J
bnVtX2VudHJpZXMgPSAwOwogCWJwYWdlID0gVVRfTElTVF9HRVRfTEFTVChidWZfcG9vbC0+TFJV
KTsKIAogCXdoaWxlIChicGFnZSAhPSBOVUxMKSB7Ci0JCW11dGV4X3QqCWJsb2NrX211dGV4ID0g
YnVmX3BhZ2VfZ2V0X211dGV4KGJwYWdlKTsKIAkJYnVmX3BhZ2VfdCoJcHJldl9icGFnZTsKKwkJ
aWJvb2wJCWlzX2ZpeGVkOwogCi0JCW11dGV4X2VudGVyKGJsb2NrX211dGV4KTsKIAkJcHJldl9i
cGFnZSA9IFVUX0xJU1RfR0VUX1BSRVYoTFJVLCBicGFnZSk7CiAKIAkJdXRfYShidWZfcGFnZV9p
bl9maWxlKGJwYWdlKSk7CiAKIAkJaWYgKGJ1Zl9wYWdlX2dldF9zdGF0ZShicGFnZSkgIT0gQlVG
X0JMT0NLX0ZJTEVfUEFHRQogCQkgICAgfHwgYnBhZ2UtPnNwYWNlICE9IGlkCi0JCSAgICB8fCBi
cGFnZS0+YnVmX2ZpeF9jb3VudCA+IDAKIAkJICAgIHx8IGJwYWdlLT5pb19maXggIT0gQlVGX0lP
X05PTkUpIHsKLQkJCS8qIFdlIGxlYXZlIHRoZSBmaXhlZCBwYWdlcyBhcyBpcyBpbiB0aGlzIHNj
YW4uCi0JCQlUbyBiZSBkZWFsdCB3aXRoIGxhdGVyIGluIHRoZSBmaW5hbCBzY2FuLiAqLwotCQkJ
bXV0ZXhfZXhpdChibG9ja19tdXRleCk7Ci0JCQlnb3RvIG5leHRfcGFnZTsKKwkJCS8qIENvbXBy
ZXNzZWQgcGFnZXMgYXJlIG5ldmVyIGhhc2hlZC4KKwkJCVNraXAgYmxvY2tzIG9mIG90aGVyIHRh
Ymxlc3BhY2VzLgorCQkJU2tpcCBJL08tZml4ZWQgYmxvY2tzICh0byBiZSBkZWFsdCB3aXRoIGxh
dGVyKS4gKi8KK25leHRfcGFnZToKKwkJCWJwYWdlID0gcHJldl9icGFnZTsKKwkJCWNvbnRpbnVl
OwogCQl9CiAKLQkJaWYgKCgoYnVmX2Jsb2NrX3QqKSBicGFnZSktPmlzX2hhc2hlZCkgeworCQlt
dXRleF9lbnRlcigmKChidWZfYmxvY2tfdCopIGJwYWdlKS0+bXV0ZXgpOworCQlpc19maXhlZCA9
IGJwYWdlLT5idWZfZml4X2NvdW50ID4gMAorCQkJfHwgISgoYnVmX2Jsb2NrX3QqKSBicGFnZSkt
PmlzX2hhc2hlZDsKKwkJbXV0ZXhfZXhpdCgmKChidWZfYmxvY2tfdCopIGJwYWdlKS0+bXV0ZXgp
OwogCi0JCQkvKiBTdG9yZSB0aGUgb2Zmc2V0KGkuZS46IHBhZ2Vfbm8pIGluIHRoZSBhcnJheQot
CQkJc28gdGhhdCB3ZSBjYW4gZHJvcCBoYXNoIGluZGV4IGluIGEgYmF0Y2gKLQkJCWxhdGVyLiAq
LwotCQkJcGFnZV9hcnJbbnVtX2VudHJpZXNdID0gYnBhZ2UtPm9mZnNldDsKLQkJCW11dGV4X2V4
aXQoYmxvY2tfbXV0ZXgpOwotCQkJdXRfYShudW1fZW50cmllcyA8IEJVRl9MUlVfRFJPUF9TRUFS
Q0hfSEFTSF9TSVpFKTsKLQkJCSsrbnVtX2VudHJpZXM7CisJCWlmIChpc19maXhlZCkgeworCQkJ
Z290byBuZXh0X3BhZ2U7CisJCX0KIAotCQkJaWYgKG51bV9lbnRyaWVzIDwgQlVGX0xSVV9EUk9Q
X1NFQVJDSF9IQVNIX1NJWkUpIHsKLQkJCQlnb3RvIG5leHRfcGFnZTsKLQkJCX0KKwkJLyogU3Rv
cmUgdGhlIHBhZ2UgbnVtYmVyIHNvIHRoYXQgd2UgY2FuIGRyb3AgdGhlIGhhc2gKKwkJaW5kZXgg
aW4gYSBiYXRjaCBsYXRlci4gKi8KKwkJcGFnZV9hcnJbbnVtX2VudHJpZXNdID0gYnBhZ2UtPm9m
ZnNldDsKKwkJdXRfYShudW1fZW50cmllcyA8IEJVRl9MUlVfRFJPUF9TRUFSQ0hfSEFTSF9TSVpF
KTsKKwkJKytudW1fZW50cmllczsKIAotCQkJLyogQXJyYXkgZnVsbC4gV2UgcmVsZWFzZSB0aGUg
YnVmX3Bvb2wtPm11dGV4IHRvCi0JCQlvYmV5IHRoZSBsYXRjaGluZyBvcmRlci4gKi8KLQkJCWJ1
Zl9wb29sX211dGV4X2V4aXQoYnVmX3Bvb2wpOworCQlpZiAobnVtX2VudHJpZXMgPCBCVUZfTFJV
X0RST1BfU0VBUkNIX0hBU0hfU0laRSkgeworCQkJZ290byBuZXh0X3BhZ2U7CisJCX0KIAotCQkJ
YnVmX0xSVV9kcm9wX3BhZ2VfaGFzaF9iYXRjaCgKLQkJCQlpZCwgemlwX3NpemUsIHBhZ2VfYXJy
LCBudW1fZW50cmllcyk7CisJCS8qIEFycmF5IGZ1bGwuIFdlIHJlbGVhc2UgdGhlIGJ1Zl9wb29s
LT5tdXRleCB0byBvYmV5CisJCXRoZSBsYXRjaGluZyBvcmRlci4gKi8KKwkJYnVmX3Bvb2xfbXV0
ZXhfZXhpdChidWZfcG9vbCk7CiAKLQkJCW51bV9lbnRyaWVzID0gMDsKKwkJYnVmX0xSVV9kcm9w
X3BhZ2VfaGFzaF9iYXRjaCgKKwkJCWlkLCB6aXBfc2l6ZSwgcGFnZV9hcnIsIG51bV9lbnRyaWVz
KTsKIAotCQkJYnVmX3Bvb2xfbXV0ZXhfZW50ZXIoYnVmX3Bvb2wpOwotCQl9IGVsc2UgewotCQkJ
bXV0ZXhfZXhpdChibG9ja19tdXRleCk7Ci0JCX0KKwkJbnVtX2VudHJpZXMgPSAwOwogCi1uZXh0
X3BhZ2U6Ci0JCS8qIE5vdGUgdGhhdCB3ZSBtYXkgaGF2ZSByZWxlYXNlZCB0aGUgYnVmX3Bvb2wg
bXV0ZXgKLQkJYWJvdmUgYWZ0ZXIgcmVhZGluZyB0aGUgcHJldl9icGFnZSBkdXJpbmcgcHJvY2Vz
c2luZwotCQlvZiBhIHBhZ2VfaGFzaF9iYXRjaCAoaS5lLjogd2hlbiB0aGUgYXJyYXkgd2FzIGZ1
bGwpLgotCQlUaGlzIG1lYW5zIHRoYXQgcHJldl9icGFnZSBjYW4gY2hhbmdlIGluIExSVSBsaXN0
LgotCQlUaGlzIGlzIE9LIGJlY2F1c2UgdGhpcyBmdW5jdGlvbiBpcyBhICdiZXN0IGVmZm9ydCcK
LQkJdG8gZHJvcCBhcyBtYW55IHNlYXJjaCBoYXNoIGVudHJpZXMgYXMgcG9zc2libGUgYW5kCi0J
CWl0IGRvZXMgbm90IGd1YXJhbnRlZSB0aGF0IEFMTCBzdWNoIGVudHJpZXMgd2lsbCBiZQotCQlk
cm9wcGVkLiAqLwotCQlicGFnZSA9IHByZXZfYnBhZ2U7CisJCWJ1Zl9wb29sX211dGV4X2VudGVy
KGJ1Zl9wb29sKTsKKworCQkvKiBOb3RlIHRoYXQgd2UgcmVsZWFzZWQgdGhlIGJ1Zl9wb29sIG11
dGV4IGFib3ZlCisJCWFmdGVyIHJlYWRpbmcgdGhlIHByZXZfYnBhZ2UgZHVyaW5nIHByb2Nlc3Np
bmcgb2YgYQorCQlwYWdlX2hhc2hfYmF0Y2ggKGkuZS46IHdoZW4gdGhlIGFycmF5IHdhcyBmdWxs
KS4KKwkJQmVjYXVzZSBwcmV2X2JwYWdlIGNvdWxkIGJlbG9uZyB0byBhIGNvbXByZXNzZWQtb25s
eQorCQlibG9jaywgaXQgbWF5IGhhdmUgYmVlbiByZWxvY2F0ZWQsIGFuZCB0aHVzIHRoZQorCQlw
b2ludGVyIGNhbm5vdCBiZSB0cnVzdGVkLiBCZWNhdXNlIGJwYWdlIGlzIG9mIHR5cGUKKwkJYnVm
X2Jsb2NrX3QsIGl0IGlzIHNhZmUgdG8gZGVyZWZlcmVuY2UuCisKKwkJYnBhZ2UgY2FuIGNoYW5n
ZSBpbiB0aGUgTFJVIGxpc3QuIFRoaXMgaXMgT0sgYmVjYXVzZQorCQl0aGlzIGZ1bmN0aW9uIGlz
IGEgJ2Jlc3QgZWZmb3J0JyB0byBkcm9wIGFzIG1hbnkKKwkJc2VhcmNoIGhhc2ggZW50cmllcyBh
cyBwb3NzaWJsZSBhbmQgaXQgZG9lcyBub3QKKwkJZ3VhcmFudGVlIHRoYXQgQUxMIHN1Y2ggZW50
cmllcyB3aWxsIGJlIGRyb3BwZWQuICovCiAKIAkJLyogSWYsIGhvd2V2ZXIsIGJwYWdlIGhhcyBi
ZWVuIHJlbW92ZWQgZnJvbSBMUlUgbGlzdAogCQl0byB0aGUgZnJlZSBsaXN0IHRoZW4gd2Ugc2hv
dWxkIHJlc3RhcnQgdGhlIHNjYW4uCiAJCWJwYWdlLT5zdGF0ZSBpcyBwcm90ZWN0ZWQgYnkgYnVm
X3Bvb2wgbXV0ZXguICovCi0JCWlmIChicGFnZSAmJiAhYnVmX3BhZ2VfaW5fZmlsZShicGFnZSkp
IHsKLQkJCXV0X2EobnVtX2VudHJpZXMgPT0gMCk7CisJCWlmIChicGFnZQorCQkgICAgJiYgYnVm
X3BhZ2VfZ2V0X3N0YXRlKGJwYWdlKSAhPSBCVUZfQkxPQ0tfRklMRV9QQUdFKSB7CiAJCQlnb3Rv
IHNjYW5fYWdhaW47CiAJCX0KIAl9CkBAIC0xOTU3LDYgKzE5NjEsNyBAQCBidWZfTFJVX2Jsb2Nr
X3JlbW92ZV9oYXNoZWRfcGFnZSgKIAkJCWJ1Zl9wb29sLCBicGFnZS0+emlwLmRhdGEsCiAJCQlw
YWdlX3ppcF9nZXRfc2l6ZSgmYnBhZ2UtPnppcCkpOwogCisJCWJwYWdlLT5zdGF0ZSA9IEJVRl9C
TE9DS19aSVBfRlJFRTsKIAkJYnVmX2J1ZGR5X2ZyZWUoYnVmX3Bvb2wsIGJwYWdlLCBzaXplb2Yo
KmJwYWdlKSk7CiAJCWJ1Zl9wb29sX211dGV4X2V4aXRfYWxsb3coYnVmX3Bvb2wpOwogCgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaCcKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAlyZXZpZDpqaW1teS55YW5nQG9yYWNs
ZS5jb20tMjAxMTAyMjgwOTM1MDEtNHlvdmo3ZnU0bDdkMmVqcQorKysgYi9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvYnVmMGJ1Zi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MjI4MTQwMjI3LTl0dDJidG85YzkzdGljdWQKQEAgLTQxLDYgKzQxLDggQEAgQ3JlYXRlZCAxMS81
LzE5OTUgSGVpa2tpIFR1dXJpCiAvKiBAeyAqLwogI2RlZmluZSBCVUZfR0VUCQkJMTAJLyohPCBn
ZXQgYWx3YXlzICovCiAjZGVmaW5lCUJVRl9HRVRfSUZfSU5fUE9PTAkxMQkvKiE8IGdldCBpZiBp
biBwb29sICovCisjZGVmaW5lIEJVRl9QRUVLX0lGX0lOX1BPT0wJMTIJLyohPCBnZXQgaWYgaW4g
cG9vbCwgZG8gbm90IG1ha2UKKwkJCQkJdGhlIGJsb2NrIHlvdW5nIGluIHRoZSBMUlUgbGlzdCAq
LwogI2RlZmluZSBCVUZfR0VUX05PX0xBVENICTE0CS8qITwgZ2V0IGFuZCBidWZmZXJmaXgsIGJ1
dAogCQkJCQlzZXQgbm8gbGF0Y2g7IHdlIGhhdmUKIAkJCQkJc2VwYXJhdGVkIHRoaXMgY2FzZSwg
YmVjYXVzZQpAQCAtNDAxLDcgKzQwMyw3IEBAIGJ1Zl9wYWdlX2dldF9nZW4oCiAJdWxpbnQJCXJ3
X2xhdGNoLC8qITwgaW46IFJXX1NfTEFUQ0gsIFJXX1hfTEFUQ0gsIFJXX05PX0xBVENIICovCiAJ
YnVmX2Jsb2NrX3QqCWd1ZXNzLAkvKiE8IGluOiBndWVzc2VkIGJsb2NrIG9yIE5VTEwgKi8KIAl1
bGludAkJbW9kZSwJLyohPCBpbjogQlVGX0dFVCwgQlVGX0dFVF9JRl9JTl9QT09MLAotCQkJCUJV
Rl9HRVRfTk9fTEFUQ0ggb3IKKwkJCQlCVUZfUEVFS19JRl9JTl9QT09MLCBCVUZfR0VUX05PX0xB
VENIIG9yCiAJCQkJQlVGX0dFVF9JRl9JTl9QT09MX09SX1dBVENIICovCiAJY29uc3QgY2hhcioJ
ZmlsZSwJLyohPCBpbjogZmlsZSBuYW1lICovCiAJdWxpbnQJCWxpbmUsCS8qITwgaW46IGxpbmUg
d2hlcmUgY2FsbGVkICovCgo=

--===============1403665381==
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: 3091c1c72fd21a1ff3b609d0796f950df85a6b47
# timestamp: 2011-02-28 16:04:26 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   4yovj7fu4l7d2ejq
# 
# Begin bundle
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
e5H/C0r3L/xdyRThQkC6Qg3E


--===============1403665381==--