From: marko.makela
Date: May 11 2010 4:59pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3458 to 3459)
List-Archive: http://lists.mysql.com/commits/108023
Message-Id: <201005111659.o4BGmaVj030305@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0810081046=="

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

IDM0NTkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMQogICAgICBGaXggc3lzX3ZhcnMudHhfaXNv
bGF0aW9uX2Z1bmMudGVzdCwgd2hpY2ggd2FzIGJyb2tlbiBpbiByZXZubyAzNDMyCiAgICAgIHdo
ZW4gbWFraW5nIFJFQUQgVU5DT01NSVRURUQgbG9jayBhcyBsaXR0bGUgYXMgUkVBRCBDT01NSVRU
RUQuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci90eF9p
c29sYXRpb25fZnVuYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3R4
X2lzb2xhdGlvbl9mdW5jLnRlc3QKIDM0NTggVmFzaWwgRGltb3YJMjAxMC0wNS0xMSBbbWVyZ2Vd
CiAgICAgIE1lcmdlIG15c3FsLTUuMS1pbm5vZGIgZnJvbSBiay1pbnRlcm5hbCBsb2NhbGx5Cgog
ICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9i
dWc1MzI5MC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5u
b2RiX2J1ZzUzMjkwLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vYnRyL2J0cjBidHIuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUu
YwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYwYnVmLmljCiAgICAgIHN0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JlbTBjbXAuaAogICAgICBzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcGFnZS9wYWdlMHppcC5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yZW0v
cmVtMGNtcC5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdlLmMKPT09
IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci90eF9pc29sYXRpb25f
ZnVuYy5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci90eF9pc29sYXRp
b25fZnVuYy5yZXN1bHQJMjAwOC0xMi0xOSAxNToxMjoxNSArMDAwMAorKysgYi9teXNxbC10ZXN0
L3N1aXRlL3N5c192YXJzL3IvdHhfaXNvbGF0aW9uX2Z1bmMucmVzdWx0CTIwMTAtMDUtMTEgMTY6
NTg6NDUgKzAwMDAKQEAgLTk1LDEwICs5NSw3IEBAIGEJYgogMjIJMTAKIDI0CTEwCiBJTlNFUlQg
SU5UTyB0MSBWQUxVRVMoMjMsIDIzKTsKLUVSUk9SIEhZMDAwOiBMb2NrIHdhaXQgdGltZW91dCBl
eGNlZWRlZDsgdHJ5IHJlc3RhcnRpbmcgdHJhbnNhY3Rpb24KIElOU0VSVCBJTlRPIHQxIFZBTFVF
UygyNSwgMjUpOwotRVJST1IgSFkwMDA6IExvY2sgd2FpdCB0aW1lb3V0IGV4Y2VlZGVkOyB0cnkg
cmVzdGFydGluZyB0cmFuc2FjdGlvbgotQnVnOiBPbmx5IGV2ZW4gcm93cyBhcmUgYmVpbmcgbG9j
a2VkLCBlcnJvciAxMjA1IHNob3VsZCdudCBoYXZlIG9jY3VyZWQKIFNFTEVDVCAqIEZST00gdDE7
CiBhCWIKIDIJMTAKQEAgLTEwOSw3ICsxMDYsOSBAQCBhCWIKIDE4CTEwCiAyMAkxMAogMjIJMTAK
KzIzCTIzCiAyNAkxMAorMjUJMjUKIENPTU1JVDsKICoqIENvbm5lY3Rpb24gY29uMCAqKgogQ09N
TUlUOwpAQCAtMTQ0LDcgKzE0Myw5IEBAIGEJYgogMTgJMTAKIDIwCTEwCiAyMgkxMAorMjMJMjMK
IDI0CTEwCisyNQkyNQogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDUsIDUpOwogSU5TRVJUIElOVE8g
dDEgVkFMVUVTKDcsIDcpOwogU0VMRUNUICogRlJPTSB0MTsKQEAgLTE1OSw3ICsxNjAsOSBAQCBh
CWIKIDE4CTEwCiAyMAkxMAogMjIJMTAKKzIzCTIzCiAyNAkxMAorMjUJMjUKIENPTU1JVDsKICoq
IENvbm5lY3Rpb24gY29uMCAqKgogQ09NTUlUOwpAQCAtMTk2LDcgKzE5OSw5IEBAIGEJYgogMTgJ
MTEKIDIwCTExCiAyMgkxMQorMjMJMjMKIDI0CTExCisyNQkyNQogSU5TRVJUIElOVE8gdDEgVkFM
VUVTKDksIDkpOwogRVJST1IgSFkwMDA6IExvY2sgd2FpdCB0aW1lb3V0IGV4Y2VlZGVkOyB0cnkg
cmVzdGFydGluZyB0cmFuc2FjdGlvbgogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDEzLCAxMyk7CkBA
IC0yMTQsNyArMjE5LDkgQEAgYQliCiAxOAkxMQogMjAJMTEKIDIyCTExCisyMwkyMwogMjQJMTEK
KzI1CTI1CiBDT01NSVQ7CiAqKiBDb25uZWN0aW9uIGNvbjAgKioKIENPTU1JVDsKQEAgLTIyNSw2
ICsyMzIsOCBAQCBTRUxFQ1QgKiBGUk9NIHQxIFdIRVJFIGEgSU4gKDIsNCw2LDgsMTAsCiBhCWIK
IDUJNQogNwk3CisyMwkyMworMjUJMjUKIFVQREFURSB0MSBTRVQgYiA9IDEzIFdIRVJFIGEgSU4g
KDIsNCw2LDgsMTAsMTIsMTQsMTYsMTgsMjAsMjIsMjQsMjYpID0gMDsKICoqIENvbm5lY3Rpb24g
Y29uMSAqKgogU1RBUlQgVFJBTlNBQ1RJT047CkBAIC0yNDAsNyArMjQ5LDkgQEAgYQliCiAxOAkx
MgogMjAJMTIKIDIyCTEyCisyMwkyMwogMjQJMTIKKzI1CTI1CiBJTlNFUlQgSU5UTyB0MSBWQUxV
RVMoOSwgOSk7CiBFUlJPUiBIWTAwMDogTG9jayB3YWl0IHRpbWVvdXQgZXhjZWVkZWQ7IHRyeSBy
ZXN0YXJ0aW5nIHRyYW5zYWN0aW9uCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMTMsIDEzKTsKQEAg
LTI1OCw3ICsyNjksOSBAQCBhCWIKIDE4CTEyCiAyMAkxMgogMjIJMTIKKzIzCTIzCiAyNAkxMgor
MjUJMjUKIENPTU1JVDsKICoqIENvbm5lY3Rpb24gY29uMCAqKgogQ09NTUlUOwpAQCAtMjczLDcg
KzI4Niw5IEBAIGEJYgogMTgJMTIKIDIwCTEyCiAyMgkxMgorMjMJMTMKIDI0CTEyCisyNQkxMwog
VVBEQVRFIHQxIFNFVCBiID0gMTQgV0hFUkUgYSBJTiAoMiw0LDYsOCkgPSAwOwogKiogQ29ubmVj
dGlvbiBjb24xICoqCiBTVEFSVCBUUkFOU0FDVElPTjsKQEAgLTI4OSw3ICszMDQsOSBAQCBhCWIK
IDE4CTEyCiAyMAkxMgogMjIJMTIKKzIzCTEzCiAyNAkxMgorMjUJMTMKIElOU0VSVCBJTlRPIHQx
IFZBTFVFUyg5LCA5KTsKIEVSUk9SIEhZMDAwOiBMb2NrIHdhaXQgdGltZW91dCBleGNlZWRlZDsg
dHJ5IHJlc3RhcnRpbmcgdHJhbnNhY3Rpb24KIElOU0VSVCBJTlRPIHQxIFZBTFVFUygxMywgMTMp
OwpAQCAtMzA3LDcgKzMyNCw5IEBAIGEJYgogMTgJMTIKIDIwCTEyCiAyMgkxMgorMjMJMTMKIDI0
CTEyCisyNQkxMwogQ09NTUlUOwogKiogQ29ubmVjdGlvbiBjb24wICoqCiBDT01NSVQ7Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3R4X2lzb2xhdGlvbl9m
dW5jLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC90eF9pc29sYXRpb25f
ZnVuYy50ZXN0CTIwMDgtMTItMTkgMTU6MTI6MTUgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9zeXNfdmFycy90L3R4X2lzb2xhdGlvbl9mdW5jLnRlc3QJMjAxMC0wNS0xMSAxNjo1ODo0NSAr
MDAwMApAQCAtMTM0LDEyICsxMzQsOSBAQCBTVEFSVCBUUkFOU0FDVElPTjsKIAogU0VMRUNUICog
RlJPTSB0MTsKIAotLS1lcnJvciBFUl9MT0NLX1dBSVRfVElNRU9VVAogSU5TRVJUIElOVE8gdDEg
VkFMVUVTKDIzLCAyMyk7CiAKLS0tZXJyb3IgRVJfTE9DS19XQUlUX1RJTUVPVVQKIElOU0VSVCBJ
TlRPIHQxIFZBTFVFUygyNSwgMjUpOwotLS1lY2hvIEJ1ZzogT25seSBldmVuIHJvd3MgYXJlIGJl
aW5nIGxvY2tlZCwgZXJyb3IgMTIwNSBzaG91bGQnbnQgaGF2ZSBvY2N1cmVkCiAKIFNFTEVDVCAq
IEZST00gdDE7CiAKCg==

