From: marko.makela
Date: June 3 2010 9:46am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3498)
List-Archive: http://lists.mysql.com/commits/110081
Message-Id: <201006031036.o53AaTSO029307@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1710275083=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMzA5NDUzNC1pd280
c3ZmMzZpNDByeXVhCgogMzQ5OCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAzCiAgICAgIFNvdXJj
ZSBoYXZlX2lubm9kYl9wbHVnaW4uaW5jIGluIHRoZSBwbHVnaW4gdGVzdHMuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1MzU5
Mi50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9tdWx0
aV91cGRhdGUudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJf
cGx1Z2luL3QvaW5ub2RiX2J1ZzUzNTkyLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2lubm9kYl9idWc1MzU5Mi50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNjAzMDk0NTM0LWl3bzRzdmYzNmk0MHJ5dWEKKysrIGIvbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzUzNTkyLnRlc3QJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMDA2MDMwOTQ2MzctNDE2Z215cHltZ3N0ajJsbApAQCAtMiw3ICsy
LDcgQEAKICMgdGFibGUgYWZ0ZXIgZmFzdCBhbHRlciB0YWJsZSBhZGRlZCB1bmlxdWUga2V5Ii4g
VGhlIGZpeCBpcyB0byBtYWtlCiAjIHN1cmUgaW5kZXggbnVtYmVyIGxvb2t1cCBzaG91bGQgZ28g
dGhyb3VnaCAiaW5kZXggdHJhbnNsYXRpb24gdGFibGUiLgogCi0tLXNvdXJjZSBpbmNsdWRlL2hh
dmVfaW5ub2RiLmluYworLS1zb3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYl9wbHVnaW4uaW5jCiAK
ICMgVXNlIEZJQyBmb3IgaW5kZXggY3JlYXRpb24KIHNldCBvbGRfYWx0ZXJfdGFibGU9MDsKCj09
PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJf
bXVsdGlfdXBkYXRlLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90
L2lubm9kYl9tdWx0aV91cGRhdGUudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDYwMzA5NDUzNC1pd280c3ZmMzZpNDByeXVhCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2lubm9kYl9tdWx0aV91cGRhdGUudGVzdAlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMDYwMzA5NDYzNy00MTZnbXlweW1nc3RqMmxsCkBAIC0xLDQgKzEsNCBA
QAotLS0gc291cmNlIGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCistLSBzb3VyY2UgaW5jbHVkZS9o
YXZlX2lubm9kYl9wbHVnaW4uaW5jCiAKICMKICMgVGVzdCBtdWx0aSB1cGRhdGUgd2l0aCBkaWZm
ZXJlbnQgam9pbiBtZXRob2RzCgo=

--===============1710275083==
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.1-innodb/
# testament_sha1: 81d0706738a4fd2cf2ecb966dfccb518d4727d5d
# timestamp: 2010-06-03 12:46:50 +0300
# base_revision_id: marko.makela@stripped\
#   iwo4svf36i40ryua
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbVINhwAAghflAAQUGP/91IC
CAC////wBAAIAFAEWeVrW47DumdrbIJJEKeaTTUz0IZGp6MpPE1Bo0yBKRGpmTDRFDTI0A0AANAk
Smg0T0FPKIaG9SaZinqDIGgxoaGgAyGgAAAAAkkRpM0mJowmKnk9T1Taho8oyBse7sT6UOZrpnJG
2uW1Eiu2K06VREsil7BvpyR5yLAdrhw8Cr104n1/sc6QYnoyGu3OAetKGYzL2DX6g9hGT43n29Wa
0cdDxvGBVfIRqNbLwtXfGvYwI3xeJe1K0QqpGKLx5iQkeVSgV93OSDcxi5IIkoN0jKrIrTUiShQw
VjMq3MzPkkRJlzDlp2olIlECZeGLLixD2Qw4OdO5IKCllt53nJ9s7ytpdtEhAtmumiHsveFFBuMr
AHG+zPZOaiXaRidDcSFChgkGZTUWnIsnMVecNWWVVb0Vtly9z2A6sTrSMaVDHCoj3kKo1VANTOvT
rjDBxha74TSHAtYwQ0hOAziUgo5uHvSLB5VAsV51IeSasm340alCQcg1rJW4wpuuqJQ83xje+xMl
vJz6vsMcCyIZpetyrmBc6hPRS1gnWZLiuAVNDWdUrwFHwwLGUBzGcb64kClAdqMDvoNnkx7HGFlK
DRhljGJKhoRMxhFH6n3og6tB5gsCJkNUsGhiX0nbAsa7LXXbNHCSugHc7FNF03xXZb5bEPMfwHLP
7nW7FgVM7MmZv07lU2CeatY4B4u3WQM1aXFVpMJ9LFpJxQqelx29RLz+y2PRuQtkSMmcYJe86S1J
rFnzHkhjlE25dKjcc8IINIDECjOX4YzJ/hcy80E08DUOL1jlNjFr3CTzwJa93c19jppecCqkJgbj
xkRA1XqC6nIt6SqaFxYrvmPEm0HE/kXO67rT3m8sbJa0bI/EggvRau6VWLsmRk5nT8NPUROtKowM
bqNdNMZAZlMjk5D4GXMiuBTeamPUJl2K1i/3Nj7mbHpsN49FL2NRPCJWBTgBzyG5i8FcmdeB+CKM
pSpchynI2d0NJxW0TjvX2Zl1TjRFdZ4sZmKlV/Mbp9yNEcTCdSGkQJvYmo5L0Qv3WjAS+SlLYKIi
EBLxJiTCXqX7pavXzLIVx0D4nDkJdELiGhomHZ2rY7FpLyPQDL675IQWShYBUQUzJ4DXgVKbSqcd
8AuILUUMGvLxEt1WC18D3JLyR4kPkS9UQXFyrj9aF1m9hg9E9eUnBQlmwA4TjjnjiMRSDSdSpT7b
15ls9cwlfFSyWQkDsfpQNK6TGdzvO1DLQ6ZWbExe0CaIVpHotKBvDOYVVKMS3iFOQwbs2qXfwL0L
BVuJQEF+5muqZmmCBL0VyfFb1FPXEVxQb1EkRURbDw449zMCAEBiVfSuKog8/5T/PgXckU4UJC1S
DYcA


--===============1710275083==--