From: marko.makela
Date: June 10 2010 12:56pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3507) Bug#38999
List-Archive: http://lists.mysql.com/commits/110717
X-Bug: 38999
Message-Id: <201006101256.o5ACtqwe008731@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0605487976=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzZXJnZXkuZ2x1a2hvdkBzdW4uY29tLTIwMTAwNjA5MTIxNzE4LTA0bXBr
NWtqeHZucnhkdTgKCiAzNTA3IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMTAKICAgICAgQnVnICMz
ODk5OTogUmUtZW5hYmxlIGlubm9kYl9tdWx0aV91cGRhdGUudGVzdAoKICAgIG1vZGlmaWVkOgog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZgogICAgICBteXNxbC10
ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9kaXNhYmxlZC5kZWYKPT09IG1vZGlmaWVkIGZpbGUg
J215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmJwotLS0gYS9teXNxbC10ZXN0
L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZglyZXZpZDpzZXJnZXkuZ2x1a2hvdkBzdW4uY29t
LTIwMTAwNjA5MTIxNzE4LTA0bXBrNWtqeHZucnhkdTgKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvdC9kaXNhYmxlZC5kZWYJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MTAxMjU2MjMtYXI2cWY0dzJwdjJrcjdtYgpAQCAtOSw0ICs5LDMgQEAKICMgIERvIG5vdCB1c2Ug
YW55IFRBQiBjaGFyYWN0ZXJzIGZvciB3aGl0ZXNwYWNlLgogIwogIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjCi1pbm5vZGJfbXVsdGlfdXBkYXRlOiBCdWcgIzM4OTk5IDIwMTAtMDUtMDUgbW1ha2VsYSBW
YWxncmluZCB3YXJuaW5ncwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2Rpc2FibGVkLmRlZicKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJf
cGx1Z2luL3QvZGlzYWJsZWQuZGVmCXJldmlkOnNlcmdleS5nbHVraG92QHN1bi5jb20tMjAxMDA2
MDkxMjE3MTgtMDRtcGs1a2p4dm5yeGR1OAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9w
bHVnaW4vdC9kaXNhYmxlZC5kZWYJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MTAxMjU2MjMtYXI2cWY0dzJwdjJrcjdtYgpAQCAtOSw0ICs5LDMgQEAKICMgIERvIG5vdCB1c2Ug
YW55IFRBQiBjaGFyYWN0ZXJzIGZvciB3aGl0ZXNwYWNlLgogIwogIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjCi1pbm5vZGJfbXVsdGlfdXBkYXRlOiBCdWcgIzM4OTk5IDIwMTAtMDUtMDUgbW1ha2VsYSBW
YWxncmluZCB3YXJuaW5ncwoK

--===============0605487976==
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: 8036c85b192780166a5ddd20ee94ff9fcd21c2da
# timestamp: 2010-06-10 15:56:42 +0300
# base_revision_id: sergey.glukhov@stripped\
#   04mpk5kjxvnrxdu8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVj9l6IAAfPflAAQWGP/91IC
EAC////wBAAIAFAEGtniTbuKRaS4SSKaB6KehNNkxR6AZJ5QaGJhKRTTTyn6kaNMjINDTQAAAEkm
QgU8mKT0j1HqfqelHqaHqAADAADQABk0AAAaASSER6CBiYRlMp4hknogyeprjiu2w536SRe1RGZw
Ja6Sr7a4m5YMwx28l9ooxlcziM756rC7tzfKdGQVkhcOdJrMZwTmSKikIYhkOC1bOrBgJRkdMA+d
8FZzuS2NYsiqKjEC8I5J0h9DQpOC/lRBk3mkIHvMu5xBAiYz2MSU/YnDIGSLp6vZIIciEMoJO/ze
RUwUjCSdXGbpe4QTAb2pDLH4LX9ikfB2xTATNIPq2KGYqCK43B+pLVrn3VsuN5Qag1RCrHwVUEcE
gZPDQgZwG5r3vWiCKwa+f5+gP8BElNQGTxz8UQlJyZa5G/aemnXMIwNijbjOd7HHz4+BGwZ2OMeL
FjMQRzsZxnCTHBQrasMseAD28d6ARf4o9dAIEQpmDaUq36JwryUHUaFJ50vQPiBv47Jdu7bsspCG
0GDnqApI3Bc2aAUQmmCaUiB4HkUUbIxFateNsgUtjV9QtoGshliColjSN6IwoGk0AUuM+JkeATCn
qyphF6wZaTe9p4Lk6rIGrNSZWIrY1yptlMgxMWjLf9GyhI5LEQZmZm/KntIOISDkT+OsA9eTxS1h
oC/FItDtTQL29Eibtvkgi1I1ZzXDHT5gUJfMULFubIcxpDIwNaJPIGl50JS5I5YBvCPNwNAhkGIY
el+FLeTkj1EtNi8MLXk42BGyAYQZ6Kb1AUb1QWMzYbli4q87OSOLFl2j25dMEV7uAdTkdCahzqCZ
E80gUTkomLMJs8BuPQWEj6ZWP6xWC69l3TBhbRto4hlLcQM6GRcn0i09QOoaddoMognjWrB1OB8F
DFu5ueUWlWLLtfM6cT/PJsrUqmoPVsZor7oamKtZxONUaI434+0+bDoRAW1E9eQiN/DyU61q8qSO
sFMipUAqQJleNKiV3IYS3G7MkOBwtFujKLvNR5IXu3NIxO53TDuFirA0kNZldELkvRfWnBMGXQtm
iG2ZdVuqidgZddwW/4KqrPiks6MoHhI9ETqZy0b+iuquYYLHqWxyrmk75uYG4u9kGbpjgp6WXK14
G8DWAdHpaelaio2u4ZgVqh8pxsmVSnMWdMEasXE0MUPexpVUQz80+O+MmPqHc8pYWdfLUGrpLpgW
ovU2hge7pmH3i1Ru6ra0DgUKdWIqVuIDHc1qRH7XEePTdsfc+JzZaUMRw+L8YvP8XckU4UJBY/Ze
iA==


--===============0605487976==--