From: marko.makela
Date: November 11 2010 1:12pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3658) Bug#57802
List-Archive: http://lists.mysql.com/commits/123607
X-Bug: 57802
Message-Id: <201011111313.oABCAIj1028369@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0409126549=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMTExMTExMTUyLWdvOXIx
bGdidHB2Y21mZDAKCiAzNjU4IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTEtMTEKICAgICAgRml4IGEg
ZGVidWcgYXNzZXJ0aW9uIGZhaWx1cmUgaW4gdGhlIEJ1ZyM1NzgwMiBmaXguCiAgICAgIAogICAg
ICB0aHJfbG9jYWxfY3JlYXRlKCk6IEluaXRpYWxpemUgbG9jYWwtPnNsb3Rfbm8gdG8gVUxJTlRf
VU5ERUZJTkVELgogICAgICB0aHJfbG9jYWxfdmFsaWRhdGUoKTogQWxsb3cgbG9jYWwtPnNsb3Rf
bm8gdG8gYmUgVUxJTlRfVU5ERUZJTkVELgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vdGhyL3RocjBsb2MuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3Roci90aHIwbG9jLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi90aHIv
dGhyMGxvYy5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDExMTExMTExNTItZ285
cjFsZ2J0cHZjbWZkMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vdGhyL3RocjBsb2MuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTExMTEzMTIzOS13b3NsNjJ1ZmRjemoy
cGs3CkBAIC04Miw3ICs4Miw4IEBAIHRocl9sb2NhbF92YWxpZGF0ZSgKIAljb25zdCB0aHJfbG9j
YWxfdCoJbG9jYWwpCS8qITwgaW46IGRhdGEgdG8gdmFsaWRhdGUgKi8KIHsKIAl1dF9hZChsb2Nh
bC0+bWFnaWNfbiA9PSBUSFJfTE9DQUxfTUFHSUNfTik7Ci0JdXRfYWQobG9jYWwtPnNsb3Rfbm8g
PCBPU19USFJFQURfTUFYX04pOworCXV0X2FkKGxvY2FsLT5zbG90X25vID09IFVMSU5UX1VOREVG
SU5FRAorCSAgICAgIHx8IGxvY2FsLT5zbG90X25vIDwgT1NfVEhSRUFEX01BWF9OKTsKIAl1dF9h
ZChsb2NhbC0+aW5faWJ1ZiA9PSBGQUxTRSB8fCBsb2NhbC0+aW5faWJ1ZiA9PSBUUlVFKTsKIAly
ZXR1cm4oVFJVRSk7CiB9CkBAIC0yMDYsNyArMjA3LDcgQEAgdGhyX2xvY2FsX2NyZWF0ZSh2b2lk
KQogCWxvY2FsLT5pZCA9IG9zX3RocmVhZF9nZXRfY3Vycl9pZCgpOwogCWxvY2FsLT5oYW5kbGUg
PSBvc190aHJlYWRfZ2V0X2N1cnIoKTsKIAlsb2NhbC0+bWFnaWNfbiA9IFRIUl9MT0NBTF9NQUdJ
Q19OOwotCisJbG9jYWwtPnNsb3Rfbm8gPSBVTElOVF9VTkRFRklORUQ7CiAJbG9jYWwtPmluX2li
dWYgPSBGQUxTRTsKIAogCW11dGV4X2VudGVyKCZ0aHJfbG9jYWxfbXV0ZXgpOwoK

--===============0409126549==
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: 35dea23f9f5b9670492bfc2bf8fb16356c51aca6
# timestamp: 2010-11-11 15:12:51 +0200
# base_revision_id: vasil.dimov@stripped\
#   go9r1lgbtpvcmfd0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXPA+9oAAZvflHQwWmP//3dn
nkC//9/0BAAIAFADze24FuXvYuY93CSRE9NJpoap5oyamp7SntJNNNMmjQGmhpoNAZQAmmRoRiU9
pJtQ9TQAGn6UAA0ANNKYJQ/U9I9UPSMQHqAGENDQADRoI1JqYRoxNAaGmQAABkAMjQYgkoJE9T02
qeo9NQ09CAMmgDQBk0abU9JozJQZQV7qm23M3daey2zVMq5KEEpyO2XUvxNHMtOOvJcyE+fenux0
SyiVAVImegjezFbOBWLn8WZqnV+n55M0H9u/ZRHIcO8RW3M2QawJoKIkLsOvpPT6VQjOr6qRZW6r
e/d4X3RFt9LpLLVpSKVi2AbNWWiD0qU3NnqGEcsoiKEcgrDrLapDom+BQo2ix2AQLh1JtooQVapF
0h5NIdzBYIonp3CfU2QBCARctijSWIMVh0UBp1HZBcdSyj8JTDhFBrGfJIo8vzXmcswQypCCW5zC
mmCQMtUakN7AfMC+rSPWCqzA0aS07DmLTRBejLqDlNRaGlNmw8K3vVwe7Ups4HjDYq6sU5vMLUAP
NwlbEGQq2BJcxobIqqN4cOIegr0wM7qz2kaFcJzNK62lpxM6PSIpi9AT0bhipk61YCguotW2ZYC6
VTYmrbCFgulXMWPlER4UyhspqS4uMai24JUBqoXlogA+BtIxOPTnlG6m6M5dTzvfLdh6uRFS1peK
b5/aObGDEj2DrDt78TwoCIMNpGjMGcJKgrsua4NADtFUUoPBoTQrrgF/Eye+wMY5GnM0sS4B4ca7
jBYA1ZZEieWVwa3IB1pcOwqqhhQjCIEy0OOal3tyLoNJ01vg5R9c/fh2qH00AjE+FgtwQVDpPbp6
QOoA2FweQ7du0YwBWAwASrs4je2Bv7fMKD41lp5s3rRHe4C7rLgW78hZM9IvPKMU5cuHHiPBbTLf
aPvkYhhLoIujEKMdGrexRnpUtltEjZ/Fx8kGOgvTLJoq3a216iASp0FYdmXgbal3TLykuAtpSfrh
OWjGBA0XrzI4K01hn1RYCgGLmsKY8VQ6W0RN5msLNBoBJ/5wtW+IHACzPnZa1HQDxXi8oyBwAK9s
NxA5FKuBKIlaDxgD40hhyp6nx3uBXdNLTYIIgWoYkjCBdynUMbv0Kd0ZQr2u5RRFxz2MCaV4PyO3
fGtOf5ERxIeyZXPW/eOHAdCrEPqqBTIveeCREJ1e5dQp0VVpzaa2ZOJOPOKNeKda+kVfoTDidJcs
2mCI4ZSNsqCKofklJJEya98XXOITKwBXi4aQmFBpPMEC3jUrkGcRaFpkKzyoN+YfTbwWgh4rAkdp
QwsSW3Zgt9WjjC3vyOMjmZnEBmm4GgWbSncqRP06v4m8/8XckU4UJBzwPvaA


--===============0409126549==--