From: marko.makela
Date: November 11 2010 1:18pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3225 to 3226)
List-Archive: http://lists.mysql.com/commits/123613
Message-Id: <201011111319.oABBWiJV030151@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0441871309=="

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

IDMyMjYgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0xMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS90aHIvdGhyMGxvYy5jCiAzMjI1IFZhc2lsIERpbW92CTIwMTAtMTEtMTEg
W21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIC0+IG15c3FsLTUuNS1pbm5vZGIK
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwogICAgICBzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZGljdDBkaWN0LmgKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvdGhyL3RocjBsb2MuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90aHIvdGhyMGxvYy5jCXJl
dmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDExMTExMTI1MzUtZWN6aXJiZ3lsOG1pemJz
aQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Roci90aHIwbG9jLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDExMTExMzEzNTItbGhyMTA2NXlnOW85MDJmawpAQCAtODcsNyArODcs
OCBAQCB0aHJfbG9jYWxfdmFsaWRhdGUoCiAJY29uc3QgdGhyX2xvY2FsX3QqCWxvY2FsKQkvKiE8
IGluOiBkYXRhIHRvIHZhbGlkYXRlICovCiB7CiAJdXRfYWQobG9jYWwtPm1hZ2ljX24gPT0gVEhS
X0xPQ0FMX01BR0lDX04pOwotCXV0X2FkKGxvY2FsLT5zbG90X25vIDwgT1NfVEhSRUFEX01BWF9O
KTsKKwl1dF9hZChsb2NhbC0+c2xvdF9ubyA9PSBVTElOVF9VTkRFRklORUQKKwkgICAgICB8fCBs
b2NhbC0+c2xvdF9ubyA8IE9TX1RIUkVBRF9NQVhfTik7CiAJdXRfYWQobG9jYWwtPmluX2lidWYg
PT0gRkFMU0UgfHwgbG9jYWwtPmluX2lidWYgPT0gVFJVRSk7CiAJcmV0dXJuKFRSVUUpOwogfQpA
QCAtMjExLDcgKzIxMiw3IEBAIHRocl9sb2NhbF9jcmVhdGUodm9pZCkKIAlsb2NhbC0+aWQgPSBv
c190aHJlYWRfZ2V0X2N1cnJfaWQoKTsKIAlsb2NhbC0+aGFuZGxlID0gb3NfdGhyZWFkX2dldF9j
dXJyKCk7CiAJbG9jYWwtPm1hZ2ljX24gPSBUSFJfTE9DQUxfTUFHSUNfTjsKLQorCWxvY2FsLT5z
bG90X25vID0gVUxJTlRfVU5ERUZJTkVEOwogCWxvY2FsLT5pbl9pYnVmID0gRkFMU0U7CiAKIAlt
dXRleF9lbnRlcigmdGhyX2xvY2FsX211dGV4KTsKCg==

--===============0441871309==
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.5-innodb/
# testament_sha1: b709a43a0c77eab089fe62576ae9214817402217
# timestamp: 2010-11-11 15:19:06 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   eczirbgyl8mizbsi
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa4uvJwAA0JflHQwWmP//3dn
nkC////0BAAIAFAF+9QocoNgHdgCosMqh5R6g0ANAGnlDQAAAAAAJJI0YmjU09TSaZTJoZGgAAAA
AAlNKnpPRT9UPKZqBiaAaAA0BpkAA0HGTJpphMjIGBGJowRhBo0wACCSRMgRppoGSemgRM1GpjRN
P0U0ZNHplPRFTDEU0W2XtK1fLyF4+BdOouly/ckEBasaWIpopk6DPZ5fsrrkKIupsWqm0yE4wmZv
p80f48iQqrfVLGChSh1M46dVKvKI28Sc3cDwf7yQxW7Jn3vwyQyr9VFx5sIoef1v1dASmkqg6OYB
8jgLHCiGIwr936Hh9hfcBYxfc3CZEoty1rScTTIzSCz+I+8oEYdrpC5ibWLSIWQUtfQCMd1pZknc
53GqCFYDVcmWgYBdkAFlExMWkfboF1dmOAsJxY3FBj9tz4jJMhRwEFTFyeSUh6GwjbQzgNb1EGhF
2Vh3RPWS6jTEBZ3UiuNgZPWS5ABMAs8hAeLUZq4vEYiBskMZATiUXM8igug0mNw9cxSS56qbHFZQ
ERgMhsl7HmbooVGS6N6DPXINeApaml1vBT5C/4rKRmJSkVTkrzmMcxELyeoXkI3CIX5apNGXRccA
C668rANYsnkBUKRSIzFwCGURjdgPGNBgdLGJa5riM08szHkmLgvE4xJ7hX289VdheStWwafezUx5
qAqaFB9e8WGPI82/6xoKCOfwoFix6HAOGJit2nWNaW2zWOzERxu45Oq8bAVNOKA8VYzkTLUWYC3z
1kToK4ONGg42lRSvkVKJczcifZPMzFAx20Q6Ar1wFnsI7rDLJRe4cxCy7UQeVMeS8jqMrKm02DoW
3J49q5ivEQ6RY4QxFQkb8Lsr51K2wyoFTVUyx182NCnOLYsv36iWmI5Mxm0hpDGwiNZKgKywEw4y
IimChmjOIoGgNxS0+4EYVzmgNxUep7M8huOR3G9FgrxB+BMfz/c9dKYZDEj2D5B9PGLw0BAPZiEe
X2DxCnzD0lTxzw8gH+XnDGEgOCur09Kgw9zGYwGS+A9HP7OCOPoOvsGiLix2nUKHZ8Bw6gEdd/5+
uUQrs3xM5Ili5AiRLs7y0tJTViEcicETCucranHN+uoTnWmo5+8edw6SLmoeJ9PxgZV46zWuao/c
7hDB3isS9+Wx9Qsxw31RE+PMoS3CzCfCNPfHcb9zDCFgrBCqKOOhVCGlzbDEtPE6h5Cm021j8qJx
aJqZBqtswp21FsXHyFOEPnIwkyAUCuA2C7EEN7SdDFrdCACWCc0mbTCUR0v12uZxI7JA2hMdMilT
Km/cuNxjoUWpi84jgex9C7S408PwPCUSKqw6RMKu3ScunAbAvCYCInEwth0uKi6yBYb9AvnQuBDr
EcArDzPUULZlEzl1hMafEXqWreg6VxW1XgaL8TApxMViZQXQOpKyk5CmcQNgTC0iySBILMb0scwe
WorJCakDeuAFew8K3LLKNKI/NsVaxOJnGsQ7QCPQ1JWiROSIwFrAqEFQ4L0wQGBEDEITB0q4UFpP
ltOIsPxg4sK0VrHkPaIXaCNp9TuGchhwzuBajMPJw0raetUkgokQwykkGYLWB5EkSeZHQPnqE54Z
0ThtlESMJhbZF1HUnDgRyF3K5CtDTQEooOgsX5EKSWCMXC8wiSK7hOY26hhhOCQ9faI9KLZSlde8
v/UQa7ky1PKkAewtU3wETOkqEjkeJEkUs1D1baJhcHai0k7lHBAopCoBYQNGGYwEeRGwmQYkA7EY
1uL0aBQeOJGYbhu+I6DQvI6+UyBoKaWItiZ4oOFEuz6xEv7YEwqMvKoV1QuhZBWgQwvEWFkBNA5A
WHQoNqJcIKh89/gJY0j+LuSKcKEhXF15OA==


--===============0441871309==--