From: marko.makela
Date: May 4 2010 12:48pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3438 to 3439)
List-Archive: http://lists.mysql.com/commits/107362
Message-Id: <201005041248.o44CG8St014355@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0620298492=="

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

IDM0MzkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBBZGQgVmFsZ3JpbmQgY2hlY2tz
IHRvIGNhdGNoIHVuaW5pdGlhbGl6ZWQgd3JpdGVzIHRvIGRhdGEgZmlsZXMuCiAgICAgIGJ1Zl9m
bHVzaF9pbnNlcnRfaW50b19mbHVzaF9saXN0KCksCiAgICAgIGJ1Zl9mbHVzaF9pbnNlcnRfc29y
dGVkX2ludG9fZmx1c2hfbGlzdCgpLAogICAgICBidWZfZmx1c2hfcG9zdF90b19kb3VibGV3cml0
ZV9idWYoKTogQ2hlY2sgdGhhdCB0aGUgcGFnZSBpcyBpbml0aWFsaXplZC4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwZmx1LmMKIDM0MzggTWFya28g
TcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBSZW1vdmUgVU5JVl9CVFJfQVZPSURfQ09QWS4gSXQg
d2FzIGJyb2tlbiBiZWNhdXNlIGJ0cl9hdHRhY2hfaGFsZl9wYWdlcygpCiAgICAgIHdvdWxkIGdl
dCB0aGUgYmxvY2ssIG5ld19ibG9jayBpbiB0aGUgd3Jvbmcgb3JkZXIuCiAgICAgIEZpeGluZyB0
aGF0IHdvdWxkIGhhdmUgY29tcGxpY2F0ZWQgdGhlIGZ1bmN0aW9uIGV2ZW4gZnVydGhlcgogICAg
ICBmb3IgdGhpcyBtYXJnaW5hbCBjYXNlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRy
MGJ0ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaQo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwZmx1LmMnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGZsdS5jCTIwMTAtMDQtMDcgMDY6MjE6MjYgKzAw
MDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwZmx1LmMJMjAxMC0wNS0wNCAx
Mjo0Nzo0NCArMDAwMApAQCAtMjQ5LDYgKzI0OSwxNyBAQCBidWZfZmx1c2hfaW5zZXJ0X2ludG9f
Zmx1c2hfbGlzdCgKIAl1dF9kKGJsb2NrLT5wYWdlLmluX2ZsdXNoX2xpc3QgPSBUUlVFKTsKIAlV
VF9MSVNUX0FERF9GSVJTVChsaXN0LCBidWZfcG9vbC0+Zmx1c2hfbGlzdCwgJmJsb2NrLT5wYWdl
KTsKIAorI2lmZGVmIFVOSVZfREVCVUdfVkFMR1JJTkQKKwl7CisJCXVsaW50CXppcF9zaXplID0g
YnVmX2Jsb2NrX2dldF96aXBfc2l6ZShibG9jayk7CisKKwkJaWYgKFVOSVZfVU5MSUtFTFkoemlw
X3NpemUpKSB7CisJCQlVTklWX01FTV9BU1NFUlRfUlcoYmxvY2stPnBhZ2UuemlwLmRhdGEsIHpp
cF9zaXplKTsKKwkJfSBlbHNlIHsKKwkJCVVOSVZfTUVNX0FTU0VSVF9SVyhibG9jay0+ZnJhbWUs
IFVOSVZfUEFHRV9TSVpFKTsKKwkJfQorCX0KKyNlbmRpZiAvKiBVTklWX0RFQlVHX1ZBTEdSSU5E
ICovCiAjaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CVUZfREVCVUcKIAl1
dF9hKGJ1Zl9mbHVzaF92YWxpZGF0ZV9sb3coKSk7CiAjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBV
TklWX0JVRl9ERUJVRyAqLwpAQCAtMjc2LDYgKzI4NywxOCBAQCBidWZfZmx1c2hfaW5zZXJ0X3Nv
cnRlZF9pbnRvX2ZsdXNoX2xpc3QoCiAJdXRfYWQoIWJsb2NrLT5wYWdlLmluX2ZsdXNoX2xpc3Qp
OwogCXV0X2QoYmxvY2stPnBhZ2UuaW5fZmx1c2hfbGlzdCA9IFRSVUUpOwogCisjaWZkZWYgVU5J
Vl9ERUJVR19WQUxHUklORAorCXsKKwkJdWxpbnQJemlwX3NpemUgPSBidWZfYmxvY2tfZ2V0X3pp
cF9zaXplKGJsb2NrKTsKKworCQlpZiAoVU5JVl9VTkxJS0VMWSh6aXBfc2l6ZSkpIHsKKwkJCVVO
SVZfTUVNX0FTU0VSVF9SVyhibG9jay0+cGFnZS56aXAuZGF0YSwgemlwX3NpemUpOworCQl9IGVs
c2UgeworCQkJVU5JVl9NRU1fQVNTRVJUX1JXKGJsb2NrLT5mcmFtZSwgVU5JVl9QQUdFX1NJWkUp
OworCQl9CisJfQorI2VuZGlmIC8qIFVOSVZfREVCVUdfVkFMR1JJTkQgKi8KKwogCXByZXZfYiA9
IE5VTEw7CiAKIAkvKiBGb3IgdGhlIG1vc3QgcGFydCB3aGVuIHRoaXMgZnVuY3Rpb24gaXMgY2Fs
bGVkIHRoZSBmbHVzaF9yYnQKQEAgLTgwOSw2ICs4MzIsNyBAQCB0cnlfYWdhaW46CiAJemlwX3Np
emUgPSBidWZfcGFnZV9nZXRfemlwX3NpemUoYnBhZ2UpOwogCiAJaWYgKFVOSVZfVU5MSUtFTFko
emlwX3NpemUpKSB7CisJCVVOSVZfTUVNX0FTU0VSVF9SVyhicGFnZS0+emlwLmRhdGEsIHppcF9z
aXplKTsKIAkJLyogQ29weSB0aGUgY29tcHJlc3NlZCBwYWdlIGFuZCBjbGVhciB0aGUgcmVzdC4g
Ki8KIAkJbWVtY3B5KHRyeF9kb3VibGV3cml0ZS0+d3JpdGVfYnVmCiAJCSAgICAgICArIFVOSVZf
UEFHRV9TSVpFICogdHJ4X2RvdWJsZXdyaXRlLT5maXJzdF9mcmVlLApAQCAtODE4LDYgKzg0Miw4
IEBAIHRyeV9hZ2FpbjoKIAkJICAgICAgICsgemlwX3NpemUsIDAsIFVOSVZfUEFHRV9TSVpFIC0g
emlwX3NpemUpOwogCX0gZWxzZSB7CiAJCXV0X2EoYnVmX3BhZ2VfZ2V0X3N0YXRlKGJwYWdlKSA9
PSBCVUZfQkxPQ0tfRklMRV9QQUdFKTsKKwkJVU5JVl9NRU1fQVNTRVJUX1JXKCgoYnVmX2Jsb2Nr
X3QqKSBicGFnZSktPmZyYW1lLAorCQkJCSAgIFVOSVZfUEFHRV9TSVpFKTsKIAogCQltZW1jcHko
dHJ4X2RvdWJsZXdyaXRlLT53cml0ZV9idWYKIAkJICAgICAgICsgVU5JVl9QQUdFX1NJWkUgKiB0
cnhfZG91Ymxld3JpdGUtPmZpcnN0X2ZyZWUsCgo=

