From: marko.makela
Date: January 30 2011 9:11pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3470 to 3471)
List-Archive: http://lists.mysql.com/commits/129983
Message-Id: <201101302111.p0UL6kGa012505@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0563070676=="

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

IDM0NzEgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0zMAogICAgICBDbGFyaWZ5IHRoZSBjb21tZW50
IG9mIHRyeF9zdGF0ZV9lcSgpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdHJ4MHRyeC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4
LmljCiAzNDcwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDEtMzAKICAgICAgUmVtb3ZlIGEgYm9ndXMg
c3RhdGVtZW50IHRoYXQgd2FzIGFjY2lkZW50YWxseSBhZGRlZCBpbgogICAgICBienIgcmV2aXNp
b24gaWQgbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjcxMTQ1MTUtM2hjc2huYmZpcTVx
cnlxNgogICAgICAKICAgICAgU3BvdHRlZCBieSBNaWNoYWVsIEl6aW91bXRjaGVua28uCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaCcKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDExMDEzMDIwMDUyOC0wOWZ5NTh6enI1djFpMXhtCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS90cngwdHJ4LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMzAy
MTExMTQtemgyMTg2bXQ2bjhxODhoOApAQCAtMzE5LDEzICszMTksMTcgQEAgdHJ4X3NldF9kaWN0
X29wZXJhdGlvbigKIERldGVybWluZXMgaWYgYSB0cmFuc2FjdGlvbiBpcyBpbiB0aGUgZ2l2ZW4g
c3RhdGUuCiBUaGUgY2FsbGVyIG11c3QgaG9sZCB0cnhfc3lzLT5sb2NrLCBvciBpdCBtdXN0IGJl
IHRoZSB0aHJlYWQKIHRoYXQgaXMgc2VydmluZyBhIHJ1bm5pbmcgdHJhbnNhY3Rpb24uCitBIHJ1
bm5pbmcgdHJhbnNhY3Rpb24gbXVzdCBiZSBpbiB0cnhfc3lzLT50cnhfbGlzdC4KIEByZXR1cm4J
VFJVRSBpZiB0cngtPnN0YXRlID09IHN0YXRlICovCiBVTklWX0lOTElORQogaWJvb2wKIHRyeF9z
dGF0ZV9lcSgKIC8qPT09PT09PT09Ki8KIAljb25zdCB0cnhfdCoJdHJ4LAkvKiE8IGluOiB0cmFu
c2FjdGlvbiAqLwotCXRyeF9zdGF0ZV90CXN0YXRlKQkvKiE8IGluOiBzdGF0ZSAqLworCXRyeF9z
dGF0ZV90CXN0YXRlKQkvKiE8IGluOiBzdGF0ZTsKKwkJCQlpZiBzdGF0ZSAhPSBUUlhfU1RBVEVf
Tk9UX1NUQVJURUQKKwkJCQlhc3NlcnRzIHRoYXQKKwkJCQl0cngtPnN0YXRlICE9IFRSWF9TVEFU
RV9OT1RfU1RBUlRFRCAqLwogCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jl
c3VsdCkpOwogIyBpZmRlZiBVTklWX0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5pYycKLS0tIGEvc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTAxMzAyMDA1MjgtMDlmeTU4enpyNXYxaTF4bQorKysgYi9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvdHJ4MHRyeC5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDEzMDIxMTExNC16aDIxODZtdDZuOHE4OGg4CkBAIC0yNywxMyArMjcsMTcgQEAgQ3JlYXRlZCAz
LzI2LzE5OTYgSGVpa2tpIFR1dXJpCiBEZXRlcm1pbmVzIGlmIGEgdHJhbnNhY3Rpb24gaXMgaW4g
dGhlIGdpdmVuIHN0YXRlLgogVGhlIGNhbGxlciBtdXN0IGhvbGQgdHJ4X3N5cy0+bG9jaywgb3Ig
aXQgbXVzdCBiZSB0aGUgdGhyZWFkCiB0aGF0IGlzIHNlcnZpbmcgYSBydW5uaW5nIHRyYW5zYWN0
aW9uLgorQSBydW5uaW5nIHRyYW5zYWN0aW9uIG11c3QgYmUgaW4gdHJ4X3N5cy0+dHJ4X2xpc3Qu
CiBAcmV0dXJuCVRSVUUgaWYgdHJ4LT5zdGF0ZSA9PSBzdGF0ZSAqLwogVU5JVl9JTkxJTkUKIGli
b29sCiB0cnhfc3RhdGVfZXEoCiAvKj09PT09PT09PSovCiAJY29uc3QgdHJ4X3QqCXRyeCwJLyoh
PCBpbjogdHJhbnNhY3Rpb24gKi8KLQl0cnhfc3RhdGVfdAlzdGF0ZSkJLyohPCBpbjogc3RhdGUg
Ki8KKwl0cnhfc3RhdGVfdAlzdGF0ZSkJLyohPCBpbjogc3RhdGU7CisJCQkJaWYgc3RhdGUgIT0g
VFJYX1NUQVRFX05PVF9TVEFSVEVECisJCQkJYXNzZXJ0cyB0aGF0CisJCQkJdHJ4LT5zdGF0ZSAh
PSBUUlhfU1RBVEVfTk9UX1NUQVJURUQgKi8KIHsKICNpZmRlZiBVTklWX0RFQlVHCiAJc3dpdGNo
ICh0cngtPnN0YXRlKSB7Cgo=

