From: marko.makela
Date: May 4 2010 12:47pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3439)
List-Archive: http://lists.mysql.com/commits/107310
Message-Id: <201005041248.o44Cm7Hb022461@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2051514117=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMDU1NDYtNGV3N2E3
N2U5dWh4bWhobwoKIDM0MzkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBBZGQgVmFs
Z3JpbmQgY2hlY2tzIHRvIGNhdGNoIHVuaW5pdGlhbGl6ZWQgd3JpdGVzIHRvIGRhdGEgZmlsZXMu
CiAgICAgIGJ1Zl9mbHVzaF9pbnNlcnRfaW50b19mbHVzaF9saXN0KCksCiAgICAgIGJ1Zl9mbHVz
aF9pbnNlcnRfc29ydGVkX2ludG9fZmx1c2hfbGlzdCgpLAogICAgICBidWZfZmx1c2hfcG9zdF90
b19kb3VibGV3cml0ZV9idWYoKTogQ2hlY2sgdGhhdCB0aGUgcGFnZSBpcyBpbml0aWFsaXplZC4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwZmx1LmMK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGZsdS5jJwot
LS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBmbHUuYwkyMDEwLTA0LTA3IDA2OjIx
OjI2ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGZsdS5jCTIwMTAt
MDUtMDQgMTI6NDc6NDQgKzAwMDAKQEAgLTI0OSw2ICsyNDksMTcgQEAgYnVmX2ZsdXNoX2luc2Vy
dF9pbnRvX2ZsdXNoX2xpc3QoCiAJdXRfZChibG9jay0+cGFnZS5pbl9mbHVzaF9saXN0ID0gVFJV
RSk7CiAJVVRfTElTVF9BRERfRklSU1QobGlzdCwgYnVmX3Bvb2wtPmZsdXNoX2xpc3QsICZibG9j
ay0+cGFnZSk7CiAKKyNpZmRlZiBVTklWX0RFQlVHX1ZBTEdSSU5ECisJeworCQl1bGludAl6aXBf
c2l6ZSA9IGJ1Zl9ibG9ja19nZXRfemlwX3NpemUoYmxvY2spOworCisJCWlmIChVTklWX1VOTElL
RUxZKHppcF9zaXplKSkgeworCQkJVU5JVl9NRU1fQVNTRVJUX1JXKGJsb2NrLT5wYWdlLnppcC5k
YXRhLCB6aXBfc2l6ZSk7CisJCX0gZWxzZSB7CisJCQlVTklWX01FTV9BU1NFUlRfUlcoYmxvY2st
PmZyYW1lLCBVTklWX1BBR0VfU0laRSk7CisJCX0KKwl9CisjZW5kaWYgLyogVU5JVl9ERUJVR19W
QUxHUklORCAqLwogI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQlVGX0RF
QlVHCiAJdXRfYShidWZfZmx1c2hfdmFsaWRhdGVfbG93KCkpOwogI2VuZGlmIC8qIFVOSVZfREVC
VUcgfHwgVU5JVl9CVUZfREVCVUcgKi8KQEAgLTI3Niw2ICsyODcsMTggQEAgYnVmX2ZsdXNoX2lu
c2VydF9zb3J0ZWRfaW50b19mbHVzaF9saXN0KAogCXV0X2FkKCFibG9jay0+cGFnZS5pbl9mbHVz
aF9saXN0KTsKIAl1dF9kKGJsb2NrLT5wYWdlLmluX2ZsdXNoX2xpc3QgPSBUUlVFKTsKIAorI2lm
ZGVmIFVOSVZfREVCVUdfVkFMR1JJTkQKKwl7CisJCXVsaW50CXppcF9zaXplID0gYnVmX2Jsb2Nr
X2dldF96aXBfc2l6ZShibG9jayk7CisKKwkJaWYgKFVOSVZfVU5MSUtFTFkoemlwX3NpemUpKSB7
CisJCQlVTklWX01FTV9BU1NFUlRfUlcoYmxvY2stPnBhZ2UuemlwLmRhdGEsIHppcF9zaXplKTsK
KwkJfSBlbHNlIHsKKwkJCVVOSVZfTUVNX0FTU0VSVF9SVyhibG9jay0+ZnJhbWUsIFVOSVZfUEFH
RV9TSVpFKTsKKwkJfQorCX0KKyNlbmRpZiAvKiBVTklWX0RFQlVHX1ZBTEdSSU5EICovCisKIAlw
cmV2X2IgPSBOVUxMOwogCiAJLyogRm9yIHRoZSBtb3N0IHBhcnQgd2hlbiB0aGlzIGZ1bmN0aW9u
IGlzIGNhbGxlZCB0aGUgZmx1c2hfcmJ0CkBAIC04MDksNiArODMyLDcgQEAgdHJ5X2FnYWluOgog
CXppcF9zaXplID0gYnVmX3BhZ2VfZ2V0X3ppcF9zaXplKGJwYWdlKTsKIAogCWlmIChVTklWX1VO
TElLRUxZKHppcF9zaXplKSkgeworCQlVTklWX01FTV9BU1NFUlRfUlcoYnBhZ2UtPnppcC5kYXRh
LCB6aXBfc2l6ZSk7CiAJCS8qIENvcHkgdGhlIGNvbXByZXNzZWQgcGFnZSBhbmQgY2xlYXIgdGhl
IHJlc3QuICovCiAJCW1lbWNweSh0cnhfZG91Ymxld3JpdGUtPndyaXRlX2J1ZgogCQkgICAgICAg
KyBVTklWX1BBR0VfU0laRSAqIHRyeF9kb3VibGV3cml0ZS0+Zmlyc3RfZnJlZSwKQEAgLTgxOCw2
ICs4NDIsOCBAQCB0cnlfYWdhaW46CiAJCSAgICAgICArIHppcF9zaXplLCAwLCBVTklWX1BBR0Vf
U0laRSAtIHppcF9zaXplKTsKIAl9IGVsc2UgewogCQl1dF9hKGJ1Zl9wYWdlX2dldF9zdGF0ZShi
cGFnZSkgPT0gQlVGX0JMT0NLX0ZJTEVfUEFHRSk7CisJCVVOSVZfTUVNX0FTU0VSVF9SVygoKGJ1
Zl9ibG9ja190KikgYnBhZ2UpLT5mcmFtZSwKKwkJCQkgICBVTklWX1BBR0VfU0laRSk7CiAKIAkJ
bWVtY3B5KHRyeF9kb3VibGV3cml0ZS0+d3JpdGVfYnVmCiAJCSAgICAgICArIFVOSVZfUEFHRV9T
SVpFICogdHJ4X2RvdWJsZXdyaXRlLT5maXJzdF9mcmVlLAoK

--===============2051514117==
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:47:52 +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


--===============2051514117==--