From: marko.makela
Date: May 11 2010 4:58pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3459)
List-Archive: http://lists.mysql.com/commits/108021
Message-Id: <201005111659.o4BFhxA8024801@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1185893245=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MTExMTAwMjktMTh4dnV1
NnI3aGFyOHRvaAoKIDM0NTkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMQogICAgICBGaXggc3lz
X3ZhcnMudHhfaXNvbGF0aW9uX2Z1bmMudGVzdCwgd2hpY2ggd2FzIGJyb2tlbiBpbiByZXZubyAz
NDMyCiAgICAgIHdoZW4gbWFraW5nIFJFQUQgVU5DT01NSVRURUQgbG9jayBhcyBsaXR0bGUgYXMg
UkVBRCBDT01NSVRURUQuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lz
X3ZhcnMvci90eF9pc29sYXRpb25fZnVuYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9z
eXNfdmFycy90L3R4X2lzb2xhdGlvbl9mdW5jLnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs
LXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci90eF9pc29sYXRpb25fZnVuYy5yZXN1bHQnCi0tLSBhL215
c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci90eF9pc29sYXRpb25fZnVuYy5yZXN1bHQJMjAwOC0x
Mi0xOSAxNToxMjoxNSArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvdHhf
aXNvbGF0aW9uX2Z1bmMucmVzdWx0CTIwMTAtMDUtMTEgMTY6NTg6NDUgKzAwMDAKQEAgLTk1LDEw
ICs5NSw3IEBAIGEJYgogMjIJMTAKIDI0CTEwCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMjMsIDIz
KTsKLUVSUk9SIEhZMDAwOiBMb2NrIHdhaXQgdGltZW91dCBleGNlZWRlZDsgdHJ5IHJlc3RhcnRp
bmcgdHJhbnNhY3Rpb24KIElOU0VSVCBJTlRPIHQxIFZBTFVFUygyNSwgMjUpOwotRVJST1IgSFkw
MDA6IExvY2sgd2FpdCB0aW1lb3V0IGV4Y2VlZGVkOyB0cnkgcmVzdGFydGluZyB0cmFuc2FjdGlv
bgotQnVnOiBPbmx5IGV2ZW4gcm93cyBhcmUgYmVpbmcgbG9ja2VkLCBlcnJvciAxMjA1IHNob3Vs
ZCdudCBoYXZlIG9jY3VyZWQKIFNFTEVDVCAqIEZST00gdDE7CiBhCWIKIDIJMTAKQEAgLTEwOSw3
ICsxMDYsOSBAQCBhCWIKIDE4CTEwCiAyMAkxMAogMjIJMTAKKzIzCTIzCiAyNAkxMAorMjUJMjUK
IENPTU1JVDsKICoqIENvbm5lY3Rpb24gY29uMCAqKgogQ09NTUlUOwpAQCAtMTQ0LDcgKzE0Myw5
IEBAIGEJYgogMTgJMTAKIDIwCTEwCiAyMgkxMAorMjMJMjMKIDI0CTEwCisyNQkyNQogSU5TRVJU
IElOVE8gdDEgVkFMVUVTKDUsIDUpOwogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDcsIDcpOwogU0VM
RUNUICogRlJPTSB0MTsKQEAgLTE1OSw3ICsxNjAsOSBAQCBhCWIKIDE4CTEwCiAyMAkxMAogMjIJ
MTAKKzIzCTIzCiAyNAkxMAorMjUJMjUKIENPTU1JVDsKICoqIENvbm5lY3Rpb24gY29uMCAqKgog
Q09NTUlUOwpAQCAtMTk2LDcgKzE5OSw5IEBAIGEJYgogMTgJMTEKIDIwCTExCiAyMgkxMQorMjMJ
MjMKIDI0CTExCisyNQkyNQogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDksIDkpOwogRVJST1IgSFkw
MDA6IExvY2sgd2FpdCB0aW1lb3V0IGV4Y2VlZGVkOyB0cnkgcmVzdGFydGluZyB0cmFuc2FjdGlv
bgogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDEzLCAxMyk7CkBAIC0yMTQsNyArMjE5LDkgQEAgYQli
CiAxOAkxMQogMjAJMTEKIDIyCTExCisyMwkyMwogMjQJMTEKKzI1CTI1CiBDT01NSVQ7CiAqKiBD
b25uZWN0aW9uIGNvbjAgKioKIENPTU1JVDsKQEAgLTIyNSw2ICsyMzIsOCBAQCBTRUxFQ1QgKiBG
Uk9NIHQxIFdIRVJFIGEgSU4gKDIsNCw2LDgsMTAsCiBhCWIKIDUJNQogNwk3CisyMwkyMworMjUJ
MjUKIFVQREFURSB0MSBTRVQgYiA9IDEzIFdIRVJFIGEgSU4gKDIsNCw2LDgsMTAsMTIsMTQsMTYs
MTgsMjAsMjIsMjQsMjYpID0gMDsKICoqIENvbm5lY3Rpb24gY29uMSAqKgogU1RBUlQgVFJBTlNB
Q1RJT047CkBAIC0yNDAsNyArMjQ5LDkgQEAgYQliCiAxOAkxMgogMjAJMTIKIDIyCTEyCisyMwky
MwogMjQJMTIKKzI1CTI1CiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoOSwgOSk7CiBFUlJPUiBIWTAw
MDogTG9jayB3YWl0IHRpbWVvdXQgZXhjZWVkZWQ7IHRyeSByZXN0YXJ0aW5nIHRyYW5zYWN0aW9u
CiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMTMsIDEzKTsKQEAgLTI1OCw3ICsyNjksOSBAQCBhCWIK
IDE4CTEyCiAyMAkxMgogMjIJMTIKKzIzCTIzCiAyNAkxMgorMjUJMjUKIENPTU1JVDsKICoqIENv
bm5lY3Rpb24gY29uMCAqKgogQ09NTUlUOwpAQCAtMjczLDcgKzI4Niw5IEBAIGEJYgogMTgJMTIK
IDIwCTEyCiAyMgkxMgorMjMJMTMKIDI0CTEyCisyNQkxMwogVVBEQVRFIHQxIFNFVCBiID0gMTQg
V0hFUkUgYSBJTiAoMiw0LDYsOCkgPSAwOwogKiogQ29ubmVjdGlvbiBjb24xICoqCiBTVEFSVCBU
UkFOU0FDVElPTjsKQEAgLTI4OSw3ICszMDQsOSBAQCBhCWIKIDE4CTEyCiAyMAkxMgogMjIJMTIK
KzIzCTEzCiAyNAkxMgorMjUJMTMKIElOU0VSVCBJTlRPIHQxIFZBTFVFUyg5LCA5KTsKIEVSUk9S
IEhZMDAwOiBMb2NrIHdhaXQgdGltZW91dCBleGNlZWRlZDsgdHJ5IHJlc3RhcnRpbmcgdHJhbnNh
Y3Rpb24KIElOU0VSVCBJTlRPIHQxIFZBTFVFUygxMywgMTMpOwpAQCAtMzA3LDcgKzMyNCw5IEBA
IGEJYgogMTgJMTIKIDIwCTEyCiAyMgkxMgorMjMJMTMKIDI0CTEyCisyNQkxMwogQ09NTUlUOwog
KiogQ29ubmVjdGlvbiBjb24wICoqCiBDT01NSVQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwt
dGVzdC9zdWl0ZS9zeXNfdmFycy90L3R4X2lzb2xhdGlvbl9mdW5jLnRlc3QnCi0tLSBhL215c3Fs
LXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC90eF9pc29sYXRpb25fZnVuYy50ZXN0CTIwMDgtMTItMTkg
MTU6MTI6MTUgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L3R4X2lzb2xh
dGlvbl9mdW5jLnRlc3QJMjAxMC0wNS0xMSAxNjo1ODo0NSArMDAwMApAQCAtMTM0LDEyICsxMzQs
OSBAQCBTVEFSVCBUUkFOU0FDVElPTjsKIAogU0VMRUNUICogRlJPTSB0MTsKIAotLS1lcnJvciBF
Ul9MT0NLX1dBSVRfVElNRU9VVAogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDIzLCAyMyk7CiAKLS0t
ZXJyb3IgRVJfTE9DS19XQUlUX1RJTUVPVVQKIElOU0VSVCBJTlRPIHQxIFZBTFVFUygyNSwgMjUp
OwotLS1lY2hvIEJ1ZzogT25seSBldmVuIHJvd3MgYXJlIGJlaW5nIGxvY2tlZCwgZXJyb3IgMTIw
NSBzaG91bGQnbnQgaGF2ZSBvY2N1cmVkCiAKIFNFTEVDVCAqIEZST00gdDE7CiAKCg==

--===============1185893245==
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:58:54 +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=


--===============1185893245==--