From: marko.makela
Date: June 22 2010 12:05pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3112 to 3113) Bug#54686
List-Archive: http://lists.mysql.com/commits/111771
X-Bug: 54686
Message-Id: <201006221206.o5MB59kL019963@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1477544925=="

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

IDMxMTMgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMgogICAgICBNZXJnZSBCdWcjNTQ2ODYgZml4
IGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAzNTE3CiAgICAg
IHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjExNTIxNS1reHR6
eDd4dXVnY3hkMzc1CiAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MjEwOTUxNDgtOGc3M2s4azY4ZHBqMDgwdQogICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtlbMOk
IDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIK
ICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0wNi0yMiAxNDo1MjoxNSArMDMwMAogICAgICBtZXNz
YWdlOgogICAgICAgIEJ1ZyM1NDY4NiAiZmllbGQtPmNvbC0+bXR5cGUgPT0gdHlwZSIgYXNzZXJ0
aW9uIGVycm9yIGF0IHJvdy9yb3cwc2VsLmMKICAgICAgICBoYV9pbm5vYmFzZTo6aW5kZXhfcmVh
ZCgpLCBoYV9pbm5vYmFzZTo6cmVjb3Jkc19pbl9yYW5nZSgpOiBDaGVjayB0aGF0CiAgICAgICAg
dGhlIGluZGV4IGlzIHVzZWFibGUgYmVmb3JlIGludm9raW5nIHJvd19zZWxfY29udmVydF9teXNx
bF9rZXlfdG9faW5ub2Jhc2UoKS4KICAgICAgCiAgICAgICAgVGhpcyBmaXggaXMgYmFzZWQgb24g
YSBzdWdnZXN0aW9uIGJ5IFlhc3VmdW1pIEtpbm9zaGl0YS4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwogMzExMiBNYXJrbyBNw6RrZWzD
pAkyMDEwLTA2LTIyCiAgICAgIGJ1Zl9mbHVzaF9pbnNlcnRfaW5fZmx1c2hfcmJ0KCksIGJ1Zl9m
bHVzaF92YWxpZGF0ZV9sb3coKToKICAgICAgU2lsZW5jZSBHQ0Mgd2FybmluZ3MgYWJvdXQgZGVy
ZWZlcmVuY2luZyBhIHR5cGUtcHVubmVkIHBvaW50ZXIuCiAgICAgIEFwcHJvdmVkIGJ5IEppbW15
IFlhbmcuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUu
Ywo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5j
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjEwNDMxNy01eGwzc3V3cDFocWp0ZDgwCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA2MjIxMjA1MzMteWtpN2w0dW81a3cwZnU2ZQpAQCAtNTU2OCw2ICs1
NTY4LDkgQEAgaGFfaW5ub2Jhc2U6OmluZGV4X3JlYWQoCiAJCXByZWJ1aWx0LT5pbmRleF91c2Fi
bGUgPSBGQUxTRTsKIAkJREJVR19SRVRVUk4oSEFfRVJSX0NSQVNIRUQpOwogCX0KKwlpZiAoVU5J
Vl9VTkxJS0VMWSghcHJlYnVpbHQtPmluZGV4X3VzYWJsZSkpIHsKKwkJREJVR19SRVRVUk4oSEFf
RVJSX1RBQkxFX0RFRl9DSEFOR0VEKTsKKwl9CiAKIAkvKiBOb3RlIHRoYXQgaWYgdGhlIGluZGV4
IGZvciB3aGljaCB0aGUgc2VhcmNoIHRlbXBsYXRlIGlzIGJ1aWx0IGlzIG5vdAogCW5lY2Vzc2Fy
aWx5IHByZWJ1aWx0LT5pbmRleCwgYnV0IGNhbiBhbHNvIGJlIHRoZSBjbHVzdGVyZWQgaW5kZXgg
Ki8KQEAgLTc0MTAsNiArNzQxMywxMCBAQCBoYV9pbm5vYmFzZTo6cmVjb3Jkc19pbl9yYW5nZSgK
IAkJbl9yb3dzID0gSEFfUE9TX0VSUk9SOwogCQlnb3RvIGZ1bmNfZXhpdDsKIAl9CisJaWYgKFVO
SVZfVU5MSUtFTFkoIXJvd19tZXJnZV9pc19pbmRleF91c2FibGUocHJlYnVpbHQtPnRyeCwgaW5k
ZXgpKSkgeworCQluX3Jvd3MgPSBIQV9FUlJfVEFCTEVfREVGX0NIQU5HRUQ7CisJCWdvdG8gZnVu
Y19leGl0OworCX0KIAogCWhlYXAgPSBtZW1faGVhcF9jcmVhdGUoMiAqIChrZXktPmtleV9wYXJ0
cyAqIHNpemVvZihkZmllbGRfdCkKIAkJCQkgICAgKyBzaXplb2YoZHR1cGxlX3QpKSk7Cgo=