--===============0810081046==
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.1-innodb2/
# testament_sha1: 700420118e456bbc9a3e28ae1838df34f06676bd
# timestamp: 2010-05-11 19:59:24 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   18xvuu6r7har8toh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWjk0ikAAyRfgEAwWWf//38j
lgC////wUAXYLzIiCNqFDbGtQkoKI0ybTI9Jp6QNJ6E0MgAGQAc0xMBGmBGEYAAAAmEYCU0QImnq
KemSbQRo9GkAAPUNDTQHNMTARpgRhGAAAAJhGAkkJoDRMENGkyNJknqeU9NJoA00Yl2vp1JJIBAa
uLj5pzSSSSEkkM59v7XuK4jHIgLIsyZNdVnr2ym1EZ6RDDE0xnLKLwViSoMcua1qYJc9dbe4oIEg
GS7eDMxll4HFe+QascraYhTRgh5TgsidIgemFSRjS05EWdIri7Twc0Vcijk1C10zSkOprGT7693C
Pp95atsiWw4TelYq8+WC9X/rhe+mSDscJ2XKRuLHYeYnNf0pNtwcAaTh4fHic6bE2oaOihaFLX88
AM4A8eQGV7ca6BkhlzQZpcr1y3zn5IvLLScRayS7WE944NZnNtZ/iqAzgJMwgo8mSmH4HZiR0SKS
AUHUTaOU63bMwwKMhPFvXBBhObMRYNz9dWJCaDlZhOAoayBId8ymG+xs/xFaFYvzJIvZYqBB6HjG
RUM4NgFDk/HtqPVTzESalZmYx9ETZtC6VOMa4ya7bC4EVjhhily9T0SMgKyFkWLB5FIiBRAhF6vC
LCMlIndoajHJtKljI6juNxkMGAy4tK1cVwzUNJYKzHNhshQOIOss8WcSOcMDyEPR3U42as5at5uW
sYodpAjYIiaW0wAccQVZgWFBCdjkoGAxsLD/ZJBIoMt1ruZWBMMYUVJED5PxXeOqMR5A7aC0deWg
XFpNWaG0Y3GX1KpygYwvqc0oj6RnsgqDcaEicpN59vsqb2TY23bJnyNJ84UHE954QFPxdcWF7GQM
YmJcPPcskGJhBjHBBJ9gjbUWm4gZE+ypxOOJi1OV0ppGe74JM4isIfVc0UNhnVVveDI0EZmz82gT
IIo12JuLsSx3k0zfJGndQfJa3ddJoZoFr4N4/FE3KJ4wOfpZAdpeiTJJ/1t7SD9k+81/EqjvL/z9
kyp+Db6Ca8mN4JOQ3B22Cdg7aPU4xbCs0Gwym5B5H369QV9o5HmVET+BHykZLGopvwZSA5VIO/fc
zU5TJaxhukOe+dRtJTjLJhNHXIZSZg+W0akksm2KTOvOhDmQMSJ7YnZO3xzP37IMCb4CV997Fh7H
A+JIIg1pUBZgYFvcamivU/YpjqOEuveN0NTE5dMZzuX0OHQk0lBEu8xJzxtNZzDgeIHzSK4FaYXA
zwvo0DUsyJhqY1DkHuGmRURwickbSYzmMiCgXV7GY0K/FqwAZToAyfyWri5kDJzhUYTO8Ca42g2o
m2qBb5FhEeSMgFVSa9Go34gRNVvsXBLImJlodqLWuN/11mjWilJg0QWpb5ffsAiPidTcv+2IONaH
bxFX9reuhIIIKEuJfEsBMh53mNno6Y6mgEOuewrpJCXkgry/o8gYzU6drsOK4Fb2pubm4f4nTlHe
p6Rxm0txs3vnRiaHRyLP2b8zEkMxNdpERbDIZk3OljSVoA1vRgBWUW1UVOU0ViLEXj9y111DGZUh
sAyJcKaRs5L2MAKWOHZeeaenWoDH4HceEQHXe/cXsntVPOIqW+uGQTTERmGTlxnIMM2WR5gcJmVS
3lK5IHlIOSzvZmrVIZCxYSxA07zKLwCphB1ToUOg8wP4R9LmYKtwAyuIFSU/sqkVh/gxOwZE54F7
DWxOi9Lq2SZrVZKo8lBcJFdKCFLUiAzCqCu8BGsplKmxtpMA2FiNU4o4Rc71LiD5jtJE5SbLti0H
5ZHMvTQoYBT/i7kinChINHJpFIA=


--===============0810081046==--