--===============0563070676==
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: 8246aa4b5d0a570c5861245aaadbc63d496e48bb
# timestamp: 2011-01-30 23:11:39 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   09fy58zzr5v1i1xm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZxpdjIAAoFflEAwcnP//38D
nEC////wBAAIAFAEtnksomq66tldt04RUU0m0amh6mnoah6j1NqZBoAAAGmgSUIaaNNA0g0mmoPS
DTRoAA0ABIpoUMiepk1MIY0EaYjATanqYj9UYDmATATIwAjExMJhMENMTTASSCE2k0xT0yDQKant
TUbyQ0BGaaIxJANAThQO4ad81HEye7jmTG/Pt9tQ/o1fiqOGPHJCmOVI3U5y7AnnNwuN4bbYfvvW
1PA4xSMbJvM6FMpFIl6/DjCwuWr00wchrmYwf2SOY1HMQF5b4FMx6jvDuO3Iaww2nLdigeyMRTB9
5OI9OZAerBN5oUvIVQvyYEwr9vHs1YAQNNT7hL01C4iWs6FZnLsmIhFjF9nxv6CDdFAlNIb/mVWi
gykdarYhqpORMWUUgLVaxvgg4WkYtF5ycutUDIhMCQEusZ6JwJNvjbfKKR2B70/8U0VQ+AtAej2u
QdmNREYKGbP2t7lpnZknX1IVJQBJsTwgbnPm1l5fwLudkKa8U+6moIF5EUN2bUcDyMYz3iLh8m1R
LmSekVrRPApbg1rUEQdYKFOxyyuFWYF+NJZd8AGdmbGEZ7dKFkSbA6yQ4xWGAqSrSL+WRGNNWdOi
2FlxOOxGMzJkBeBSLxWivOzarirGGDOWWNMS03TNRPaTmGJYLPJlWBWB5QKB/KWQrB+034Wi4awr
IZi20J54k3fOcSxlBwUiebhRLSOxMte66lBA2moBxmtjdQbDXiFjATcwLlnqMshN2PFbrdOaC6oz
GUsVpK6FNmR49qbpaKyFWQPA6LCjBheYUj4nvWLg34BEqLB7zLtOuQaBbBLOeYDUMyZvVoYRMCoi
ev/g8g/IVCALwLwmFQvB4SCcPwFWAxpZHifHnEHogWQFacTYLkcd5wLtdgunt6BZznuaM5JbSwXp
xGKRsmW/olF7DGRKEhuucV1uodeeA1+BPiK/qdp0Md8f5AYoFVuEwomAnwFT/LIasYJNF6hK6vbS
Wy4ycaZF49hdcGYGcjxv6ikTmBcKn2i4KmnILuBIkKA8A3eVu93OdB1dBA6h5voKGNbaWoaWy6dB
jyXTocrmZ6wrrhJ9xPNWXM+TAOunDgyVQKrpKltI2iqUcoYIY4ixtUy8ztOZp1OOZNSoHIWS3aQM
gHaRXnc0n1iebllqz1Jzu7ahp+81qbEUDSj8i4IrkU+ey6OYuRKtMpXIR0006ww3BfzElCtIZ5km
tCGmsvCwCgpu6UTCo7hLeJYI/s/xMO12rxM42MbB1JGC9IGgrQYyAJElB96zSJtbO/uGcCcqmZKG
DVVavDqT38IBcXNIfIuRLzniz0XqIEAi2rc8mxq/HoA8L4qxUpB0rIpU8dCo5RAKFO/RFQgKYZCG
ruaSGbDm+LRi1tN2aGlYddd5oVDrztPwNIKImChZysY1APecggCeA5lXQHNk+/dIuMyKVONAXU9g
vA72GuJ7hiSzBfhYLjECu84KhYo76oRxKESwsaeE2ca+QFeBcK9i7T7i7kinChITjS7GQA==


--===============0563070676==--