From: marko.makela
Date: January 27 2011 8:21am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3461 to 3463)
List-Archive: http://lists.mysql.com/commits/129727
Message-Id: <201101270821.p0R8Eiqh004377@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0100310442=="

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

IDM0NjMgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMKIDM0NjIgTWFya28gTcOka2Vsw6QJMjAx
MS0wMS0yNwogICAgICBsb2NrX3VubG9ja190YWJsZV9hdXRvaW5jKCk6IFJlbGF4IGEgZGVidWcg
YXNzZXJ0aW9uIHRoYXQgd2FzIGFkZGVkIGluCiAgICAgIGJ6ciByZXZpc2lvbi1pZCBtYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTExMjcwNS1jMTZzbXFseXYyYXpqcGF1LgogICAgICBU
aGlzIGZ1bmN0aW9uIGNhbiBiZSBjYWxsZWQgZm9yIFhBIFBSRVBBUkVEIHRyYW5zYWN0aW9ucywg
YWZ0ZXIgYWxsLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9j
azBsb2NrLmMKIDM0NjEgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNiBbbWVyZ2VdCiAgICAgIE1l
cmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9pYnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI2
MDgxMDI4LXYzcnVibGY5ZTlkdGVkbTAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYw
aWJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI3MDgxOTA2LTdoY2Rx
ZmF2Z3V6NzFzcHEKQEAgLTI1ODUsMjMgKzI1ODUsNiBAQCBpYnVmX2NvbnRyYWN0X2V4dCgKIAog
CWlmIChVTklWX1VOTElLRUxZKGlidWYtPmVtcHR5KQogCSAgICAmJiBVTklWX0xJS0VMWSghc3J2
X3NodXRkb3duX3N0YXRlKSkgewotaWJ1Zl9pc19lbXB0eToKLQotI2lmIDAgLyogVE9ETyAqLwot
CQlpZiAoc3J2X3NodXRkb3duX3N0YXRlKSB7Ci0JCQkvKiBJZiB0aGUgaW5zZXJ0IGJ1ZmZlciBi
ZWNvbWVzIGVtcHR5IGR1cmluZwotCQkJc2h1dGRvd24sIG5vdGUgaXQgaW4gdGhlIHN5c3RlbSB0
YWJsZXNwYWNlLiAqLwotCi0JCQl0cnhfc3lzX3NldF9pYnVmX2Zvcm1hdChUUlhfU1lTX0lCVUZf
RU1QVFkpOwotCQl9Ci0KLQkJLyogVE8gRE86IGNhbGwgdHJ4X3N5c19zZXRfaWJ1Zl9mb3JtYXQo
KSBhdCBzdGFydHVwCi0JCWFuZCB3aGVuZXZlciBpYnVmX3VzZSBpcyBjaGFuZ2VkIHRvIGFsbG93
IGJ1ZmZlcmVkCi0JCWRlbGV0ZS1tYXJraW5nIG9yIGRlbGV0aW5nLiAgTmV2ZXIgZG93bmdyYWRl
IHRoZQotCQlzdGFtcGVkIGZvcm1hdCBleGNlcHQgd2hlbiB0aGUgaW5zZXJ0IGJ1ZmZlciBiZWNv
bWVzCi0JCWVtcHR5LiAqLwotI2VuZGlmCi0KIAkJcmV0dXJuKDApOwogCX0KIApAQCAtMjYzMSw3
ICsyNjE0LDcgQEAgaWJ1Zl9pc19lbXB0eToKIAkJbXRyX2NvbW1pdCgmbXRyKTsKIAkJYnRyX3Bj
dXJfY2xvc2UoJnBjdXIpOwogCi0JCWdvdG8gaWJ1Zl9pc19lbXB0eTsKKwkJcmV0dXJuKDApOwog
CX0KIAogCXN1bV9zaXplcyA9IGlidWZfZ2V0X21lcmdlX3BhZ2Vfbm9zKFRSVUUsIGJ0cl9wY3Vy
X2dldF9yZWMoJnBjdXIpLAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9j
ay9sb2NrMGxvY2suYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI2MDgxMDI4LXYzcnVibGY5ZTlkdGVk
bTAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwMTI3MDgxOTA2LTdoY2RxZmF2Z3V6NzFzcHEKQEAgLTYxMjEs
OCArNjEyMSwxMCBAQCBsb2NrX3VubG9ja190YWJsZV9hdXRvaW5jKAogCXV0X2FkKCFsb2NrX211
dGV4X293bigpKTsKIAl1dF9hZCghdHJ4X211dGV4X293bih0cngpKTsKIAl1dF9hZCghdHJ4LT5s
b2NrLndhaXRfbG9jayk7CisJLyogVGhpcyBjYW4gYmUgaW52b2tlZCBvbiBOT1RfU1RBUlRFRCwg
QUNUSVZFLCBQUkVQQVJFRCwKKwlidXQgbm90IENPTU1JVFRFRCB0cmFuc2FjdGlvbnMuICovCiAJ
dXRfYWQodHJ4X3N0YXRlX2VxKHRyeCwgVFJYX1NUQVRFX05PVF9TVEFSVEVEKQotCSAgICAgIHx8
IHRyeF9zdGF0ZV9lcSh0cngsIFRSWF9TVEFURV9BQ1RJVkUpKTsKKwkgICAgICB8fCAhdHJ4X3N0
YXRlX2VxKHRyeCwgVFJYX1NUQVRFX0NPTU1JVFRFRF9JTl9NRU1PUlkpKTsKIAogCS8qIFRoaXMg
ZnVuY3Rpb24gaXMgaW52b2tlZCBmb3IgYSBydW5uaW5nIHRyYW5zYWN0aW9uIGJ5IHRoZQogCXRo
cmVhZCB0aGF0IGlzIHNlcnZpbmcgdGhlIHRyYW5zYWN0aW9uLiBUaGVyZWZvcmUgaXQgaXMgbm90
Cgo=

--===============0100310442==
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: 9f6a5b7cdf715e6c3c9d03b0925b4c24e6acccb7
# timestamp: 2011-01-27 10:21:22 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   v3rublf9e9dtedm0
# 
# Begin bundle
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


--===============0100310442==--