From: marko.makela
Date: April 20 2011 8:29am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3367)
List-Archive: http://lists.mysql.com/commits/135772
Message-Id: <201104200829.p3K8Te0f023414@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2100892662=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDA3MTA1NC04MzJ2
dTdtbGFjamZ6OWhtCgogMzM2NyBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTIwCiAgICAgIENsYXJp
ZnkgYSBjb21tZW50LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9i
dHIwY3VyLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIu
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTEwNDIwMDcxMDU0LTgzMnZ1N21sYWNqZno5aG0KKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwNDIwMDgyOTEwLXlkdzZheWQyN2w5OHYwdXkKQEAgLTI0MjksOCArMjQyOSw4IEBAIG1ha2Vf
ZXh0ZXJuYWw6CiAJcmVjb3JkIG9uIGl0cyBwYWdlPyAqLwogCXdhc19maXJzdCA9IHBhZ2VfY3Vy
X2lzX2JlZm9yZV9maXJzdChwYWdlX2N1cnNvcik7CiAKLQkvKiBUaGUgZmlyc3QgcGFyYW1ldGVy
IG1lYW5zIHRoYXQgbm8gbG9jayBjaGVja2luZyBhbmQgdW5kbyBsb2dnaW5nCi0JaXMgbWFkZSBp
biB0aGUgaW5zZXJ0ICovCisJLyogTG9jayBjaGVja3MgYW5kIHVuZG8gbG9nZ2luZyB3ZXJlIGFs
cmVhZHkgcGVyZm9ybWVkIGJ5CisJYnRyX2N1cl91cGRfbG9ja19hbmRfdW5kbygpLiAqLwogCiAJ
ZXJyID0gYnRyX2N1cl9wZXNzaW1pc3RpY19pbnNlcnQoQlRSX05PX1VORE9fTE9HX0ZMQUcKIAkJ
CQkJIHwgQlRSX05PX0xPQ0tJTkdfRkxBRwoK

--===============2100892662==
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.5-innodb/
# testament_sha1: 7594fbb1396be80da748fd137e4fee2c2cb383d8
# timestamp: 2011-04-20 11:29:24 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   832vu7mlacjfz9hm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSOsxGQAAYTflAAwUnP/91sG
AAC////wBAAIAFADfXgAFAGGo0FDyj1HqZBoND0j1A0ANADAAAAAaAAAAADAAAAAaAAAAABqp+mq
aAaYR6T1GIxMQMT1A0MBJIETACZGkwTRpNT9RPJpMMp6ggz/Tt0kuZgbFawlw9AANSGEGaDS5meI
iC6B8w4zzmGhKEfZnv31U9KUkpK31HScBPOiULdWREwI5mGUGZ3wnf91+RHsui+inTcOGH4vxF0a
DXrakTYJHd5asKnTPFxSanyEXMI0UbG5sgk5ykoLB7hRf1aDJleuBJ/mvcVZSy57RdphFS68/0Vv
rEOe5W+jscMtdbR6qY/dEb7dnqndqtMpzIrZeJlqMc9ks0G4Q+/PA0gr9BOfquFWtMYBT1b0RjKb
ChT3jh0n9xUnFtrjJXjib7GxUWJt8XYsT1oHDldJiyNVMxYQzVmmyUzYfGGpbw1vetaPoi9T3tTN
ExqxuzT77bVcKAWv/llV6p2WkVd3JlXQoGZgL4VM0S21Q2KbHK8iKKaeU9TV2ihQmFeyjRlImFqL
HFNA05L5VBTEsYlJ2qDRtRseRcmmaJOE07VL2Nf9ZUYjvJ3Ln9q1ySJilhj9c3xRW9vDpbKxgs9v
SI+U8AvXHgkb5hy850ik6VPDWkfSu22L/jOlFXxQJcxeHgsSc5dDcx392Q5T+AbVNuJvdHf6Z9ug
Mcak1NmtPxUCCscm85uHGrNfdnupekVpEcPNcZGrQw7/UWFkljJOeuboFJdrXZd0TFynJzVPUKUI
GBtHfHJ8S4RKW/EiYwDXZaFIr5aJ1MmWd16RbT3fJDaCtob8Jk2/LL793Jt+o1BJOnWRnw13973k
c16bTjYe/Tx3sVYNL2UZ0eHfgbAnd48lWuOhYVS6poaEcU8w5BRbP+8ro3hzDhuf1+c0a03k2iR8
bAzBQ2hQFDj1EyFWv94zJDFN/1q0hT408kjskbA/J6jO3a1mUudjG8drVJNEi8LYDwa8g83vTttw
nMmXPl3jJHznNe7RCnD6wPdI8QpD6uV2WOtmWDx8JQjh5ZalFMoJnTJLtC+SJ+VJE5RQpwofVGEE
yzd3woWk+QNJaSJIp2jN4FDTWF0rNmonDUsEmeoOVnVWbKrpk1G4Owv4KlXYh7KysVXtFX7i66Z4
5m1i2CfFPoJ/+DP28XckU4UJAjrMRkA=


--===============2100892662==--