--===============0620298492==
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/mysql/5.1-innodb/
# testament_sha1: afc195b1db7cb492371d4031dcf2cd9eb15bd724
# timestamp: 2010-05-04 15:48:10 +0300
# base_revision_id: marko.makela@stripped\
#   4ew7a77e9uhxmhho
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSkk664AAiRfgEAwW3f//3+v
X7C/7//6UAUYnqdJO2tTNda5a0EpNKemknqabUeoep4ptJk8o0AAAAPUNPUNAkpE8mQMpiNITyho
aDTI9Q9QwTQD1NNqZBJJok0J6nqnmk09GkYpvSaaTIaB6gD1PUeoAaHGTJoxDE0wEDAmmCMExNNN
ABhBJIRpo0U8kybIKPJkmjU3pIxHoCAwAI1LJxMDIGEfcgQGGKP8FVUhzMFp3kDHXZpeeEjhePdn
vFEbiYZTs+TQ/NgJkiPOQnpjnloryYfiXcZAsMVjMyOG9c0Z3XG4+OFbkXVLwfcarOMtKyrdmyD2
6S0kWbzs1iG1YIFtapGwHzKPPi7opCRmK/TtS0l+Bs7mYJQFokagbxUDUzj57ctPtx0D7hqjkHNs
K9mYiUjN6BxcM7tJ1kIjHBWhRcg+IeFcgqmEtQrsYLNjyVU4IKvtIhC1KxBSclLzDP3HdSGhegQK
lVmDPcSEfq9B1gxIvIrMgZBFVA92YbOY9vcD1qFzXEXEmGsc+C8rU0ILFyuquwpB/6RFGb34bz1G
A018yy64F82NJOERplNWYVzr4TOxEYRqHvPmXSFA0jc7PaARIIgEutvSjmLjwFuYnXRYZPT9ZoDm
vBw0ysUs+A5BDWMXQmJxO1TFhcR+2w0gwYt0ZFcDmyoNVhv55Jq1meYJykwC4gXpUWgyGQrozBNZ
nUCkX+uhbo8LFXIG896uFAI3QVDYqxNLFkJ+d994PqMQurGsGTovGHBfTRnDkKmIsJ4OfqRyruq3
ut2ywGJqiosCmVSrAf2s2PnNzC7zGIwYL/IPdLYuR62Wm069jzQJng+YWJaBHBfoP4Kqp4xgz3ow
2g4Ny6wdtOgX9FtUkfpdgbgYdoWJKK+pSDy8vvE4WNIVoCCmFAnCkJlIVYuMKQ7BMX2HCqSU7hWk
6kLFC3CsUxaGxaOuAw286Y6U28fU4Oo9EJW9SCBOyUQ1hsO41ncucR7jv+BX7BFJlYTokZA2CMfq
p1gXTF0oC4IJEWMYbbWCCxG0Nnv+msWtUa3mm/qmYeRLyrayTFAc4vULQV0khw0hetCoHMPrMhZf
zUXnlol0oIOIfgIpnGlGaI9OUB1xvJCjVJUFdgdvlCBbxCZsNcuoy/HT4CAPZcE6gQw2gj1tkWnB
XV1lZ0YamMsMgRWp5eOjI4vQkb59yf6JiGwfnWgJo26SV6ocVgcFGpUxDOt4Whu0D1tNRw5xZFAs
QibCY48BSyqhIUxIUYbidybteNEHPJ8shqSGFBjAZrkWZptW9ZLOKK3HNpvFA7jvnEYx2IoMq+oJ
zhlMxGOPTQ7ECxCm3gHlZUZuETxDVimpiDt0iIhBIhxqTCPCLKAhg8dWskOTnoIm63ICXYI1C7BH
g7fCbiCapUohZhO9V8U10wzRyMllOy4SRyEoPn5XGTWY4BcYZMyOoUE+nlNUBEFlQT45GVInA3QR
8hFQVrd5Hps3VJUNkyDoMTsHbduxc9RYE+Hee8Zsw8HAoCWCkUtFDilUxTwd7fyPSKli2QUGRgzE
E5aNsAgM2k2mnSUdCHlhIBhFSbhSQLHTCnKC+Typ4pE2boGnuEgg0b8qIVF1ihyQ52iYtmWAwXJi
llFxJS24oXvXI121KckcZoJif2ZwKdzl8Wr6k5WaGZsTGaF0v7Dj05zUci5W9DgoA/8XckU4UJAp
JOuu


--===============0620298492==--