From: marko.makela
Date: November 11 2010 1:15pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3226)
List-Archive: http://lists.mysql.com/commits/123608
Message-Id: <201011111315.oABDBVDO025053@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1211537553=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAxMTExMTEyNTM1LWVjemly
Ymd5bDhtaXpic2kKCiAzMjI2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTEtMTEgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIHRvIG15c3FsLTUuNS1pbm5vZGIuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdGhyL3RocjBsb2MuYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS90aHIvdGhyMGxvYy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3Roci90aHIwbG9jLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMTExMTExMjUz
NS1lY3ppcmJneWw4bWl6YnNpCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdGhyL3RocjBsb2MuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTExMTEzMTM1Mi1saHIxMDY1eWc5bzkw
MmZrCkBAIC04Nyw3ICs4Nyw4IEBAIHRocl9sb2NhbF92YWxpZGF0ZSgKIAljb25zdCB0aHJfbG9j
YWxfdCoJbG9jYWwpCS8qITwgaW46IGRhdGEgdG8gdmFsaWRhdGUgKi8KIHsKIAl1dF9hZChsb2Nh
bC0+bWFnaWNfbiA9PSBUSFJfTE9DQUxfTUFHSUNfTik7Ci0JdXRfYWQobG9jYWwtPnNsb3Rfbm8g
PCBPU19USFJFQURfTUFYX04pOworCXV0X2FkKGxvY2FsLT5zbG90X25vID09IFVMSU5UX1VOREVG
SU5FRAorCSAgICAgIHx8IGxvY2FsLT5zbG90X25vIDwgT1NfVEhSRUFEX01BWF9OKTsKIAl1dF9h
ZChsb2NhbC0+aW5faWJ1ZiA9PSBGQUxTRSB8fCBsb2NhbC0+aW5faWJ1ZiA9PSBUUlVFKTsKIAly
ZXR1cm4oVFJVRSk7CiB9CkBAIC0yMTEsNyArMjEyLDcgQEAgdGhyX2xvY2FsX2NyZWF0ZSh2b2lk
KQogCWxvY2FsLT5pZCA9IG9zX3RocmVhZF9nZXRfY3Vycl9pZCgpOwogCWxvY2FsLT5oYW5kbGUg
PSBvc190aHJlYWRfZ2V0X2N1cnIoKTsKIAlsb2NhbC0+bWFnaWNfbiA9IFRIUl9MT0NBTF9NQUdJ
Q19OOwotCisJbG9jYWwtPnNsb3Rfbm8gPSBVTElOVF9VTkRFRklORUQ7CiAJbG9jYWwtPmluX2li
dWYgPSBGQUxTRTsKIAogCW11dGV4X2VudGVyKCZ0aHJfbG9jYWxfbXV0ZXgpOwoK

--===============1211537553==
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:15:27 +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==


--===============1211537553==--