From: marko.makela
Date: May 11 2010 4:51pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3460)
List-Archive: http://lists.mysql.com/commits/108018
Message-Id: <201005111651.o4BGpa9D007730@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0554390392=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTExMTA1MzA4LWdycDJ0
M3ByaDN0cWl2dzAKCiAzNDYwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTEKICAgICAgRml4IHN5
c192YXJzLnR4X2lzb2xhdGlvbl9mdW5jLnRlc3QsIHdoaWNoIHdhcyBicm9rZW4gaW4gcmV2bm8g
MzQzMgogICAgICB3aGVuIG1ha2luZyBSRUFEIFVOQ09NTUlUVEVEIGxvY2sgYXMgbGl0dGxlIGFz
IFJFQUQgQ09NTUlUVEVELgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5
c192YXJzL3IvdHhfaXNvbGF0aW9uX2Z1bmMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv
c3lzX3ZhcnMvdC90eF9pc29sYXRpb25fZnVuYy50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNx
bC10ZXN0L3N1aXRlL3N5c192YXJzL3IvdHhfaXNvbGF0aW9uX2Z1bmMucmVzdWx0JwotLS0gYS9t
eXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvdHhfaXNvbGF0aW9uX2Z1bmMucmVzdWx0CTIwMDgt
MTItMTkgMTU6MTI6MTUgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL3R4
X2lzb2xhdGlvbl9mdW5jLnJlc3VsdAkyMDEwLTA1LTExIDE2OjUxOjIxICswMDAwCkBAIC05NSwx
MCArOTUsNyBAQCBhCWIKIDIyCTEwCiAyNAkxMAogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDIzLCAy
Myk7Ci1FUlJPUiBIWTAwMDogTG9jayB3YWl0IHRpbWVvdXQgZXhjZWVkZWQ7IHRyeSByZXN0YXJ0
aW5nIHRyYW5zYWN0aW9uCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMjUsIDI1KTsKLUVSUk9SIEhZ
MDAwOiBMb2NrIHdhaXQgdGltZW91dCBleGNlZWRlZDsgdHJ5IHJlc3RhcnRpbmcgdHJhbnNhY3Rp
b24KLUJ1ZzogT25seSBldmVuIHJvd3MgYXJlIGJlaW5nIGxvY2tlZCwgZXJyb3IgMTIwNSBzaG91
bGQnbnQgaGF2ZSBvY2N1cmVkCiBTRUxFQ1QgKiBGUk9NIHQxOwogYQliCiAyCTEwCkBAIC0xMDks
NyArMTA2LDkgQEAgYQliCiAxOAkxMAogMjAJMTAKIDIyCTEwCisyMwkyMwogMjQJMTAKKzI1CTI1
CiBDT01NSVQ7CiAqKiBDb25uZWN0aW9uIGNvbjAgKioKIENPTU1JVDsKQEAgLTE0NCw3ICsxNDMs
OSBAQCBhCWIKIDE4CTEwCiAyMAkxMAogMjIJMTAKKzIzCTIzCiAyNAkxMAorMjUJMjUKIElOU0VS
VCBJTlRPIHQxIFZBTFVFUyg1LCA1KTsKIElOU0VSVCBJTlRPIHQxIFZBTFVFUyg3LCA3KTsKIFNF
TEVDVCAqIEZST00gdDE7CkBAIC0xNTksNyArMTYwLDkgQEAgYQliCiAxOAkxMAogMjAJMTAKIDIy
CTEwCisyMwkyMwogMjQJMTAKKzI1CTI1CiBDT01NSVQ7CiAqKiBDb25uZWN0aW9uIGNvbjAgKioK
IENPTU1JVDsKQEAgLTE5Niw3ICsxOTksOSBAQCBhCWIKIDE4CTExCiAyMAkxMQogMjIJMTEKKzIz
CTIzCiAyNAkxMQorMjUJMjUKIElOU0VSVCBJTlRPIHQxIFZBTFVFUyg5LCA5KTsKIEVSUk9SIEhZ
MDAwOiBMb2NrIHdhaXQgdGltZW91dCBleGNlZWRlZDsgdHJ5IHJlc3RhcnRpbmcgdHJhbnNhY3Rp
b24KIElOU0VSVCBJTlRPIHQxIFZBTFVFUygxMywgMTMpOwpAQCAtMjE0LDcgKzIxOSw5IEBAIGEJ
YgogMTgJMTEKIDIwCTExCiAyMgkxMQorMjMJMjMKIDI0CTExCisyNQkyNQogQ09NTUlUOwogKiog
Q29ubmVjdGlvbiBjb24wICoqCiBDT01NSVQ7CkBAIC0yMjUsNiArMjMyLDggQEAgU0VMRUNUICog
RlJPTSB0MSBXSEVSRSBhIElOICgyLDQsNiw4LDEwLAogYQliCiA1CTUKIDcJNworMjMJMjMKKzI1
CTI1CiBVUERBVEUgdDEgU0VUIGIgPSAxMyBXSEVSRSBhIElOICgyLDQsNiw4LDEwLDEyLDE0LDE2
LDE4LDIwLDIyLDI0LDI2KSA9IDA7CiAqKiBDb25uZWN0aW9uIGNvbjEgKioKIFNUQVJUIFRSQU5T
QUNUSU9OOwpAQCAtMjQwLDcgKzI0OSw5IEBAIGEJYgogMTgJMTIKIDIwCTEyCiAyMgkxMgorMjMJ
MjMKIDI0CTEyCisyNQkyNQogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDksIDkpOwogRVJST1IgSFkw
MDA6IExvY2sgd2FpdCB0aW1lb3V0IGV4Y2VlZGVkOyB0cnkgcmVzdGFydGluZyB0cmFuc2FjdGlv
bgogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDEzLCAxMyk7CkBAIC0yNTgsNyArMjY5LDkgQEAgYQli
CiAxOAkxMgogMjAJMTIKIDIyCTEyCisyMwkyMwogMjQJMTIKKzI1CTI1CiBDT01NSVQ7CiAqKiBD
b25uZWN0aW9uIGNvbjAgKioKIENPTU1JVDsKQEAgLTI3Myw3ICsyODYsOSBAQCBhCWIKIDE4CTEy
CiAyMAkxMgogMjIJMTIKKzIzCTEzCiAyNAkxMgorMjUJMTMKIFVQREFURSB0MSBTRVQgYiA9IDE0
IFdIRVJFIGEgSU4gKDIsNCw2LDgpID0gMDsKICoqIENvbm5lY3Rpb24gY29uMSAqKgogU1RBUlQg
VFJBTlNBQ1RJT047CkBAIC0yODksNyArMzA0LDkgQEAgYQliCiAxOAkxMgogMjAJMTIKIDIyCTEy
CisyMwkxMwogMjQJMTIKKzI1CTEzCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoOSwgOSk7CiBFUlJP
UiBIWTAwMDogTG9jayB3YWl0IHRpbWVvdXQgZXhjZWVkZWQ7IHRyeSByZXN0YXJ0aW5nIHRyYW5z
YWN0aW9uCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMTMsIDEzKTsKQEAgLTMwNyw3ICszMjQsOSBA
QCBhCWIKIDE4CTEyCiAyMAkxMgogMjIJMTIKKzIzCTEzCiAyNAkxMgorMjUJMTMKIENPTU1JVDsK
ICoqIENvbm5lY3Rpb24gY29uMCAqKgogQ09NTUlUOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs
LXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC90eF9pc29sYXRpb25fZnVuYy50ZXN0JwotLS0gYS9teXNx
bC10ZXN0L3N1aXRlL3N5c192YXJzL3QvdHhfaXNvbGF0aW9uX2Z1bmMudGVzdAkyMDA4LTEyLTE5
IDE1OjEyOjE1ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC90eF9pc29s
YXRpb25fZnVuYy50ZXN0CTIwMTAtMDUtMTEgMTY6NTE6MjEgKzAwMDAKQEAgLTEzNCwxMiArMTM0
LDkgQEAgU1RBUlQgVFJBTlNBQ1RJT047CiAKIFNFTEVDVCAqIEZST00gdDE7CiAKLS0tZXJyb3Ig
RVJfTE9DS19XQUlUX1RJTUVPVVQKIElOU0VSVCBJTlRPIHQxIFZBTFVFUygyMywgMjMpOwogCi0t
LWVycm9yIEVSX0xPQ0tfV0FJVF9USU1FT1VUCiBJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMjUsIDI1
KTsKLS0tZWNobyBCdWc6IE9ubHkgZXZlbiByb3dzIGFyZSBiZWluZyBsb2NrZWQsIGVycm9yIDEy
MDUgc2hvdWxkJ250IGhhdmUgb2NjdXJlZAogCiBTRUxFQ1QgKiBGUk9NIHQxOwogCgo=

