From: marko.makela
Date: April 20 2011 10:48am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3595 to 3596)
List-Archive: http://lists.mysql.com/commits/135790
Message-Id: <201104201048.p3KAmUsV012764@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0684823688=="

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

IDM1OTYgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0yMAogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2VzLgogICAgICAKICAgICAgYnRyX2N1cl9pbnNfbG9ja19hbmRfdW5kbygpOiBSZW1vdmUgb25l
IGxldmVsIG9mIGluZGVudGF0aW9uIGZyb20gdGhlIHRhaWwuCiAgICAgIAogICAgICBidHJfY3Vy
X3VwZGF0ZV9pbl9wbGFjZSgpOiBTcGxpdCBhIGxpbmUgYSBsaXR0bGUgYmV0dGVyLgogICAgICAK
ICAgICAgcm93X3VuZG9faW5zX3JlbW92ZV9jbHVzdF9yZWMoKTogVXNlIGNvbW1vbiBmdW5jX2V4
aXQuCiAgICAgIAogICAgICByb3dfdXBkX2NsdXN0X3N0ZXAoKTogUmV0dXJuIHJvd191cGRfY2x1
c3RfcmVjKCkgZGlyZWN0bHkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdWlucy5jCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwogMzU5NSBNYXJrbyBNw6RrZWzDpAkyMDEx
LTA0LTIwIFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVu
ay1pbm5vZGIuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBj
dXIuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MjAwODMzNDgtNzlpbTJ2dW5jbjNxZDd1MAorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0
MjAxMDQ3MjctdXR2a2hucTI0cXplMXVkcgpAQCAtMTEwNSwyOSArMTEwNSwyNyBAQCBidHJfY3Vy
X2luc19sb2NrX2FuZF91bmRvKAogCQkJCQkgICAgIGJ0cl9jdXJfZ2V0X2Jsb2NrKGN1cnNvciks
CiAJCQkJCSAgICAgaW5kZXgsIHRociwgbXRyLCBpbmhlcml0KTsKIAotCWlmIChlcnIgIT0gREJf
U1VDQ0VTUykgeworCWlmIChlcnIgIT0gREJfU1VDQ0VTUworCSAgICB8fCAhZGljdF9pbmRleF9p
c19jbHVzdChpbmRleCkgfHwgZGljdF9pbmRleF9pc19pYnVmKGluZGV4KSkgewogCiAJCXJldHVy
bihlcnIpOwogCX0KIAotCWlmIChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSAmJiAhZGljdF9p
bmRleF9pc19pYnVmKGluZGV4KSkgewotCi0JCWVyciA9IHRyeF91bmRvX3JlcG9ydF9yb3dfb3Bl
cmF0aW9uKGZsYWdzLCBUUlhfVU5ET19JTlNFUlRfT1AsCi0JCQkJCQkgICAgdGhyLCBpbmRleCwg
ZW50cnksCi0JCQkJCQkgICAgTlVMTCwgMCwgTlVMTCwKLQkJCQkJCSAgICAmcm9sbF9wdHIpOwot
CQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKKwllcnIgPSB0cnhfdW5kb19yZXBvcnRfcm93X29w
ZXJhdGlvbihmbGFncywgVFJYX1VORE9fSU5TRVJUX09QLAorCQkJCQkgICAgdGhyLCBpbmRleCwg
ZW50cnksCisJCQkJCSAgICBOVUxMLCAwLCBOVUxMLAorCQkJCQkgICAgJnJvbGxfcHRyKTsKKwlp
ZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKIAotCQkJcmV0dXJuKGVycik7Ci0JCX0KKwkJcmV0dXJu
KGVycik7CisJfQogCi0JCS8qIE5vdyB3ZSBjYW4gZmlsbCBpbiB0aGUgcm9sbCBwdHIgZmllbGQg
aW4gZW50cnkgKi8KKwkvKiBOb3cgd2UgY2FuIGZpbGwgaW4gdGhlIHJvbGwgcHRyIGZpZWxkIGlu
IGVudHJ5ICovCiAKLQkJaWYgKCEoZmxhZ3MgJiBCVFJfS0VFUF9TWVNfRkxBRykpIHsKKwlpZiAo
IShmbGFncyAmIEJUUl9LRUVQX1NZU19GTEFHKSkgewogCi0JCQlyb3dfdXBkX2luZGV4X2VudHJ5
X3N5c19maWVsZChlbnRyeSwgaW5kZXgsCi0JCQkJCQkgICAgICBEQVRBX1JPTExfUFRSLCByb2xs
X3B0cik7Ci0JCX0KKwkJcm93X3VwZF9pbmRleF9lbnRyeV9zeXNfZmllbGQoZW50cnksIGluZGV4
LAorCQkJCQkgICAgICBEQVRBX1JPTExfUFRSLCByb2xsX3B0cik7CiAJfQogCiAJcmV0dXJuKERC
X1NVQ0NFU1MpOwpAQCAtMTkyMCw4ICsxOTE4LDggQEAgYnRyX2N1cl91cGRhdGVfaW5fcGxhY2Uo
CiAJCQkJICAgIHRyeCwgcm9sbF9wdHIsIG10cik7CiAKIAlpZiAod2FzX2RlbGV0ZV9tYXJrZWQK
LQkgICAgJiYgIXJlY19nZXRfZGVsZXRlZF9mbGFnKHJlYywgcGFnZV9pc19jb21wKAotCQkJCQkg
ICAgIGJ1Zl9ibG9ja19nZXRfZnJhbWUoYmxvY2spKSkpIHsKKwkgICAgJiYgIXJlY19nZXRfZGVs
ZXRlZF9mbGFnKAorCQkgICAgcmVjLCBwYWdlX2lzX2NvbXAoYnVmX2Jsb2NrX2dldF9mcmFtZShi
bG9jaykpKSkgewogCQkvKiBUaGUgbmV3IHVwZGF0ZWQgcmVjb3JkIG93bnMgaXRzIHBvc3NpYmxl
IGV4dGVybmFsbHkKIAkJc3RvcmVkIGZpZWxkcyAqLwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHVpbnMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MHVpbnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDA4MzM0OC03
OWltMnZ1bmNuM3FkN3UwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjAxMDQ3MjctdXR2a2hucTI0cXplMXVk
cgpAQCAtOTcsMTUgKzk3LDEyIEBAIHJvd191bmRvX2luc19yZW1vdmVfY2x1c3RfcmVjKAogCiAJ
YnRyX2N1ciA9IGJ0cl9wY3VyX2dldF9idHJfY3VyKCYobm9kZS0+cGN1cikpOwogCi0Jc3VjY2Vz
cyA9IGJ0cl9jdXJfb3B0aW1pc3RpY19kZWxldGUoYnRyX2N1ciwgJm10cik7Ci0KLQlidHJfcGN1
cl9jb21taXRfc3BlY2lmeV9tdHIoJihub2RlLT5wY3VyKSwgJm10cik7Ci0KLQlpZiAoc3VjY2Vz
cykgewotCQl0cnhfdW5kb19yZWNfcmVsZWFzZShub2RlLT50cngsIG5vZGUtPnVuZG9fbm8pOwot
Ci0JCXJldHVybihEQl9TVUNDRVNTKTsKKwlpZiAoYnRyX2N1cl9vcHRpbWlzdGljX2RlbGV0ZShi
dHJfY3VyLCAmbXRyKSkgeworCQllcnIgPSBEQl9TVUNDRVNTOworCQlnb3RvIGZ1bmNfZXhpdDsK
IAl9CisKKwlidHJfcGN1cl9jb21taXRfc3BlY2lmeV9tdHIoJm5vZGUtPnBjdXIsICZtdHIpOwog
cmV0cnk6CiAJLyogSWYgZGlkIG5vdCBzdWNjZWVkLCB0cnkgcGVzc2ltaXN0aWMgZGVzY2VudCB0
byB0cmVlICovCiAJbXRyX3N0YXJ0KCZtdHIpOwpAQCAtMTM1LDggKzEzMiw4IEBAIHJldHJ5Ogog
CQlnb3RvIHJldHJ5OwogCX0KIAotCWJ0cl9wY3VyX2NvbW1pdF9zcGVjaWZ5X210cigmKG5vZGUt
PnBjdXIpLCAmbXRyKTsKLQorZnVuY19leGl0OgorCWJ0cl9wY3VyX2NvbW1pdF9zcGVjaWZ5X210
cigmbm9kZS0+cGN1ciwgJm10cik7CiAJdHJ4X3VuZG9fcmVjX3JlbGVhc2Uobm9kZS0+dHJ4LCBu
b2RlLT51bmRvX25vKTsKIAogCXJldHVybihlcnIpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHVwZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDIwMDgzMzQ4LTc5aW0y
dnVuY24zcWQ3dTAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDIwMTA0NzI3LXV0dmtobnEyNHF6ZTF1ZHIKQEAg
LTIyMDUsOCArMjIwNSw3IEBAIGV4aXRfZnVuYzoKIAogCWlmIChub2RlLT5jbXBsX2luZm8gJiBV
UERfTk9ERV9OT19PUkRfQ0hBTkdFKSB7CiAKLQkJZXJyID0gcm93X3VwZF9jbHVzdF9yZWMobm9k
ZSwgaW5kZXgsIHRociwgbXRyKTsKLQkJcmV0dXJuKGVycik7CisJCXJldHVybihyb3dfdXBkX2Ns
dXN0X3JlYyhub2RlLCBpbmRleCwgdGhyLCBtdHIpKTsKIAl9CiAKIAlyb3dfdXBkX3N0b3JlX3Jv
dyhub2RlKTsKCg==

--===============0684823688==
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: b7668d0f0dbdbb988a5a1e15cd7e376adc90f593
# timestamp: 2011-04-20 13:48:25 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   79im2vuncn3qd7u0
# 
# Begin bundle
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
GaP8P6P8XckU4UJCvViLUA==


--===============0684823688==--