From: marko.makela
Date: November 11 2010 1:18pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3657 to 3658) Bug#57802
List-Archive: http://lists.mysql.com/commits/123611
X-Bug: 57802
Message-Id: <201011111319.oABDBVDa025053@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0384070801=="

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

IDM2NTggTWFya28gTcOka2Vsw6QJMjAxMC0xMS0xMQogICAgICBGaXggYSBkZWJ1ZyBhc3NlcnRp
b24gZmFpbHVyZSBpbiB0aGUgQnVnIzU3ODAyIGZpeC4KICAgICAgCiAgICAgIHRocl9sb2NhbF9j
cmVhdGUoKTogSW5pdGlhbGl6ZSBsb2NhbC0+c2xvdF9ubyB0byBVTElOVF9VTkRFRklORUQuCiAg
ICAgIHRocl9sb2NhbF92YWxpZGF0ZSgpOiBBbGxvdyBsb2NhbC0+c2xvdF9ubyB0byBiZSBVTElO
VF9VTkRFRklORUQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi90
aHIvdGhyMGxvYy5jCiAzNjU3IFZhc2lsIERpbW92CTIwMTAtMTEtMTEKICAgICAgUmVtb3ZlIHVu
dXNlZCBwYXJhbWV0ZXIgaGFzX2RpY3RfbXV0ZXggb2YgZGljdF91cGRhdGVfc3RhdGlzdGljc19s
b3coKQogICAgICAKICAgICAgQWxzbyBkZWxldGUgZGljdF91cGRhdGVfc3RhdGlzdGljcygpIGFu
ZCByZW5hbWUgZGljdF91cGRhdGVfc3RhdGlzdGljc19sb3coKQogICAgICB0byBkaWN0X3VwZGF0
ZV9zdGF0aXN0aWNzKCkgYmVjYXVzZSB0aGUgb25seSB0aGluZyB0aGF0IGRpc3Rpbmd1aXNoZWQg
dGhvc2UKICAgICAgdHdvIGZ1bmN0aW9ucyB3YXMgdGhlIHJlbW92ZWQgcGFyYW1ldGVyLgoKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGRpY3QuYwog
ICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGxvYWQuYwogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vaW5jbHVkZS9kaWN0MGRpY3QuaAo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL3Roci90aHIwbG9jLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi90aHIvdGhyMGxvYy5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDExMTEx
MTExNTItZ285cjFsZ2J0cHZjbWZkMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vdGhyL3Ro
cjBsb2MuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTExMTEzMTIzOS13b3Ns
NjJ1ZmRjemoycGs3CkBAIC04Miw3ICs4Miw4IEBAIHRocl9sb2NhbF92YWxpZGF0ZSgKIAljb25z
dCB0aHJfbG9jYWxfdCoJbG9jYWwpCS8qITwgaW46IGRhdGEgdG8gdmFsaWRhdGUgKi8KIHsKIAl1
dF9hZChsb2NhbC0+bWFnaWNfbiA9PSBUSFJfTE9DQUxfTUFHSUNfTik7Ci0JdXRfYWQobG9jYWwt
PnNsb3Rfbm8gPCBPU19USFJFQURfTUFYX04pOworCXV0X2FkKGxvY2FsLT5zbG90X25vID09IFVM
SU5UX1VOREVGSU5FRAorCSAgICAgIHx8IGxvY2FsLT5zbG90X25vIDwgT1NfVEhSRUFEX01BWF9O
KTsKIAl1dF9hZChsb2NhbC0+aW5faWJ1ZiA9PSBGQUxTRSB8fCBsb2NhbC0+aW5faWJ1ZiA9PSBU
UlVFKTsKIAlyZXR1cm4oVFJVRSk7CiB9CkBAIC0yMDYsNyArMjA3LDcgQEAgdGhyX2xvY2FsX2Ny
ZWF0ZSh2b2lkKQogCWxvY2FsLT5pZCA9IG9zX3RocmVhZF9nZXRfY3Vycl9pZCgpOwogCWxvY2Fs
LT5oYW5kbGUgPSBvc190aHJlYWRfZ2V0X2N1cnIoKTsKIAlsb2NhbC0+bWFnaWNfbiA9IFRIUl9M
T0NBTF9NQUdJQ19OOwotCisJbG9jYWwtPnNsb3Rfbm8gPSBVTElOVF9VTkRFRklORUQ7CiAJbG9j
YWwtPmluX2lidWYgPSBGQUxTRTsKIAogCW11dGV4X2VudGVyKCZ0aHJfbG9jYWxfbXV0ZXgpOwoK

--===============0384070801==
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:18:56 +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


--===============0384070801==--