--===============0554390392==
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: 2c096ec828514c2cb96fbd1b9be3102aba68bef8
# timestamp: 2010-05-11 19:51:30 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   grp2t3prh3tqivw0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWer1rywAAzBfgEAwWWf//38j
lgC////wUAW4L2SqoEgNVawAkogp6mam0j09EYUeJG1BoAB6gB6hzTEwEaYEYRgAAACYRgJEgKaC
aekDKMaj1GmgADJk0eoBzTEwEaYEYRgAAACYRgJJCNA1MAUwmjQ0QYTU9QAPU9Rpn04ttsBoNXJ4
pzbbbbG22KD7/3l/hblEczAuy6aa0O1OLLOiqzNWUkI1tFS7lokWlN1ESda0wpfx21L4Fxg2Am+/
sSRm6OGB5c2YN+Ga+mUnRmRkTpIuylZSIrksTMK3pMleGy2EKmSDgtBKsFHK/Hac5wqOJR6K7+2X
Z3zx2TJ8Z20itpWmb2GDB/+aL32SaGVUTMjpG6qILCituTaA1s7yS2Hz4/XKcrjiG90yFvKOQDsq
E/bAHGJMMrn9NlIyRyBcSXTpXTsqe9HMZsxYRoaS3MUsYbXRbnvN0dKgmA2kMLwSmGJ4EkiqvQai
QDg6AupWOJWc7EgJ2J5pDOfVIDzgSmJRikPpCddr+byAyebEhnAUWjmgIqKHaVzY/UUgqF7FgGSe
RJhjSDEwHAcADUWMdtJlCWC1FDUQb0V0uqyrCamnY2zKH2BFY4QwxS5eh7nkkZgWEp2IuKJFAIDg
nGRlhnKZ4oVhQVRhrLkGUxW43nYUiCkTY5Ni6VSZWTmwoDQpnHjyT2eOGCLixBUmRIfCFznA6ltO
FTvaHeWvRhXTOC2dqJA4xGpZoQGNxBVGJWUEN3FQOZUfFiRFgGsGNbG5DzQvf+UitIiBEhVgu4nT
6x5AwO0vMjiXF8DgegDHQaf8TTqigcYW3OaTjm5yCMxlINocCBqcY0JtbJbJn1JxA2v1micDwPxh
oMijg5WkjE0cZAxuLjIvIGUMns4bLFVDJVsS0qKyfYNtGMyN1bjEpJym19hstdQzhxS9h2MC2rRT
s05I6QMimzLjoMhCgJ6FkRU2t7POTaXzZybqmeTfXEafKNKDj+y27ZTgq4lkOgF3GejabceGvuJH
6KbzV7EWP8JfHuTET4HYCL7k3ik5D8fTOcH+BAXYdRvPMF94HV1ApVDkeJ2kT9UL2pL1dUU28pAb
6gXrpaz1elzGP4A8czwsMz6H1MDl62nSYsQvrAic0kunak3iTHUQvLigD78Zm8+g/bSDAm9BK7QC
q9i89TA6D1LQiDUFYEvYDE9i7tOZvUetQOY4SuO8vMDgOL4Havc14lbVqCPDvLyJIDORbQXaneJV
vK0wtDHC/5aBtLMyYameocg7hpkVE+M5uQ+OcWEI40qRYFZYtFTVWX4pccFqBjh5fFxMWXG03J3A
TS+ZYQHkjABbIlHJqM7wJzgs9UsCBMXI3mZib91QQyoiSYE6DMlNHgsYR6E5CdXgfm+C42IdtQuu
S+xIHgopcC/eSBMh53mVni6Y+Y9rdIZIiMS2gskvVrPYaDByiTa85UqSOHdVPniRV1kRY9xAlpXI
l8aVRRkM3PP19WVE2JqJdSFsa6sZYlSkogC99EoK1GVWlry4NJlREs5ROqquAYzKoMiW7uVNI2ly
tXiZ5G/qxVqAzkcjnEB1vhqXsntiq6KEKtX2QnDkp5yIzDJy20EGGbLI2wZVLU4IHEQcllezNSqA
qGpQzPAusrsJ6NVbNOTm47wdoOucVhFYWjylKehFK1Tf2MRYMSJ2FzDSnPpvrZJuo6KCtVGZh5OS
LxrVmagdy4AcvlvNu463VZASSwNiGKNYOd5HSQfMbCREoL6rVkBzAwJn5mRemhTt/8XckU4UJDq9
a8sA


--===============0554390392==--