From: marko.makela
Date: May 17 2011 12:26pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3629 to 3630)
List-Archive: http://lists.mysql.com/commits/137639
Message-Id: <201105171226.p4HCQlCQ001458@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2038149145=="

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

IDM2MzAgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0xNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMKIDM2MjkgTWFya28gTcOka2Vsw6QJMjAxMS0w
NS0xNwogICAgICBCdWcjMTI1NjEzMDMgSW5ub0RCIGZpbGUgQVBJIHVzZXMgdHdvIHBhcmFtZXRl
cnMgZm9yIGZpbGUgc2l6ZQogICAgICAKICAgICAgRGVmaW5lIG9zX29mZnNldF90IGFzIGliX3Vp
bnQ2NF90LiBQcmV2aW91c2x5LCBmaWxlIG9mZnNldHMgd2VyZQogICAgICBkZWZpbmVkIGFzIGli
X2ludDY0X3Qgb3IgcGFpcnMgb2YgdWxpbnQuCiAgICAgIAogICAgICBvc19haW8oKSwgb3NfZmls
ZV9yZWFkKCksIG9zX2ZpbGVfd3JpdGUoKSwgb3NfZmlsZV9yZWFkX25vX2Vycm9yX2hhbmRsaW5n
KCk6CiAgICAgIFJlcGxhY2Ugb2Zmc2V0X2xvdyxvZmZzZXRfaGlnaCB3aXRoIG9mZnNldC4KICAg
ICAgCiAgICAgIG9zX2ZpbGVfZ2V0X3NpemUoKTogUmV0dXJuIHRoZSBmaWxlIHNpemUgb3IgLTEg
b24gZXJyb3IuIENoZWNrIHRoZQogICAgICByZXR1cm4gdmFsdWUgaW4gY2FsbGVycy4KICAgICAg
CiAgICAgIG9zX2ZpbGVfZ2V0X3NpemVfYXNfaWJsb25nbG9uZygpOiBSZW1vdmU7IHJlcGxhY2Vk
IGJ5IG9zX2ZpbGVfZ2V0X3NpemUoKS4KICAgICAgCiAgICAgIHV0X2dldF9oaWdoMzIoKTogUmVt
b3ZlLgogICAgICAKICAgICAgcmI6NjYyIGFwcHJvdmVkIGJ5IFN1bm55IEJhaW5zCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwogICAgICBzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvb3MwZmlsZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9vczBmaWxlLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1dC5oCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzByZWN2LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9v
cy9vczBmaWxlLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS91
dC91dDB1dC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmls
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDUxNzExNDIxMC1lN2RmeDl6MzZyMnR1bXp6CisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDUxNzEyMjUwMS0ybmljOHpkZWtueDVxa2M0CkBAIC04NTIsNyArODUyLDggQEAgZmlsX25v
ZGVfY2xvc2VfZmlsZSgKIAl1dF9hKG5vZGUtPm5fcGVuZGluZyA9PSAwKTsKIAl1dF9hKG5vZGUt
Pm5fcGVuZGluZ19mbHVzaGVzID09IDApOwogCXV0X2EoIW5vZGUtPmJlaW5nX2V4dGVuZGVkKTsK
LQl1dF9hKG5vZGUtPm1vZGlmaWNhdGlvbl9jb3VudGVyID09IG5vZGUtPmZsdXNoX2NvdW50ZXIp
OworCXV0X2Eobm9kZS0+bW9kaWZpY2F0aW9uX2NvdW50ZXIgPT0gbm9kZS0+Zmx1c2hfY291bnRl
cgorCSAgICAgfHwgc3J2X2Zhc3Rfc2h1dGRvd24gPT0gMik7CiAKIAlyZXQgPSBvc19maWxlX2Ns
b3NlKG5vZGUtPmhhbmRsZSk7CiAJdXRfYShyZXQpOwoK

--===============2038149145==
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: 32cbb7e2b5aa4922edadeeac008536e8fc04ff26
# timestamp: 2011-05-17 15:26:42 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   e7dfx9z36r2tumzz
# 
# Begin bundle
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


--===============2038149145==--