From: marko.makela
Date: June 22 2010 12:05pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3113) Bug#54686
List-Archive: http://lists.mysql.com/commits/111769
X-Bug: 54686
Message-Id: <201006221205.o5MBKGP8028490@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1822488334=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjEwNDMxNy01eGwz
c3V3cDFocWp0ZDgwCgogMzExMyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIE1lcmdl
IEJ1ZyM1NDY4NiBmaXggZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAtLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2
bm86IDM1MTcKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjIyMTE1MjE1LWt4dHp4N3h1dWdjeGQzNzUKICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDYyMTA5NTE0OC04ZzczazhrNjhkcGowODB1CiAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmlj
azogNS4xLWlubm9kYgogICAgICB0aW1lc3RhbXA6IFR1ZSAyMDEwLTA2LTIyIDE0OjUyOjE1ICsw
MzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAgQnVnIzU0Njg2ICJmaWVsZC0+Y29sLT5tdHlwZSA9
PSB0eXBlIiBhc3NlcnRpb24gZXJyb3IgYXQgcm93L3JvdzBzZWwuYwogICAgICAgIGhhX2lubm9i
YXNlOjppbmRleF9yZWFkKCksIGhhX2lubm9iYXNlOjpyZWNvcmRzX2luX3JhbmdlKCk6IENoZWNr
IHRoYXQKICAgICAgICB0aGUgaW5kZXggaXMgdXNlYWJsZSBiZWZvcmUgaW52b2tpbmcgcm93X3Nl
bF9jb252ZXJ0X215c3FsX2tleV90b19pbm5vYmFzZSgpLgogICAgICAKICAgICAgICBUaGlzIGZp
eCBpcyBiYXNlZCBvbiBhIHN1Z2dlc3Rpb24gYnkgWWFzdWZ1bWkgS2lub3NoaXRhLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAwNjIyMTA0MzE3LTV4bDNzdXdwMWhxanRkODAKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDYyMjEyMDUzMy15a2k3bDR1bzVrdzBmdTZlCkBAIC01NTY4LDYgKzU1NjgsOSBA
QCBoYV9pbm5vYmFzZTo6aW5kZXhfcmVhZCgKIAkJcHJlYnVpbHQtPmluZGV4X3VzYWJsZSA9IEZB
TFNFOwogCQlEQlVHX1JFVFVSTihIQV9FUlJfQ1JBU0hFRCk7CiAJfQorCWlmIChVTklWX1VOTElL
RUxZKCFwcmVidWlsdC0+aW5kZXhfdXNhYmxlKSkgeworCQlEQlVHX1JFVFVSTihIQV9FUlJfVEFC
TEVfREVGX0NIQU5HRUQpOworCX0KIAogCS8qIE5vdGUgdGhhdCBpZiB0aGUgaW5kZXggZm9yIHdo
aWNoIHRoZSBzZWFyY2ggdGVtcGxhdGUgaXMgYnVpbHQgaXMgbm90CiAJbmVjZXNzYXJpbHkgcHJl
YnVpbHQtPmluZGV4LCBidXQgY2FuIGFsc28gYmUgdGhlIGNsdXN0ZXJlZCBpbmRleCAqLwpAQCAt
NzQxMCw2ICs3NDEzLDEwIEBAIGhhX2lubm9iYXNlOjpyZWNvcmRzX2luX3JhbmdlKAogCQluX3Jv
d3MgPSBIQV9QT1NfRVJST1I7CiAJCWdvdG8gZnVuY19leGl0OwogCX0KKwlpZiAoVU5JVl9VTkxJ
S0VMWSghcm93X21lcmdlX2lzX2luZGV4X3VzYWJsZShwcmVidWlsdC0+dHJ4LCBpbmRleCkpKSB7
CisJCW5fcm93cyA9IEhBX0VSUl9UQUJMRV9ERUZfQ0hBTkdFRDsKKwkJZ290byBmdW5jX2V4aXQ7
CisJfQogCiAJaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSgyICogKGtleS0+a2V5X3BhcnRzICogc2l6
ZW9mKGRmaWVsZF90KQogCQkJCSAgICArIHNpemVvZihkdHVwbGVfdCkpKTsKCg==

--===============1822488334==
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:39 +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==


--===============1822488334==--