From: marko.makela
Date: October 27 2010 7:43pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3292 to 3293)
List-Archive: http://lists.mysql.com/commits/122147
Message-Id: <201010271944.o9RJdSuq017278@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0751779796=="

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

IDMyOTMgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMKIDMyOTIgVmFzaWwgRGltb3YJMjAxMC0xMC0y
NyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgLT4gbXlzcWwtdHJ1bmstaW5u
b2RiIChlbXB0eSkKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYw
YnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTAxMDI3MTM1NTM5LTQwMjMwemhlbWl3c2lmdGMKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTAxMDI3MTk0MjE4LWtldDZrN3UzanFkOTdrdXIKQEAgLTEzMTUsNyArMTMxNSw4IEBAIGJ1
Zl9wb29sX2luaXQoCiAJdWxpbnQJCWk7CiAJY29uc3QgdWxpbnQJc2l6ZQk9IHRvdGFsX3NpemUg
LyBuX2luc3RhbmNlczsKIAotCXV0X2FkKG5faW5zdGFuY2VzIDwgTUFYX0JVRkZFUl9QT09MUyk7
CisJdXRfYWQobl9pbnN0YW5jZXMgPiAwKTsKKwl1dF9hZChuX2luc3RhbmNlcyA8PSBNQVhfQlVG
RkVSX1BPT0xTKTsKIAl1dF9hZChuX2luc3RhbmNlcyA9PSBzcnZfYnVmX3Bvb2xfaW5zdGFuY2Vz
KTsKIAogCS8qIFdlIGNyZWF0ZSBhbiBleHRyYSBidWZmZXIgcG9vbCBpbnN0YW5jZSwgdGhpcyBp
bnN0YW5jZSBpcyB1c2VkCgo=

--===============0751779796==
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.6-innodb/
# testament_sha1: 247b5d4dde946c8d5dd8810d9a3f4f46cb74def2
# timestamp: 2010-10-27 22:43:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   40230zhemiwsiftc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbDu/+EAA1tflAAwWmP//3Mm
2kC////wBAAIAFAF7XjQ6SNtvb09sB6AYSUhlTwp4oPU9T2lNDR6Q0aPUDTI9TIMgSUTVP1Npop4
1TxTT0QaAAGgAAASKSZoKPaKHqBpoAAAA9QAAj1RTQYgBpoGgAGgGQDJoASSEZATJppo0CZGQU2T
SaMgNBoYV0TU0PGsNPmYF5YWTTVhVFbDC2kVDCNiVLn2xDa6achRTV214FpSMbbWgY94e05PEg3c
7ndCLmvhQyGBhqW0YacMnUbMR17K9PxNgtUhFZFLaS9EAhvy66PHZiDEyKoyNQhz3C7XiiHHpCxH
h3foWejOoF/ICvWAuLhSF36zQa72hMLpFYm4piIm675XzBcLaIUhRukCKtuRptoc51Vtk4hmZu8Z
eLy4HIFABbAnRHpcoLKTgLBIdI6BDhAqFhUYPLEjKweMJkURExZaQIeop+7zWkLJOFzHALqwC+VV
/mcTiGTzJw8kKgqB2rZqcoGgWNhd2FePnIfYsJtHyFqI6M8xWiLuMzxMZBcb3CwiYGGGNGVWZWbD
MQ1q01On1m4BUECAp7mrWDDZOAV492BrVAmg+9qVxpGGkRhLOYRNqoRoxENulJVkycdU9aRk+BUL
VJ7J01oqRGseP/sXO5Q2pgyGKdo6QmnWZCanQItjNnB5FkQCIqJFQqR+NTjTFptDhGTKNplCKE6t
0TOVvqWxbuCdamkN9hAeUTsmJyXY8VGZ5krqAcQaVieUjctkaJ572YiKbnXUlVBKki8eXzimywrv
xNKLxPkeIrVqJqxrMGLX5UmIwkQYkK+1hRlB+O5VK8dIvFaWZuFuExZYJhWUGg3CorV1o4diUCGK
JRULitRNCcxC4hQONuZOJWtMVahoyJSlnRFJKJYas0JTlAGfCYjCZs1gVO28IYvpxlLio1S8Wswk
wgSHEhjx4EiYIjhMRGmCSUZDGkUBUmS9AY9jgXleoGcckzeob5SbxcLA+xMQeatsbGNDPleVWTEX
wmkEvy4hQsULIxkZGIyHIREhIWwppaTMoRYZ+3pOFjgPI5Jd4jGg+adz8IWgj7vHfX3ELajfG28a
lcCNHEVJRF0wi43ARkFxwIxcN4mZnp/JU4nI/CJsFOQK8zsKImDzPLOf5j0DBYKPv7MREcxDYZr4
jj3FjrkKp4GkWDtfz4o6sdxbM4YQsBCylpFyKi/QXmEiJYVlpYiAsU0pvzL8FbEVegkYZxZuWakT
sgPFKSZTs1Tx0NBKyGF3M+Ocqga5ptWXodjOoY7mZ2gqSrH1cqxFkr6YluongXFNDjkcbOBtj52H
S1xYfYcH1EiIRD0EwvXHbrPh25jbUczgFgqgJCec8xViYVzC8selbp5ob0siXAT3hoD6HkdVwZeZ
MmKjDig8sOxrY1DO2p+0BnwVLG5Q0I1E6rN15YewmJjYFiDITweLUb0q5SBke+RpJiioC/kBb9+S
PjfE9PEWUkmOnQXAEf0YixSzJMCIi3exzE4C0C04vA9ebgRziXiEwu1zdJWF9RWAoJnOCMxidg4I
ZAbu4xRYPLQ3lSpHimJgt7CPAmnZgO9DyKUEoDaBopUeLw0gyHiGYTC5dTqyEWThdZ7WbASpQdjO
K6L+BCsStRM4VDpawK9YwwnBMi/pH7YxMF9xdDt4Tm5lUHysQBsITCKjvLwkXTCRJGD7yZQ/H2U6
TxQRU+4eVubkMqT8FWLIB5I9WGY/opJ2O5HlSBCiBMJ5Yh5+YWpcFweVrEKyqL6TT3FoNCZKtKAs
JninkfAUL8lg8kIbakH0bApglZ1Fncf6zTivFeLYBvwRjkI5J4hwrxHBviiMdsqyrbIfwTmc/xdy
RThQkLDu/+E=


--===============0751779796==--