From: marko.makela
Date: February 28 2011 2:04pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3339 to 3340)
List-Archive: http://lists.mysql.com/commits/132122
Message-Id: <201102281404.p1SE0xJ6028726@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0766868712=="

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

IDMzNDAgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0yOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9idHIvYnRyMHNlYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1
ZjBidWYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAogMzMzOSBWYXNpbCBEaW1vdgkyMDExLTAyLTI4
CiAgICAgIFVzZSBwbHVnaW5fYXV0aG9yIGFsc28gZm9yIHRoZSBJbm5vREIgU0UgcGx1Z2luCiAg
ICAgIAogICAgICBNb3ZlIHRoZSBjb25zdCB2YXJpYWJsZSBwbHVnaW5fYXV0aG9yIHRvIGEgY29t
bW9uIGhlYWRlciBmaWxlIHRoYXQgaXMKICAgICAgYmVpbmcgaW5jbHVkZWQgYnkgYm90aCBoYV9p
bm5vZGIuY2MgYW5kIGlfcy5jYwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9pX3Mu
Y2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2lfcy5oCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwc2VhLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBzZWEuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjI4MDkwNzIy
LTBoc2c2MDV5dm0yeXBsOWMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHNlYS5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjI4MTMzOTA3LXJhdWJleGNiaDMyb3Jn
cXEKQEAgLTEyMTMsOCArMTIxMyw4IEBAIGJ0cl9zZWFyY2hfZHJvcF9wYWdlX2hhc2hfd2hlbl9m
cmVlZCgKIAloYXZpbmcgdG8gZmVhciBhIGRlYWRsb2NrLiAqLwogCiAJYmxvY2sgPSBidWZfcGFn
ZV9nZXRfZ2VuKHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubywgUldfU19MQVRDSCwgTlVMTCwKLQkJ
CQlCVUZfR0VUX0lGX0lOX1BPT0wsIF9fRklMRV9fLCBfX0xJTkVfXywKLQkJCQkmbXRyKTsKKwkJ
CQkgQlVGX1BFRUtfSUZfSU5fUE9PTCwgX19GSUxFX18sIF9fTElORV9fLAorCQkJCSAmbXRyKTsK
IAkvKiBCZWNhdXNlIHRoZSBidWZmZXIgcG9vbCBtdXRleCB3YXMgcmVsZWFzZWQgYnkKIAlidWZf
cGFnZV9wZWVrX2lmX3NlYXJjaF9oYXNoZWQoKSwgaXQgaXMgcG9zc2libGUgdGhhdCB0aGUKIAli
bG9jayB3YXMgcmVtb3ZlZCBmcm9tIHRoZSBidWZmZXIgcG9vbCBieSBhbm90aGVyIHRocmVhZAoK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5j
b20tMjAxMTAyMjgwOTA3MjItMGhzZzYwNXl2bTJ5cGw5YworKysgYi9zdG9yYWdlL2lubm9iYXNl
L2J1Zi9idWYwYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMjgxMzM5
MDctcmF1YmV4Y2JoMzJvcmdxcQpAQCAtMjcyMiw3ICsyNzIyLDcgQEAgYnVmX3BhZ2VfZ2V0X2dl
bigKIAl1bGludAkJcndfbGF0Y2gsLyohPCBpbjogUldfU19MQVRDSCwgUldfWF9MQVRDSCwgUldf
Tk9fTEFUQ0ggKi8KIAlidWZfYmxvY2tfdCoJZ3Vlc3MsCS8qITwgaW46IGd1ZXNzZWQgYmxvY2sg
b3IgTlVMTCAqLwogCXVsaW50CQltb2RlLAkvKiE8IGluOiBCVUZfR0VULCBCVUZfR0VUX0lGX0lO
X1BPT0wsCi0JCQkJQlVGX0dFVF9OT19MQVRDSCwgb3IKKwkJCQlCVUZfUEVFS19JRl9JTl9QT09M
LCBCVUZfR0VUX05PX0xBVENILCBvcgogCQkJCUJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSCAq
LwogCWNvbnN0IGNoYXIqCWZpbGUsCS8qITwgaW46IGZpbGUgbmFtZSAqLwogCXVsaW50CQlsaW5l
LAkvKiE8IGluOiBsaW5lIHdoZXJlIGNhbGxlZCAqLwpAQCAtMjc0MSwxMSArMjc0MSwyMCBAQCBi
dWZfcGFnZV9nZXRfZ2VuKAogCXV0X2FkKChyd19sYXRjaCA9PSBSV19TX0xBVENIKQogCSAgICAg
IHx8IChyd19sYXRjaCA9PSBSV19YX0xBVENIKQogCSAgICAgIHx8IChyd19sYXRjaCA9PSBSV19O
T19MQVRDSCkpOwotCXV0X2FkKChtb2RlICE9IEJVRl9HRVRfTk9fTEFUQ0gpIHx8IChyd19sYXRj
aCA9PSBSV19OT19MQVRDSCkpOwotCXV0X2FkKG1vZGUgPT0gQlVGX0dFVAotCSAgICAgIHx8IG1v
ZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MCi0JICAgICAgfHwgbW9kZSA9PSBCVUZfR0VUX05PX0xB
VENICi0JICAgICAgfHwgbW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0xfT1JfV0FUQ0gpOworI2lm
ZGVmIFVOSVZfREVCVUcKKwlzd2l0Y2ggKG1vZGUpIHsKKwljYXNlIEJVRl9HRVRfTk9fTEFUQ0g6
CisJCXV0X2FkKHJ3X2xhdGNoID09IFJXX05PX0xBVENIKTsKKwkJYnJlYWs7CisJY2FzZSBCVUZf
R0VUOgorCWNhc2UgQlVGX0dFVF9JRl9JTl9QT09MOgorCWNhc2UgQlVGX1BFRUtfSUZfSU5fUE9P
TDoKKwljYXNlIEJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSDoKKwkJYnJlYWs7CisJZGVmYXVs
dDoKKwkJdXRfZXJyb3I7CisJfQorI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAl1dF9hZCh6aXBf
c2l6ZSA9PSBmaWxfc3BhY2VfZ2V0X3ppcF9zaXplKHNwYWNlKSk7CiAJdXRfYWQodXRfaXNfMnBv
dyh6aXBfc2l6ZSkpOwogI2lmbmRlZiBVTklWX0xPR19ERUJVRwpAQCAtMjgwNSw2ICsyODE0LDcg
QEAgbG9vcDI6CiAJCWJ1Zl9wb29sX211dGV4X2V4aXQoYnVmX3Bvb2wpOwogCiAJCWlmIChtb2Rl
ID09IEJVRl9HRVRfSUZfSU5fUE9PTAorCQkgICAgfHwgbW9kZSA9PSBCVUZfUEVFS19JRl9JTl9Q
T09MCiAJCSAgICB8fCBtb2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSCkgewogCiAJ
CQlyZXR1cm4oTlVMTCk7CkBAIC0yODQ1LDcgKzI4NTUsOCBAQCBnb3RfYmxvY2s6CiAKIAltdXN0
X3JlYWQgPSBidWZfYmxvY2tfZ2V0X2lvX2ZpeChibG9jaykgPT0gQlVGX0lPX1JFQUQ7CiAKLQlp
ZiAobXVzdF9yZWFkICYmIG1vZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MKSB7CisJaWYgKG11c3Rf
cmVhZCAmJiAobW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BPT0wKKwkJCSAgfHwgbW9kZSA9PSBCVUZf
UEVFS19JRl9JTl9QT09MKSkgewogCiAJCS8qIFRoZSBwYWdlIGlzIGJlaW5nIHJlYWQgdG8gYnVm
ZmVyIHBvb2wsCiAJCWJ1dCB3ZSBjYW5ub3Qgd2FpdCBhcm91bmQgZm9yIHRoZSByZWFkIHRvCkBA
IC0yOTY4LDYgKzI5NzksNyBAQCB3YWl0X3VudGlsX3VuZml4ZWQ6CiAJCW11dGV4X2V4aXQoJmJ1
Zl9wb29sLT56aXBfbXV0ZXgpOwogCQlidWZfcG9vbC0+bl9wZW5kX3VuemlwKys7CiAKKwkJYnBh
Z2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJUF9GUkVFOwogCQlidWZfYnVkZHlfZnJlZShidWZfcG9v
bCwgYnBhZ2UsIHNpemVvZiAqYnBhZ2UpOwogCiAJCWJ1Zl9wb29sX211dGV4X2V4aXQoYnVmX3Bv
b2wpOwpAQCAtMzA2MSw3ICszMDczLDkgQEAgd2FpdF91bnRpbF91bmZpeGVkOgogCiAJYnVmX3Bv
b2xfbXV0ZXhfZXhpdChidWZfcG9vbCk7CiAKLQlidWZfcGFnZV9zZXRfYWNjZXNzZWRfbWFrZV95
b3VuZygmYmxvY2stPnBhZ2UsIGFjY2Vzc190aW1lKTsKKwlpZiAoVU5JVl9MSUtFTFkobW9kZSAh
PSBCVUZfUEVFS19JRl9JTl9QT09MKSkgeworCQlidWZfcGFnZV9zZXRfYWNjZXNzZWRfbWFrZV95
b3VuZygmYmxvY2stPnBhZ2UsIGFjY2Vzc190aW1lKTsKKwl9CiAKICNpZiBkZWZpbmVkIFVOSVZf
REVCVUdfRklMRV9BQ0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKIAl1dF9hKCFibG9jay0+
cGFnZS5maWxlX3BhZ2Vfd2FzX2ZyZWVkKTsKQEAgLTMxMTQsNyArMzEyOCw3IEBAIHdhaXRfdW50
aWxfdW5maXhlZDoKIAogCW10cl9tZW1vX3B1c2gobXRyLCBibG9jaywgZml4X3R5cGUpOwogCi0J
aWYgKCFhY2Nlc3NfdGltZSkgeworCWlmIChVTklWX0xJS0VMWShtb2RlICE9IEJVRl9QRUVLX0lG
X0lOX1BPT0wpICYmICFhY2Nlc3NfdGltZSkgewogCQkvKiBJbiB0aGUgY2FzZSBvZiBhIGZpcnN0
IGFjY2VzcywgdHJ5IHRvIGFwcGx5IGxpbmVhcgogCQlyZWFkLWFoZWFkICovCiAKQEAgLTM3MDMs
NiArMzcxNyw3IEBAIGVycl9leGl0OgogCiAJCQkJLyogVGhlIGJsb2NrIHdhcyBhZGRlZCBieSBz
b21lIG90aGVyIHRocmVhZC4gKi8KIAkJCQl3YXRjaF9wYWdlID0gTlVMTDsKKwkJCQlicGFnZS0+
c3RhdGUgPSBCVUZfQkxPQ0tfWklQX0ZSRUU7CiAJCQkJYnVmX2J1ZGR5X2ZyZWUoYnVmX3Bvb2ws
IGJwYWdlLCBzaXplb2YgKmJwYWdlKTsKIAkJCQlidWZfYnVkZHlfZnJlZShidWZfcG9vbCwgZGF0
YSwgemlwX3NpemUpOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYv
YnVmMGxydS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMJcmV2aWQ6dmFz
aWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIyODA5MDcyMi0waHNnNjA1eXZtMnlwbDljCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDIyODEzMzkwNy1yYXViZXhjYmgzMm9yZ3FxCkBAIC0yNDcsNzQgKzI0Nyw3OCBA
QCBidWZfTFJVX2Ryb3BfcGFnZV9oYXNoX2Zvcl90YWJsZXNwYWNlKAogCQlzaXplb2YodWxpbnQp
ICogQlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNIX1NJWkUpOwogCiAJYnVmX3Bvb2xfbXV0ZXhfZW50
ZXIoYnVmX3Bvb2wpOworCW51bV9lbnRyaWVzID0gMDsKIAogc2Nhbl9hZ2FpbjoKLQludW1fZW50
cmllcyA9IDA7CiAJYnBhZ2UgPSBVVF9MSVNUX0dFVF9MQVNUKGJ1Zl9wb29sLT5MUlUpOwogCiAJ
d2hpbGUgKGJwYWdlICE9IE5VTEwpIHsKLQkJbXV0ZXhfdCoJYmxvY2tfbXV0ZXggPSBidWZfcGFn
ZV9nZXRfbXV0ZXgoYnBhZ2UpOwogCQlidWZfcGFnZV90KglwcmV2X2JwYWdlOworCQlpYm9vbAkJ
aXNfZml4ZWQ7CiAKLQkJbXV0ZXhfZW50ZXIoYmxvY2tfbXV0ZXgpOwogCQlwcmV2X2JwYWdlID0g
VVRfTElTVF9HRVRfUFJFVihMUlUsIGJwYWdlKTsKIAogCQl1dF9hKGJ1Zl9wYWdlX2luX2ZpbGUo
YnBhZ2UpKTsKIAogCQlpZiAoYnVmX3BhZ2VfZ2V0X3N0YXRlKGJwYWdlKSAhPSBCVUZfQkxPQ0tf
RklMRV9QQUdFCiAJCSAgICB8fCBicGFnZS0+c3BhY2UgIT0gaWQKLQkJICAgIHx8IGJwYWdlLT5i
dWZfZml4X2NvdW50ID4gMAogCQkgICAgfHwgYnBhZ2UtPmlvX2ZpeCAhPSBCVUZfSU9fTk9ORSkg
ewotCQkJLyogV2UgbGVhdmUgdGhlIGZpeGVkIHBhZ2VzIGFzIGlzIGluIHRoaXMgc2Nhbi4KLQkJ
CVRvIGJlIGRlYWx0IHdpdGggbGF0ZXIgaW4gdGhlIGZpbmFsIHNjYW4uICovCi0JCQltdXRleF9l
eGl0KGJsb2NrX211dGV4KTsKLQkJCWdvdG8gbmV4dF9wYWdlOworCQkJLyogQ29tcHJlc3NlZCBw
YWdlcyBhcmUgbmV2ZXIgaGFzaGVkLgorCQkJU2tpcCBibG9ja3Mgb2Ygb3RoZXIgdGFibGVzcGFj
ZXMuCisJCQlTa2lwIEkvTy1maXhlZCBibG9ja3MgKHRvIGJlIGRlYWx0IHdpdGggbGF0ZXIpLiAq
LworbmV4dF9wYWdlOgorCQkJYnBhZ2UgPSBwcmV2X2JwYWdlOworCQkJY29udGludWU7CiAJCX0K
IAotCQlpZiAoKChidWZfYmxvY2tfdCopIGJwYWdlKS0+aXNfaGFzaGVkKSB7CisJCW11dGV4X2Vu
dGVyKCYoKGJ1Zl9ibG9ja190KikgYnBhZ2UpLT5tdXRleCk7CisJCWlzX2ZpeGVkID0gYnBhZ2Ut
PmJ1Zl9maXhfY291bnQgPiAwCisJCQl8fCAhKChidWZfYmxvY2tfdCopIGJwYWdlKS0+aXNfaGFz
aGVkOworCQltdXRleF9leGl0KCYoKGJ1Zl9ibG9ja190KikgYnBhZ2UpLT5tdXRleCk7CiAKLQkJ
CS8qIFN0b3JlIHRoZSBvZmZzZXQoaS5lLjogcGFnZV9ubykgaW4gdGhlIGFycmF5Ci0JCQlzbyB0
aGF0IHdlIGNhbiBkcm9wIGhhc2ggaW5kZXggaW4gYSBiYXRjaAotCQkJbGF0ZXIuICovCi0JCQlw
YWdlX2FycltudW1fZW50cmllc10gPSBicGFnZS0+b2Zmc2V0OwotCQkJbXV0ZXhfZXhpdChibG9j
a19tdXRleCk7Ci0JCQl1dF9hKG51bV9lbnRyaWVzIDwgQlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNI
X1NJWkUpOwotCQkJKytudW1fZW50cmllczsKKwkJaWYgKGlzX2ZpeGVkKSB7CisJCQlnb3RvIG5l
eHRfcGFnZTsKKwkJfQogCi0JCQlpZiAobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VBUkNI
X0hBU0hfU0laRSkgewotCQkJCWdvdG8gbmV4dF9wYWdlOwotCQkJfQorCQkvKiBTdG9yZSB0aGUg
cGFnZSBudW1iZXIgc28gdGhhdCB3ZSBjYW4gZHJvcCB0aGUgaGFzaAorCQlpbmRleCBpbiBhIGJh
dGNoIGxhdGVyLiAqLworCQlwYWdlX2FycltudW1fZW50cmllc10gPSBicGFnZS0+b2Zmc2V0Owor
CQl1dF9hKG51bV9lbnRyaWVzIDwgQlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNIX1NJWkUpOworCQkr
K251bV9lbnRyaWVzOwogCi0JCQkvKiBBcnJheSBmdWxsLiBXZSByZWxlYXNlIHRoZSBidWZfcG9v
bC0+bXV0ZXggdG8KLQkJCW9iZXkgdGhlIGxhdGNoaW5nIG9yZGVyLiAqLwotCQkJYnVmX3Bvb2xf
bXV0ZXhfZXhpdChidWZfcG9vbCk7CisJCWlmIChudW1fZW50cmllcyA8IEJVRl9MUlVfRFJPUF9T
RUFSQ0hfSEFTSF9TSVpFKSB7CisJCQlnb3RvIG5leHRfcGFnZTsKKwkJfQogCi0JCQlidWZfTFJV
X2Ryb3BfcGFnZV9oYXNoX2JhdGNoKAotCQkJCWlkLCB6aXBfc2l6ZSwgcGFnZV9hcnIsIG51bV9l
bnRyaWVzKTsKKwkJLyogQXJyYXkgZnVsbC4gV2UgcmVsZWFzZSB0aGUgYnVmX3Bvb2wtPm11dGV4
IHRvIG9iZXkKKwkJdGhlIGxhdGNoaW5nIG9yZGVyLiAqLworCQlidWZfcG9vbF9tdXRleF9leGl0
KGJ1Zl9wb29sKTsKIAotCQkJbnVtX2VudHJpZXMgPSAwOworCQlidWZfTFJVX2Ryb3BfcGFnZV9o
YXNoX2JhdGNoKAorCQkJaWQsIHppcF9zaXplLCBwYWdlX2FyciwgbnVtX2VudHJpZXMpOwogCi0J
CQlidWZfcG9vbF9tdXRleF9lbnRlcihidWZfcG9vbCk7Ci0JCX0gZWxzZSB7Ci0JCQltdXRleF9l
eGl0KGJsb2NrX211dGV4KTsKLQkJfQorCQludW1fZW50cmllcyA9IDA7CiAKLW5leHRfcGFnZToK
LQkJLyogTm90ZSB0aGF0IHdlIG1heSBoYXZlIHJlbGVhc2VkIHRoZSBidWZfcG9vbCBtdXRleAot
CQlhYm92ZSBhZnRlciByZWFkaW5nIHRoZSBwcmV2X2JwYWdlIGR1cmluZyBwcm9jZXNzaW5nCi0J
CW9mIGEgcGFnZV9oYXNoX2JhdGNoIChpLmUuOiB3aGVuIHRoZSBhcnJheSB3YXMgZnVsbCkuCi0J
CVRoaXMgbWVhbnMgdGhhdCBwcmV2X2JwYWdlIGNhbiBjaGFuZ2UgaW4gTFJVIGxpc3QuCi0JCVRo
aXMgaXMgT0sgYmVjYXVzZSB0aGlzIGZ1bmN0aW9uIGlzIGEgJ2Jlc3QgZWZmb3J0JwotCQl0byBk
cm9wIGFzIG1hbnkgc2VhcmNoIGhhc2ggZW50cmllcyBhcyBwb3NzaWJsZSBhbmQKLQkJaXQgZG9l
cyBub3QgZ3VhcmFudGVlIHRoYXQgQUxMIHN1Y2ggZW50cmllcyB3aWxsIGJlCi0JCWRyb3BwZWQu
ICovCi0JCWJwYWdlID0gcHJldl9icGFnZTsKKwkJYnVmX3Bvb2xfbXV0ZXhfZW50ZXIoYnVmX3Bv
b2wpOworCisJCS8qIE5vdGUgdGhhdCB3ZSByZWxlYXNlZCB0aGUgYnVmX3Bvb2wgbXV0ZXggYWJv
dmUKKwkJYWZ0ZXIgcmVhZGluZyB0aGUgcHJldl9icGFnZSBkdXJpbmcgcHJvY2Vzc2luZyBvZiBh
CisJCXBhZ2VfaGFzaF9iYXRjaCAoaS5lLjogd2hlbiB0aGUgYXJyYXkgd2FzIGZ1bGwpLgorCQlC
ZWNhdXNlIHByZXZfYnBhZ2UgY291bGQgYmVsb25nIHRvIGEgY29tcHJlc3NlZC1vbmx5CisJCWJs
b2NrLCBpdCBtYXkgaGF2ZSBiZWVuIHJlbG9jYXRlZCwgYW5kIHRodXMgdGhlCisJCXBvaW50ZXIg
Y2Fubm90IGJlIHRydXN0ZWQuIEJlY2F1c2UgYnBhZ2UgaXMgb2YgdHlwZQorCQlidWZfYmxvY2tf
dCwgaXQgaXMgc2FmZSB0byBkZXJlZmVyZW5jZS4KKworCQlicGFnZSBjYW4gY2hhbmdlIGluIHRo
ZSBMUlUgbGlzdC4gVGhpcyBpcyBPSyBiZWNhdXNlCisJCXRoaXMgZnVuY3Rpb24gaXMgYSAnYmVz
dCBlZmZvcnQnIHRvIGRyb3AgYXMgbWFueQorCQlzZWFyY2ggaGFzaCBlbnRyaWVzIGFzIHBvc3Np
YmxlIGFuZCBpdCBkb2VzIG5vdAorCQlndWFyYW50ZWUgdGhhdCBBTEwgc3VjaCBlbnRyaWVzIHdp
bGwgYmUgZHJvcHBlZC4gKi8KIAogCQkvKiBJZiwgaG93ZXZlciwgYnBhZ2UgaGFzIGJlZW4gcmVt
b3ZlZCBmcm9tIExSVSBsaXN0CiAJCXRvIHRoZSBmcmVlIGxpc3QgdGhlbiB3ZSBzaG91bGQgcmVz
dGFydCB0aGUgc2Nhbi4KIAkJYnBhZ2UtPnN0YXRlIGlzIHByb3RlY3RlZCBieSBidWZfcG9vbCBt
dXRleC4gKi8KLQkJaWYgKGJwYWdlICYmICFidWZfcGFnZV9pbl9maWxlKGJwYWdlKSkgewotCQkJ
dXRfYShudW1fZW50cmllcyA9PSAwKTsKKwkJaWYgKGJwYWdlCisJCSAgICAmJiBidWZfcGFnZV9n
ZXRfc3RhdGUoYnBhZ2UpICE9IEJVRl9CTE9DS19GSUxFX1BBR0UpIHsKIAkJCWdvdG8gc2Nhbl9h
Z2FpbjsKIAkJfQogCX0KQEAgLTE4ODksNiArMTg5Myw3IEBAIGJ1Zl9MUlVfYmxvY2tfcmVtb3Zl
X2hhc2hlZF9wYWdlKAogCQkJYnVmX3Bvb2wsIGJwYWdlLT56aXAuZGF0YSwKIAkJCXBhZ2Vfemlw
X2dldF9zaXplKCZicGFnZS0+emlwKSk7CiAKKwkJYnBhZ2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJ
UF9GUkVFOwogCQlidWZfYnVkZHlfZnJlZShidWZfcG9vbCwgYnBhZ2UsIHNpemVvZigqYnBhZ2Up
KTsKIAkJYnVmX3Bvb2xfbXV0ZXhfZXhpdF9hbGxvdyhidWZfcG9vbCk7CiAKCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5oJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20t
MjAxMTAyMjgwOTA3MjItMGhzZzYwNXl2bTJ5cGw5YworKysgYi9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvYnVmMGJ1Zi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjI4MTMz
OTA3LXJhdWJleGNiaDMyb3JncXEKQEAgLTQxLDYgKzQxLDggQEAgQ3JlYXRlZCAxMS81LzE5OTUg
SGVpa2tpIFR1dXJpCiAvKiBAeyAqLwogI2RlZmluZSBCVUZfR0VUCQkJMTAJLyohPCBnZXQgYWx3
YXlzICovCiAjZGVmaW5lCUJVRl9HRVRfSUZfSU5fUE9PTAkxMQkvKiE8IGdldCBpZiBpbiBwb29s
ICovCisjZGVmaW5lIEJVRl9QRUVLX0lGX0lOX1BPT0wJMTIJLyohPCBnZXQgaWYgaW4gcG9vbCwg
ZG8gbm90IG1ha2UKKwkJCQkJdGhlIGJsb2NrIHlvdW5nIGluIHRoZSBMUlUgbGlzdCAqLwogI2Rl
ZmluZSBCVUZfR0VUX05PX0xBVENICTE0CS8qITwgZ2V0IGFuZCBidWZmZXJmaXgsIGJ1dAogCQkJ
CQlzZXQgbm8gbGF0Y2g7IHdlIGhhdmUKIAkJCQkJc2VwYXJhdGVkIHRoaXMgY2FzZSwgYmVjYXVz
ZQpAQCAtMzk2LDcgKzM5OCw3IEBAIGJ1Zl9wYWdlX2dldF9nZW4oCiAJdWxpbnQJCXJ3X2xhdGNo
LC8qITwgaW46IFJXX1NfTEFUQ0gsIFJXX1hfTEFUQ0gsIFJXX05PX0xBVENIICovCiAJYnVmX2Js
b2NrX3QqCWd1ZXNzLAkvKiE8IGluOiBndWVzc2VkIGJsb2NrIG9yIE5VTEwgKi8KIAl1bGludAkJ
bW9kZSwJLyohPCBpbjogQlVGX0dFVCwgQlVGX0dFVF9JRl9JTl9QT09MLAotCQkJCUJVRl9HRVRf
Tk9fTEFUQ0ggb3IKKwkJCQlCVUZfUEVFS19JRl9JTl9QT09MLCBCVUZfR0VUX05PX0xBVENIIG9y
CiAJCQkJQlVGX0dFVF9JRl9JTl9QT09MX09SX1dBVENIICovCiAJY29uc3QgY2hhcioJZmlsZSwJ
LyohPCBpbjogZmlsZSBuYW1lICovCiAJdWxpbnQJCWxpbmUsCS8qITwgaW46IGxpbmUgd2hlcmUg
Y2FsbGVkICovCgo=

--===============0766868712==
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: 85e87d6aed4b863e96f8e8dc0ed43eea5f343ce0
# timestamp: 2011-02-28 16:04:27 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   0hsg605yvm2ypl9c
# 
# Begin bundle
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


--===============0766868712==--