From: marko.makela
Date: February 28 2011 2:03pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3525)
List-Archive: http://lists.mysql.com/commits/132119
Message-Id: <201102281403.p1SDuqvY013321@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0910990094=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMjgwOTM1MDEtNHlvdmo3
ZnU0bDdkMmVqcQoKIDM1MjUgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0yOCBbbWVyZ2VdCiAgICAg
IE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwc2VhLmMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9idWYvYnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBscnUu
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5oCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwc2VhLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvYnRyL2J0cjBzZWEuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMjgwOTM1
MDEtNHlvdmo3ZnU0bDdkMmVqcQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwc2VhLmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMjgxNDAyMjctOXR0MmJ0bzljOTN0
aWN1ZApAQCAtMTIzMiw4ICsxMjMyLDggQEAgYnRyX3NlYXJjaF9kcm9wX3BhZ2VfaGFzaF93aGVu
X2ZyZWVkKAogCWhhdmluZyB0byBmZWFyIGEgZGVhZGxvY2suICovCiAKIAlibG9jayA9IGJ1Zl9w
YWdlX2dldF9nZW4oc3BhY2UsIHppcF9zaXplLCBwYWdlX25vLCBSV19TX0xBVENILCBOVUxMLAot
CQkJCUJVRl9HRVRfSUZfSU5fUE9PTCwgX19GSUxFX18sIF9fTElORV9fLAotCQkJCSZtdHIpOwor
CQkJCSBCVUZfUEVFS19JRl9JTl9QT09MLCBfX0ZJTEVfXywgX19MSU5FX18sCisJCQkJICZtdHIp
OwogCS8qIEJlY2F1c2UgdGhlIGJ1ZmZlciBwb29sIG11dGV4IHdhcyByZWxlYXNlZCBieQogCWJ1
Zl9wYWdlX3BlZWtfaWZfc2VhcmNoX2hhc2hlZCgpLCBpdCBpcyBwb3NzaWJsZSB0aGF0IHRoZQog
CWJsb2NrIHdhcyByZW1vdmVkIGZyb20gdGhlIGJ1ZmZlciBwb29sIGJ5IGFub3RoZXIgdGhyZWFk
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUu
Y29tLTIwMTEwMjI4MDkzNTAxLTR5b3ZqN2Z1NGw3ZDJlanEKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjI4MTQw
MjI3LTl0dDJidG85YzkzdGljdWQKQEAgLTI4NjksNyArMjg2OSw3IEBAIGJ1Zl9wYWdlX2dldF9n
ZW4oCiAJdWxpbnQJCXJ3X2xhdGNoLC8qITwgaW46IFJXX1NfTEFUQ0gsIFJXX1hfTEFUQ0gsIFJX
X05PX0xBVENIICovCiAJYnVmX2Jsb2NrX3QqCWd1ZXNzLAkvKiE8IGluOiBndWVzc2VkIGJsb2Nr
IG9yIE5VTEwgKi8KIAl1bGludAkJbW9kZSwJLyohPCBpbjogQlVGX0dFVCwgQlVGX0dFVF9JRl9J
Tl9QT09MLAotCQkJCUJVRl9HRVRfTk9fTEFUQ0gsIG9yCisJCQkJQlVGX1BFRUtfSUZfSU5fUE9P
TCwgQlVGX0dFVF9OT19MQVRDSCwgb3IKIAkJCQlCVUZfR0VUX0lGX0lOX1BPT0xfT1JfV0FUQ0gg
Ki8KIAljb25zdCBjaGFyKglmaWxlLAkvKiE8IGluOiBmaWxlIG5hbWUgKi8KIAl1bGludAkJbGlu
ZSwJLyohPCBpbjogbGluZSB3aGVyZSBjYWxsZWQgKi8KQEAgLTI4OTEsMTEgKzI4OTEsMjAgQEAg
YnVmX3BhZ2VfZ2V0X2dlbigKIAl1dF9hZCgocndfbGF0Y2ggPT0gUldfU19MQVRDSCkKIAkgICAg
ICB8fCAocndfbGF0Y2ggPT0gUldfWF9MQVRDSCkKIAkgICAgICB8fCAocndfbGF0Y2ggPT0gUldf
Tk9fTEFUQ0gpKTsKLQl1dF9hZCgobW9kZSAhPSBCVUZfR0VUX05PX0xBVENIKSB8fCAocndfbGF0
Y2ggPT0gUldfTk9fTEFUQ0gpKTsKLQl1dF9hZChtb2RlID09IEJVRl9HRVQKLQkgICAgICB8fCBt
b2RlID09IEJVRl9HRVRfSUZfSU5fUE9PTAotCSAgICAgIHx8IG1vZGUgPT0gQlVGX0dFVF9OT19M
QVRDSAotCSAgICAgIHx8IG1vZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MX09SX1dBVENIKTsKKyNp
ZmRlZiBVTklWX0RFQlVHCisJc3dpdGNoIChtb2RlKSB7CisJY2FzZSBCVUZfR0VUX05PX0xBVENI
OgorCQl1dF9hZChyd19sYXRjaCA9PSBSV19OT19MQVRDSCk7CisJCWJyZWFrOworCWNhc2UgQlVG
X0dFVDoKKwljYXNlIEJVRl9HRVRfSUZfSU5fUE9PTDoKKwljYXNlIEJVRl9QRUVLX0lGX0lOX1BP
T0w6CisJY2FzZSBCVUZfR0VUX0lGX0lOX1BPT0xfT1JfV0FUQ0g6CisJCWJyZWFrOworCWRlZmF1
bHQ6CisJCXV0X2Vycm9yOworCX0KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAJdXRfYWQoemlw
X3NpemUgPT0gZmlsX3NwYWNlX2dldF96aXBfc2l6ZShzcGFjZSkpOwogCXV0X2FkKHV0X2lzXzJw
b3coemlwX3NpemUpKTsKICNpZm5kZWYgVU5JVl9MT0dfREVCVUcKQEAgLTI5NjcsNiArMjk3Niw3
IEBAIGxvb3AyOgogCQl9CiAKIAkJaWYgKG1vZGUgPT0gQlVGX0dFVF9JRl9JTl9QT09MCisJCSAg
ICB8fCBtb2RlID09IEJVRl9QRUVLX0lGX0lOX1BPT0wKIAkJICAgIHx8IG1vZGUgPT0gQlVGX0dF
VF9JRl9JTl9QT09MX09SX1dBVENIKSB7CiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCiAJCQl1dF9h
ZCghcndfbG9ja19vd24oaGFzaF9sb2NrLCBSV19MT0NLX0VYKSk7CkBAIC0zMDIwLDcgKzMwMzAs
OCBAQCBnb3RfYmxvY2s6CiAKIAltdXN0X3JlYWQgPSBidWZfYmxvY2tfZ2V0X2lvX2ZpeChibG9j
aykgPT0gQlVGX0lPX1JFQUQ7CiAKLQlpZiAobXVzdF9yZWFkICYmIG1vZGUgPT0gQlVGX0dFVF9J
Rl9JTl9QT09MKSB7CisJaWYgKG11c3RfcmVhZCAmJiAobW9kZSA9PSBCVUZfR0VUX0lGX0lOX1BP
T0wKKwkJCSAgfHwgbW9kZSA9PSBCVUZfUEVFS19JRl9JTl9QT09MKSkgewogCiAJCS8qIFRoZSBw
YWdlIGlzIGJlaW5nIHJlYWQgdG8gYnVmZmVyIHBvb2wsCiAJCWJ1dCB3ZSBjYW5ub3Qgd2FpdCBh
cm91bmQgZm9yIHRoZSByZWFkIHRvCkBAIC0zMTUxLDYgKzMxNjIsNyBAQCB3YWl0X3VudGlsX3Vu
Zml4ZWQ6CiAJCW11dGV4X2V4aXQoJmJ1Zl9wb29sLT56aXBfbXV0ZXgpOwogCQlidWZfcG9vbC0+
bl9wZW5kX3VuemlwKys7CiAKKwkJYnBhZ2UtPnN0YXRlID0gQlVGX0JMT0NLX1pJUF9GUkVFOwog
CQlidWZfYnVkZHlfZnJlZShidWZfcG9vbCwgYnBhZ2UsIHNpemVvZiAqYnBhZ2UpOwogCiAJCWJ1
Zl9wb29sX211dGV4X2V4aXQoYnVmX3Bvb2wpOwpAQCAtMzI3Niw3ICszMjg4LDkgQEAgd2FpdF91
bnRpbF91bmZpeGVkOgogCiAJYWNjZXNzX3RpbWUgPSBidWZfcGFnZV9pc19hY2Nlc3NlZCgmYmxv
Y2stPnBhZ2UpOwogCi0JYnVmX3BhZ2Vfc2V0X2FjY2Vzc2VkX21ha2VfeW91bmcoJmJsb2NrLT5w
YWdlLCBhY2Nlc3NfdGltZSk7CisJaWYgKFVOSVZfTElLRUxZKG1vZGUgIT0gQlVGX1BFRUtfSUZf
SU5fUE9PTCkpIHsKKwkJYnVmX3BhZ2Vfc2V0X2FjY2Vzc2VkX21ha2VfeW91bmcoJmJsb2NrLT5w
YWdlLCBhY2Nlc3NfdGltZSk7CisJfQogCiAjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUND
RVNTRVMgfHwgZGVmaW5lZCBVTklWX0RFQlVHCiAJdXRfYSghYmxvY2stPnBhZ2UuZmlsZV9wYWdl
X3dhc19mcmVlZCk7CkBAIC0zMzI5LDcgKzMzNDMsNyBAQCB3YWl0X3VudGlsX3VuZml4ZWQ6CiAK
IAltdHJfbWVtb19wdXNoKG10ciwgYmxvY2ssIGZpeF90eXBlKTsKIAotCWlmICghYWNjZXNzX3Rp
bWUpIHsKKwlpZiAoVU5JVl9MSUtFTFkobW9kZSAhPSBCVUZfUEVFS19JRl9JTl9QT09MKSAmJiAh
YWNjZXNzX3RpbWUpIHsKIAkJLyogSW4gdGhlIGNhc2Ugb2YgYSBmaXJzdCBhY2Nlc3MsIHRyeSB0
byBhcHBseSBsaW5lYXIKIAkJcmVhZC1haGVhZCAqLwogCkBAIC0zOTQxLDYgKzM5NTUsNyBAQCBl
cnJfZXhpdDoKIAkJCQkvKiBUaGUgYmxvY2sgd2FzIGFkZGVkIGJ5IHNvbWUgb3RoZXIgdGhyZWFk
LiAqLwogCQkJCXJ3X2xvY2tfeF91bmxvY2soaGFzaF9sb2NrKTsKIAkJCQl3YXRjaF9wYWdlID0g
TlVMTDsKKwkJCQlicGFnZS0+c3RhdGUgPSBCVUZfQkxPQ0tfWklQX0ZSRUU7CiAJCQkJYnVmX2J1
ZGR5X2ZyZWUoYnVmX3Bvb2wsIGJwYWdlLCBzaXplb2YgKmJwYWdlKTsKIAkJCQlidWZfYnVkZHlf
ZnJlZShidWZfcG9vbCwgZGF0YSwgemlwX3NpemUpOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9idWYvYnVmMGxydS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9i
dWYwbHJ1LmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTEwMjI4MDkzNTAxLTR5b3Zq
N2Z1NGw3ZDJlanEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGxydS5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjI4MTQwMjI3LTl0dDJidG85YzkzdGljdWQKQEAg
LTI1MSw3NCArMjUxLDc4IEBAIGJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hfZm9yX3RhYmxlc3BhY2Uo
CiAJCXNpemVvZih1bGludCkgKiBCVUZfTFJVX0RST1BfU0VBUkNIX0hBU0hfU0laRSk7CiAKIAli
dWZfcG9vbF9tdXRleF9lbnRlcihidWZfcG9vbCk7CisJbnVtX2VudHJpZXMgPSAwOwogCiBzY2Fu
X2FnYWluOgotCW51bV9lbnRyaWVzID0gMDsKIAlicGFnZSA9IFVUX0xJU1RfR0VUX0xBU1QoYnVm
X3Bvb2wtPkxSVSk7CiAKIAl3aGlsZSAoYnBhZ2UgIT0gTlVMTCkgewotCQltdXRleF90KglibG9j
a19tdXRleCA9IGJ1Zl9wYWdlX2dldF9tdXRleChicGFnZSk7CiAJCWJ1Zl9wYWdlX3QqCXByZXZf
YnBhZ2U7CisJCWlib29sCQlpc19maXhlZDsKIAotCQltdXRleF9lbnRlcihibG9ja19tdXRleCk7
CiAJCXByZXZfYnBhZ2UgPSBVVF9MSVNUX0dFVF9QUkVWKExSVSwgYnBhZ2UpOwogCiAJCXV0X2Eo
YnVmX3BhZ2VfaW5fZmlsZShicGFnZSkpOwogCiAJCWlmIChidWZfcGFnZV9nZXRfc3RhdGUoYnBh
Z2UpICE9IEJVRl9CTE9DS19GSUxFX1BBR0UKIAkJICAgIHx8IGJwYWdlLT5zcGFjZSAhPSBpZAot
CQkgICAgfHwgYnBhZ2UtPmJ1Zl9maXhfY291bnQgPiAwCiAJCSAgICB8fCBicGFnZS0+aW9fZml4
ICE9IEJVRl9JT19OT05FKSB7Ci0JCQkvKiBXZSBsZWF2ZSB0aGUgZml4ZWQgcGFnZXMgYXMgaXMg
aW4gdGhpcyBzY2FuLgotCQkJVG8gYmUgZGVhbHQgd2l0aCBsYXRlciBpbiB0aGUgZmluYWwgc2Nh
bi4gKi8KLQkJCW11dGV4X2V4aXQoYmxvY2tfbXV0ZXgpOwotCQkJZ290byBuZXh0X3BhZ2U7CisJ
CQkvKiBDb21wcmVzc2VkIHBhZ2VzIGFyZSBuZXZlciBoYXNoZWQuCisJCQlTa2lwIGJsb2NrcyBv
ZiBvdGhlciB0YWJsZXNwYWNlcy4KKwkJCVNraXAgSS9PLWZpeGVkIGJsb2NrcyAodG8gYmUgZGVh
bHQgd2l0aCBsYXRlcikuICovCituZXh0X3BhZ2U6CisJCQlicGFnZSA9IHByZXZfYnBhZ2U7CisJ
CQljb250aW51ZTsKIAkJfQogCi0JCWlmICgoKGJ1Zl9ibG9ja190KikgYnBhZ2UpLT5pc19oYXNo
ZWQpIHsKKwkJbXV0ZXhfZW50ZXIoJigoYnVmX2Jsb2NrX3QqKSBicGFnZSktPm11dGV4KTsKKwkJ
aXNfZml4ZWQgPSBicGFnZS0+YnVmX2ZpeF9jb3VudCA+IDAKKwkJCXx8ICEoKGJ1Zl9ibG9ja190
KikgYnBhZ2UpLT5pc19oYXNoZWQ7CisJCW11dGV4X2V4aXQoJigoYnVmX2Jsb2NrX3QqKSBicGFn
ZSktPm11dGV4KTsKIAotCQkJLyogU3RvcmUgdGhlIG9mZnNldChpLmUuOiBwYWdlX25vKSBpbiB0
aGUgYXJyYXkKLQkJCXNvIHRoYXQgd2UgY2FuIGRyb3AgaGFzaCBpbmRleCBpbiBhIGJhdGNoCi0J
CQlsYXRlci4gKi8KLQkJCXBhZ2VfYXJyW251bV9lbnRyaWVzXSA9IGJwYWdlLT5vZmZzZXQ7Ci0J
CQltdXRleF9leGl0KGJsb2NrX211dGV4KTsKLQkJCXV0X2EobnVtX2VudHJpZXMgPCBCVUZfTFJV
X0RST1BfU0VBUkNIX0hBU0hfU0laRSk7Ci0JCQkrK251bV9lbnRyaWVzOworCQlpZiAoaXNfZml4
ZWQpIHsKKwkJCWdvdG8gbmV4dF9wYWdlOworCQl9CiAKLQkJCWlmIChudW1fZW50cmllcyA8IEJV
Rl9MUlVfRFJPUF9TRUFSQ0hfSEFTSF9TSVpFKSB7Ci0JCQkJZ290byBuZXh0X3BhZ2U7Ci0JCQl9
CisJCS8qIFN0b3JlIHRoZSBwYWdlIG51bWJlciBzbyB0aGF0IHdlIGNhbiBkcm9wIHRoZSBoYXNo
CisJCWluZGV4IGluIGEgYmF0Y2ggbGF0ZXIuICovCisJCXBhZ2VfYXJyW251bV9lbnRyaWVzXSA9
IGJwYWdlLT5vZmZzZXQ7CisJCXV0X2EobnVtX2VudHJpZXMgPCBCVUZfTFJVX0RST1BfU0VBUkNI
X0hBU0hfU0laRSk7CisJCSsrbnVtX2VudHJpZXM7CiAKLQkJCS8qIEFycmF5IGZ1bGwuIFdlIHJl
bGVhc2UgdGhlIGJ1Zl9wb29sLT5tdXRleCB0bwotCQkJb2JleSB0aGUgbGF0Y2hpbmcgb3JkZXIu
ICovCi0JCQlidWZfcG9vbF9tdXRleF9leGl0KGJ1Zl9wb29sKTsKKwkJaWYgKG51bV9lbnRyaWVz
IDwgQlVGX0xSVV9EUk9QX1NFQVJDSF9IQVNIX1NJWkUpIHsKKwkJCWdvdG8gbmV4dF9wYWdlOwor
CQl9CiAKLQkJCWJ1Zl9MUlVfZHJvcF9wYWdlX2hhc2hfYmF0Y2goCi0JCQkJaWQsIHppcF9zaXpl
LCBwYWdlX2FyciwgbnVtX2VudHJpZXMpOworCQkvKiBBcnJheSBmdWxsLiBXZSByZWxlYXNlIHRo
ZSBidWZfcG9vbC0+bXV0ZXggdG8gb2JleQorCQl0aGUgbGF0Y2hpbmcgb3JkZXIuICovCisJCWJ1
Zl9wb29sX211dGV4X2V4aXQoYnVmX3Bvb2wpOwogCi0JCQludW1fZW50cmllcyA9IDA7CisJCWJ1
Zl9MUlVfZHJvcF9wYWdlX2hhc2hfYmF0Y2goCisJCQlpZCwgemlwX3NpemUsIHBhZ2VfYXJyLCBu
dW1fZW50cmllcyk7CiAKLQkJCWJ1Zl9wb29sX211dGV4X2VudGVyKGJ1Zl9wb29sKTsKLQkJfSBl
bHNlIHsKLQkJCW11dGV4X2V4aXQoYmxvY2tfbXV0ZXgpOwotCQl9CisJCW51bV9lbnRyaWVzID0g
MDsKIAotbmV4dF9wYWdlOgotCQkvKiBOb3RlIHRoYXQgd2UgbWF5IGhhdmUgcmVsZWFzZWQgdGhl
IGJ1Zl9wb29sIG11dGV4Ci0JCWFib3ZlIGFmdGVyIHJlYWRpbmcgdGhlIHByZXZfYnBhZ2UgZHVy
aW5nIHByb2Nlc3NpbmcKLQkJb2YgYSBwYWdlX2hhc2hfYmF0Y2ggKGkuZS46IHdoZW4gdGhlIGFy
cmF5IHdhcyBmdWxsKS4KLQkJVGhpcyBtZWFucyB0aGF0IHByZXZfYnBhZ2UgY2FuIGNoYW5nZSBp
biBMUlUgbGlzdC4KLQkJVGhpcyBpcyBPSyBiZWNhdXNlIHRoaXMgZnVuY3Rpb24gaXMgYSAnYmVz
dCBlZmZvcnQnCi0JCXRvIGRyb3AgYXMgbWFueSBzZWFyY2ggaGFzaCBlbnRyaWVzIGFzIHBvc3Np
YmxlIGFuZAotCQlpdCBkb2VzIG5vdCBndWFyYW50ZWUgdGhhdCBBTEwgc3VjaCBlbnRyaWVzIHdp
bGwgYmUKLQkJZHJvcHBlZC4gKi8KLQkJYnBhZ2UgPSBwcmV2X2JwYWdlOworCQlidWZfcG9vbF9t
dXRleF9lbnRlcihidWZfcG9vbCk7CisKKwkJLyogTm90ZSB0aGF0IHdlIHJlbGVhc2VkIHRoZSBi
dWZfcG9vbCBtdXRleCBhYm92ZQorCQlhZnRlciByZWFkaW5nIHRoZSBwcmV2X2JwYWdlIGR1cmlu
ZyBwcm9jZXNzaW5nIG9mIGEKKwkJcGFnZV9oYXNoX2JhdGNoIChpLmUuOiB3aGVuIHRoZSBhcnJh
eSB3YXMgZnVsbCkuCisJCUJlY2F1c2UgcHJldl9icGFnZSBjb3VsZCBiZWxvbmcgdG8gYSBjb21w
cmVzc2VkLW9ubHkKKwkJYmxvY2ssIGl0IG1heSBoYXZlIGJlZW4gcmVsb2NhdGVkLCBhbmQgdGh1
cyB0aGUKKwkJcG9pbnRlciBjYW5ub3QgYmUgdHJ1c3RlZC4gQmVjYXVzZSBicGFnZSBpcyBvZiB0
eXBlCisJCWJ1Zl9ibG9ja190LCBpdCBpcyBzYWZlIHRvIGRlcmVmZXJlbmNlLgorCisJCWJwYWdl
IGNhbiBjaGFuZ2UgaW4gdGhlIExSVSBsaXN0LiBUaGlzIGlzIE9LIGJlY2F1c2UKKwkJdGhpcyBm
dW5jdGlvbiBpcyBhICdiZXN0IGVmZm9ydCcgdG8gZHJvcCBhcyBtYW55CisJCXNlYXJjaCBoYXNo
IGVudHJpZXMgYXMgcG9zc2libGUgYW5kIGl0IGRvZXMgbm90CisJCWd1YXJhbnRlZSB0aGF0IEFM
TCBzdWNoIGVudHJpZXMgd2lsbCBiZSBkcm9wcGVkLiAqLwogCiAJCS8qIElmLCBob3dldmVyLCBi
cGFnZSBoYXMgYmVlbiByZW1vdmVkIGZyb20gTFJVIGxpc3QKIAkJdG8gdGhlIGZyZWUgbGlzdCB0
aGVuIHdlIHNob3VsZCByZXN0YXJ0IHRoZSBzY2FuLgogCQlicGFnZS0+c3RhdGUgaXMgcHJvdGVj
dGVkIGJ5IGJ1Zl9wb29sIG11dGV4LiAqLwotCQlpZiAoYnBhZ2UgJiYgIWJ1Zl9wYWdlX2luX2Zp
bGUoYnBhZ2UpKSB7Ci0JCQl1dF9hKG51bV9lbnRyaWVzID09IDApOworCQlpZiAoYnBhZ2UKKwkJ
ICAgICYmIGJ1Zl9wYWdlX2dldF9zdGF0ZShicGFnZSkgIT0gQlVGX0JMT0NLX0ZJTEVfUEFHRSkg
ewogCQkJZ290byBzY2FuX2FnYWluOwogCQl9CiAJfQpAQCAtMTk1Nyw2ICsxOTYxLDcgQEAgYnVm
X0xSVV9ibG9ja19yZW1vdmVfaGFzaGVkX3BhZ2UoCiAJCQlidWZfcG9vbCwgYnBhZ2UtPnppcC5k
YXRhLAogCQkJcGFnZV96aXBfZ2V0X3NpemUoJmJwYWdlLT56aXApKTsKIAorCQlicGFnZS0+c3Rh
dGUgPSBCVUZfQkxPQ0tfWklQX0ZSRUU7CiAJCWJ1Zl9idWRkeV9mcmVlKGJ1Zl9wb29sLCBicGFn
ZSwgc2l6ZW9mKCpicGFnZSkpOwogCQlidWZfcG9vbF9tdXRleF9leGl0X2FsbG93KGJ1Zl9wb29s
KTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVm
LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgJcmV2aWQ6amltbXku
eWFuZ0BvcmFjbGUuY29tLTIwMTEwMjI4MDkzNTAxLTR5b3ZqN2Z1NGw3ZDJlanEKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDIyODE0MDIyNy05dHQyYnRvOWM5M3RpY3VkCkBAIC00MSw2ICs0MSw4IEBAIENy
ZWF0ZWQgMTEvNS8xOTk1IEhlaWtraSBUdXVyaQogLyogQHsgKi8KICNkZWZpbmUgQlVGX0dFVAkJ
CTEwCS8qITwgZ2V0IGFsd2F5cyAqLwogI2RlZmluZQlCVUZfR0VUX0lGX0lOX1BPT0wJMTEJLyoh
PCBnZXQgaWYgaW4gcG9vbCAqLworI2RlZmluZSBCVUZfUEVFS19JRl9JTl9QT09MCTEyCS8qITwg
Z2V0IGlmIGluIHBvb2wsIGRvIG5vdCBtYWtlCisJCQkJCXRoZSBibG9jayB5b3VuZyBpbiB0aGUg
TFJVIGxpc3QgKi8KICNkZWZpbmUgQlVGX0dFVF9OT19MQVRDSAkxNAkvKiE8IGdldCBhbmQgYnVm
ZmVyZml4LCBidXQKIAkJCQkJc2V0IG5vIGxhdGNoOyB3ZSBoYXZlCiAJCQkJCXNlcGFyYXRlZCB0
aGlzIGNhc2UsIGJlY2F1c2UKQEAgLTQwMSw3ICs0MDMsNyBAQCBidWZfcGFnZV9nZXRfZ2VuKAog
CXVsaW50CQlyd19sYXRjaCwvKiE8IGluOiBSV19TX0xBVENILCBSV19YX0xBVENILCBSV19OT19M
QVRDSCAqLwogCWJ1Zl9ibG9ja190KglndWVzcywJLyohPCBpbjogZ3Vlc3NlZCBibG9jayBvciBO
VUxMICovCiAJdWxpbnQJCW1vZGUsCS8qITwgaW46IEJVRl9HRVQsIEJVRl9HRVRfSUZfSU5fUE9P
TCwKLQkJCQlCVUZfR0VUX05PX0xBVENIIG9yCisJCQkJQlVGX1BFRUtfSUZfSU5fUE9PTCwgQlVG
X0dFVF9OT19MQVRDSCBvcgogCQkJCUJVRl9HRVRfSUZfSU5fUE9PTF9PUl9XQVRDSCAqLwogCWNv
bnN0IGNoYXIqCWZpbGUsCS8qITwgaW46IGZpbGUgbmFtZSAqLwogCXVsaW50CQlsaW5lLAkvKiE8
IGluOiBsaW5lIHdoZXJlIGNhbGxlZCAqLwoK

--===============0910990094==
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:03:36 +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


--===============0910990094==--