--===============1477544925==
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: d5b3c0e1856810e69fa8e03f409275bc736ca245
# timestamp: 2010-06-22 15:05:53 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   5xl3suwp1hqjtd80
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaoRGsUAAgjflAAwem///3/v
FyC////6BAAIAFAE/cb3ugqw7j2FDeu8JJEAjJPTRPTRGJPwp6o9JoNDTI0AAZAyRMTETyaqe9CG
ommnlA0GgDIMgAAMpimIU/TQp6p5qepPU8oaNMGoGQ09QDTanqGmgxUyk/Sh+kMnqnqbUyeU00PU
B6mgZBoAAAJST1GSj9JppqaGg0MQNA9TTTR6hkaaA2p6giggkPvWV6DBdhr/gXjl6RQKpG+zGmfD
ouI90A+mKli3s0NNGrreAuwShw3VOc49n1G+0JzwnDDzIkQIRev+G6nS6PJUmQoTutv/dVTB2Ze2
HdXXy9lKOoEhus2wmp4Nu1ROWF3ENYyu8QlkqxISlDIPFZ7RbAfeJTRYEdmmet7Nxe0U3qwFtwX6
xUeC4s/LEz1aO2GJvuxFTohHvdNmWoSdf4kEW5K9a7b2oQMLJhglUEnhQTAizFBkUIhGpciAYs/L
3CgYyCINqKKxUREEs23HAmy4YBiFXOO+8g8tp2dCejwjUzUq0TvigFqWx8nDHEyGe3+Xvrln8Gwp
HQdzBrhzVg8TQ6Co2i9udDfAWPF2gBUDLWwqQmFmLWAh14dRrsXQNIsA3dKdJExaM+E6XSJwWVXg
pGDuLMoqgyKHfdTQt4wsVRlqKikziqYTUhvC8zIagVwboknV2DTGWdMrIWtB6RKFxUZ68C44SWAo
sEsgcD/ZWUiIrSKEh9RK/HHM1Ha7DwHyPpBS5AIjNVRJFlvXnC3XmARjKR8YPRjI3yM2MCkzWhhm
sDZ7Wi+xhO5j631esyjqGooMsZBl9vHpHftppPwcm/my11SoUkQglwJjg66GAGTB6F1EUeKgI0uy
La7p6xpPsW8X2O1q/LDReYxJ0/byCaT3CQmYMM5raJSsZAZ1HfA0+iEq0kZMhlPz7POVxEVC4hTU
F4xg+ceFhjSEUgiI3kJrvJBtRGPJ3lZjx4Nm/7HZvIQuYHo53dHmWKI0NJ16Rwcyb9JNTZQRqGXE
WrR30iIsgzrG5Bw0KEE8a6iAnTapxd5IhUh56/tLC9jGnjTLIVlXb2RVmuSDcrug2sXE+fx6Cy7r
YQoXoUvEDCp5NzKGyBaepo4pyUFAn7uBOE/I7rQO3s5djOG8X2ikjugd5Xm4Bg0BX0F7SOo8BVZn
3Iw4hstxxHbtsaMmtAAWlaXTExkyDxAd3fO6+FI4h1y6gliZht0X4SmoUR2xaUKYg3wIOBC4aylU
ubVWY2TXy7H5YQ15RZEW5FRFGQrTdgaB607SM7u/DQtdjjc0wnXPhcWtpfQOYOOD32mZrAmOopZW
FHb1x3rQGzTIcgqjQeQ2ptcWg2nRRCqyJQ6ZcoOKn30wvU7Jj3dm6SOXIUIdwaa9HTBWZyPx8/gt
5YmusdchfszdQKA5KiTkBwPbirRsU58wYAQaRGgTkjQlBMQxrPy3QEshQkvQhbd6b5nQM+0rU+qC
idUbycfGRHPPLDEA2MEshAgZQuHa4YVAgu5kDqhMyZSNbiYMhWyikgZBVNrcwBlmS3vgX4EpAflD
B6mo6a5UN1pp9VjnJ5gZJd7uKrw4S8FgS8mxJwgvNzhspJEJMBgEtLWElxxysfV/LNTIAPeAhx3G
qWaxQOkVp5ar3uGpd59RC1GvEbwe40gJYmkqfONArVMOQNaNxWwRD0D5vu2JBdmCwLwGHg1Z1Dsx
1V3A157vYNiuMNN56AWyh72GaaUCgFMrBRkKvC0H44jtqwox2TOLdgJdNopu2CJr3WznP4OA8D/F
3JFOFCQqhEaxQA==


--===============1477544925==--