From: marko.makela
Date: June 10 2010 1:01pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3506 to 3507) Bug#38999
List-Archive: http://lists.mysql.com/commits/110719
X-Bug: 38999
Message-Id: <201006101301.o5AD1b4R010262@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0562822435=="

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

IDM1MDcgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0xMAogICAgICBCdWcgIzM4OTk5OiBSZS1lbmFi
bGUgaW5ub2RiX211bHRpX3VwZGF0ZS50ZXN0CgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2Rpc2FibGVkLmRlZgogMzUwNiBTZXJnZXkgR2x1a2hvdgkyMDEwLTA2LTA5
CiAgICAgIEJ1ZyMzODk5OSB2YWxncmluZCB3YXJuaW5ncyBmb3IgdXBkYXRlIHN0YXRlbWVudCBp
biBmdW5jdGlvbiBjb21wYXJlX3JlY29yZCgpCiAgICAgIChJbm5vREIgcGx1Z2luIGJyYW5jaCkK
ICAgICBAIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9teXNxbC5yZXN1
bHQKICAgICAgICB0ZXN0IGNhc2UKICAgICBAIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdp
bi90L2lubm9kYl9teXNxbC50ZXN0CiAgICAgICAgdGVzdCBjYXNlCiAgICAgQCBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwogICAgICAgIGluaXQgbnVsbCBieXRlcyB3aXRoIGRl
ZmF1bHQgdmFsdWVzIGFzIHRoZXkgbWlnaHQgYmUKICAgICAgICBsZWZ0IHVuaW5pdGlhbGl6ZWQg
aW4gc29tZSBjYXNlcyBhbmQgdGhlc2UgdW5pbml0ZWQgYnl0ZXMKICAgICAgICBtaWdodCBiZSBj
b3BpZWQgaW50byBteXNxbCByZWNvcmQgYnVmZmVyIHRoYXQgbGVhZHMgdG8KICAgICAgICB2YWxn
cmluZCB3YXJuaW5ncyBvbiBuZXh0IHVzZSBvZiB0aGUgYnVmZmVyLgoKICAgIG1vZGlmaWVkOgog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfbXlzcWwucmVzdWx0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9teXNxbC50ZXN0
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCj09PSBtb2RpZmllZCBm
aWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZicKLS0tIGEvbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9kaXNhYmxlZC5kZWYJcmV2aWQ6c2VyZ2V5LmdsdWtob3ZAc3Vu
LmNvbS0yMDEwMDYwOTEyMTcxOC0wNG1wazVranh2bnJ4ZHU4CisrKyBiL215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNjEwMTI1NjIzLWFyNnFmNHcycHYya3I3bWIKQEAgLTksNCArOSwzIEBACiAjICBEbyBub3Qg
dXNlIGFueSBUQUIgY2hhcmFjdGVycyBmb3Igd2hpdGVzcGFjZS4KICMKICMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIwotaW5ub2RiX211bHRpX3VwZGF0ZTogQnVnICMzODk5OSAyMDEwLTA1LTA1IG1tYWtl
bGEgVmFsZ3JpbmQgd2FybmluZ3MKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRl
L2lubm9kYl9wbHVnaW4vdC9kaXNhYmxlZC5kZWYnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2Rpc2FibGVkLmRlZglyZXZpZDpzZXJnZXkuZ2x1a2hvdkBzdW4uY29tLTIw
MTAwNjA5MTIxNzE4LTA0bXBrNWtqeHZucnhkdTgKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3QvZGlzYWJsZWQuZGVmCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNjEwMTI1NjIzLWFyNnFmNHcycHYya3I3bWIKQEAgLTksNCArOSwzIEBACiAjICBEbyBub3Qg
dXNlIGFueSBUQUIgY2hhcmFjdGVycyBmb3Igd2hpdGVzcGFjZS4KICMKICMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIwotaW5ub2RiX211bHRpX3VwZGF0ZTogQnVnICMzODk5OSAyMDEwLTA1LTA1IG1tYWtl
bGEgVmFsZ3JpbmQgd2FybmluZ3MKCg==

--===============0562822435==
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 16:01:30 +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==


--===============0562822435==--