From: marko.makela
Date: May 12 2010 11:19am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3091)
List-Archive: http://lists.mysql.com/commits/108111
Message-Id: <201005121119.o4CAFq92000819@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0917419465=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUxMjA5MTM1MC1pZGJ6dzJp
aGRxbGdrZmNoCgogMzA5MSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTEyCiAgICAgIE1lcmdlIGZy
b20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgcmV2bm86IDM0
NjIKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIx
MDQyMTItZTJoOW4xb2J4amI4dGZnNAogICAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA1MTIwNjA5MjItb2g3MTZ1Z3B1a2Zha3d2aAogICAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICAgIGJyYW5jaCBu
aWNrOiBteXNxbC01LjEtaW5ub2RiCiAgICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wNS0xMiAx
Mzo0MjoxMiArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICBoYV9pbm5vYmFzZTo6YWRk
X2luZGV4KCk6IFJlc2V0IHRyeC0+ZXJyb3Jfc3RhdGUgaW4gZXJyb3IgaGFuZGxpbmcuCiAgICAg
ICAgICAoQnVnICM1MzU5MSkKCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvci9pbm5vZGJfYnVnNTM1OTEucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzUzNTkxLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTM1OTEucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1
aXRlL2lubm9kYi9yL2lubm9kYl9idWc1MzU5MS5yZXN1bHQJMTk3MC0wMS0wMSAwMDowMDowMCAr
MDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYl9idWc1MzU5MS5yZXN1
bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMTE5MjYtamF6OTQ3eWZp
cDFleHhpeApAQCAtMCwwICsxLDE2IEBACitTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdD0n
QmFycmFjdWRhJzsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlPW9uOworc2V0IG9s
ZF9hbHRlcl90YWJsZT0wOworQ1JFQVRFIFRBQkxFIGJ1ZzUzNTkxKGEgdGV4dCBjaGFyc2V0IHV0
Zjggbm90IG51bGwpCitFTkdJTkU9SW5ub0RCIEtFWV9CTE9DS19TSVpFPTE7CitBTFRFUiBUQUJM
RSBidWc1MzU5MSBBREQgUFJJTUFSWSBLRVkoYSgyMjApKTsKK0VSUk9SIEhZMDAwOiBUb28gYmln
IHJvdworU0hPVyBXQVJOSU5HUzsKK0xldmVsCUNvZGUJTWVzc2FnZQorRXJyb3IJMTM5CVRvbyBi
aWcgcm93CitFcnJvcgkxMTE4CVJvdyBzaXplIHRvbyBsYXJnZS4gVGhlIG1heGltdW0gcm93IHNp
emUgZm9yIHRoZSB1c2VkIHRhYmxlIHR5cGUsIG5vdCBjb3VudGluZyBCTE9CcywgaXMgODEyNi4g
WW91IGhhdmUgdG8gY2hhbmdlIHNvbWUgY29sdW1ucyB0byBURVhUIG9yIEJMT0JzCitFcnJvcgkx
MDMwCUdvdCBlcnJvciAxMzkgZnJvbSBzdG9yYWdlIGVuZ2luZQorRFJPUCBUQUJMRSBidWc1MzU5
MTsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PUFudGVsb3BlOworU0VUIEdMT0JBTCBp
bm5vZGJfZmlsZV9mb3JtYXRfY2hlY2s9QW50ZWxvcGU7CitTRVQgR0xPQkFMIGlubm9kYl9maWxl
X3Blcl90YWJsZT0wOwoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Qv
aW5ub2RiX2J1ZzUzNTkxLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5u
b2RiX2J1ZzUzNTkxLnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10
ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1MzU5MS50ZXN0CXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNTEyMTExOTI2LWphejk0N3lmaXAxZXh4aXgKQEAgLTAsMCArMSwy
MiBAQAorLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCisKK2xldCAkZmlsZV9mb3Jt
YXQ9YHNlbGVjdCBAQGlubm9kYl9maWxlX2Zvcm1hdGA7CitsZXQgJGZpbGVfZm9ybWF0X2NoZWNr
PWBzZWxlY3QgQEBpbm5vZGJfZmlsZV9mb3JtYXRfY2hlY2tgOworbGV0ICRmaWxlX3Blcl90YWJs
ZT1gc2VsZWN0IEBAaW5ub2RiX2ZpbGVfcGVyX3RhYmxlYDsKKworU0VUIEdMT0JBTCBpbm5vZGJf
ZmlsZV9mb3JtYXQ9J0JhcnJhY3VkYSc7CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJs
ZT1vbjsKKworc2V0IG9sZF9hbHRlcl90YWJsZT0wOworCitDUkVBVEUgVEFCTEUgYnVnNTM1OTEo
YSB0ZXh0IGNoYXJzZXQgdXRmOCBub3QgbnVsbCkKK0VOR0lORT1Jbm5vREIgS0VZX0JMT0NLX1NJ
WkU9MTsKKy0tIGVycm9yIDEzOQorQUxURVIgVEFCTEUgYnVnNTM1OTEgQUREIFBSSU1BUlkgS0VZ
KGEoMjIwKSk7CitTSE9XIFdBUk5JTkdTOworCitEUk9QIFRBQkxFIGJ1ZzUzNTkxOworCitFVkFM
IFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSRmaWxlX2Zvcm1hdDsKK0VWQUwgU0VUIEdM
T0JBTCBpbm5vZGJfZmlsZV9mb3JtYXRfY2hlY2s9JGZpbGVfZm9ybWF0X2NoZWNrOworRVZBTCBT
RVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT0kZmlsZV9wZXJfdGFibGU7Cgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOnZhc2ls
LmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MTIwOTEzNTAtaWRiencyaWhkcWxna2ZjaAorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDUxMjExMTkyNi1qYXo5NDd5ZmlwMWV4eGl4CkBAIC04OTYsNiAr
ODk2LDggQEAgZXJyb3I6CiAJCXByZWJ1aWx0LT50cngtPmVycm9yX2luZm8gPSBOVUxMOwogCQkv
KiBmYWxsIHRocm91Z2ggKi8KIAlkZWZhdWx0OgorCQl0cngtPmVycm9yX3N0YXRlID0gREJfU1VD
Q0VTUzsKKwogCQlpZiAobmV3X3ByaW1hcnkpIHsKIAkJCWlmIChpbmRleGVkX3RhYmxlICE9IGlu
bm9kYl90YWJsZSkgewogCQkJCXJvd19tZXJnZV9kcm9wX3RhYmxlKHRyeCwgaW5kZXhlZF90YWJs
ZSk7Cgo=

--===============0917419465==
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/mysql/5.5-innodb/
# testament_sha1: d18918d7d045f67f8dd90b9c3bc2ed24f0933aee
# timestamp: 2010-05-12 14:19:36 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   idbzw2ihdqlgkfch
# 
# Begin bundle
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


--===============0917419465==--