From: marko.makela
Date: April 26 2010 7:40am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3415 to 3416)
List-Archive: http://lists.mysql.com/commits/106471
Message-Id: <201004260740.o3Q65Afn007841@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0737489718=="

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

IDM0MTYgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNgogICAgICBidHJfcGFnZV9zcGxpdF9hbmRf
aW5zZXJ0KCk6IFNpbGVuY2UgYSBjb21waWxlciB3YXJuaW5nCiAgICAgIGFib3V0IHBvc3NpYmx5
IHVuaW5pdGlhbGl6ZWQgdmFyaWFibGUgaW5zZXJ0X2xlZnQuCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCiAzNDE1IENhbHZpbiBTdW4JMjAx
MC0wNC0yMgogICAgICBteXNxbC01LjEtaW5ub2RiOiBhZGQgZXJyb3IgY29kZXMgdG8gaW5ub2Ri
X2J1ZzUxOTIwLnRlc3QKICAgICAga2lsbCBvZiBhY3RpdmUgY29ubmVjdGlvbiB5aWVsZHMgZGlm
ZmVyZW50IGVycm9yIGNvZGUKICAgICAgZGVwZW5kaW5nIG9uIHBsYXRmb3JtLgoKICAgIG1vZGlm
aWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYl9idWc1MTkyMC5yZXN1
bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTE5MjAudGVzdAog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTE5MjAucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1MTky
MC50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBi
dHIuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJMjAxMC0wNC0y
MSAxODo1Mzo1OSArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBidHIu
YwkyMDEwLTA0LTI2IDA3OjM5OjQ5ICswMDAwCkBAIC0xOTMyLDYgKzE5MzIsNyBAQCBmdW5jX3N0
YXJ0OgogCS8qIDEuIERlY2lkZSB0aGUgc3BsaXQgcmVjb3JkOyBzcGxpdF9yZWMgPT0gTlVMTCBt
ZWFucyB0aGF0IHRoZQogCXR1cGxlIHRvIGJlIGluc2VydGVkIHNob3VsZCBiZSB0aGUgZmlyc3Qg
cmVjb3JkIG9uIHRoZSB1cHBlcgogCWhhbGYtcGFnZSAqLworCWluc2VydF9sZWZ0ID0gRkFMU0U7
CiAKIAlpZiAobl9pdGVyYXRpb25zID4gMCkgewogCQlkaXJlY3Rpb24gPSBGU1BfVVA7CkBAIC0x
OTQ1LDcgKzE5NDYsNiBAQCBmdW5jX3N0YXJ0OgogCX0gZWxzZSBpZiAoYnRyX3BhZ2VfZ2V0X3Nw
bGl0X3JlY190b19yaWdodChjdXJzb3IsICZzcGxpdF9yZWMpKSB7CiAJCWRpcmVjdGlvbiA9IEZT
UF9VUDsKIAkJaGludF9wYWdlX25vID0gcGFnZV9ubyArIDE7Ci0JCWluc2VydF9sZWZ0ID0gRkFM
U0U7CiAKIAl9IGVsc2UgaWYgKGJ0cl9wYWdlX2dldF9zcGxpdF9yZWNfdG9fbGVmdChjdXJzb3Is
ICZzcGxpdF9yZWMpKSB7CiAJCWRpcmVjdGlvbiA9IEZTUF9ET1dOOwpAQCAtMTk2OCwxMyArMTk2
OCw5IEBAIGZ1bmNfc3RhcnQ6CiAJCQkJcGFnZV9nZXRfaW5maW11bV9yZWMocGFnZSkpOwogCQl9
IGVsc2UgewogCQkJc3BsaXRfcmVjID0gTlVMTDsKLQkJCWluc2VydF9sZWZ0ID0gRkFMU0U7CiAJ
CX0KIAl9CiAKLQkvKiBBdCB0aGlzIHBvaW50LCBpbnNlcnRfbGVmdCBpcyBpbml0aWFsaXplZCBp
ZiBzcGxpdF9yZWMgPT0gTlVMTAotCWFuZCBtYXkgYmUgdW5pbml0aWFsaXplZCBvdGhlcndpc2Uu
ICovCi0KIAkvKiAyLiBBbGxvY2F0ZSBhIG5ldyBwYWdlIHRvIHRoZSBpbmRleCAqLwogCW5ld19i
bG9jayA9IGJ0cl9wYWdlX2FsbG9jKGN1cnNvci0+aW5kZXgsIGhpbnRfcGFnZV9ubywgZGlyZWN0
aW9uLAogCQkJCSAgIGJ0cl9wYWdlX2dldF9sZXZlbChwYWdlLCBtdHIpLCBtdHIpOwoK

--===============0737489718==
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: 39673b776bfceee2153da0edf0f1fb6c2811cfae
# timestamp: 2010-04-26 10:40:18 +0300
# base_revision_id: calvin.sun@stripped\
#   2atswbilyyxep6rm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWctCeWoAAa5fgEAwW2P//3MG
CAC/7//wUAPZM1Rt7dtVmhwkkjRGg1Np6Keg9Ueo0aeo0aGjIAEkkwJoBCYKPRMmTEeo9TQAAyCI
AJoajENNANDTE0NpAMAAAAAAAAAAAkqnip6jepinqeJpqfo1RsoAGENGmjSpq7L9GZPf8GuDmQIZ
U58eZtkDmqRSEzyskzVrjFVqIhHDccHjNQwnTTBdKMqsqydl+rbVsX94XDe6umCUJwQGWZ8eVsLL
SaSTpZtUAHV5pEHaOWA5cMnbBtd9ileI5lxUAfOpejk8UKnUUrSkdAEVZmHan70UPAuZzNk3DJIY
RxRYkPMRl4Cis9Q5Zru+CuUGL251uEdp8+7gaWnhJSyH7LqGi7y4vXRRx164FxYslFBCgc8b4y5S
RaxmUpl2icXiN8gKqKXDBxIXAy703kuUigWyuttREgQMMDMu99lR8lvLLRPIKY9zcUnMiFgzAFs4
piAFFhiMHhnewU7dGJrRWLdYpCYx6nUk03LbHAWik7UvWiZBbD+8VWZiNenem9ZC8TaEOu/FFBth
hqIZquhwVljD8h1LLAwHBGJWanQVZC4mjlVbHFBPvLAcbRel74jrdV7E0+8uCadcXd7NDgQYUWLY
GmBVhNjyWW9yu2F/3JO4mkdJnOoQKA8XsQoMnJcUpGC0cluE1JS1AGFz2bsUBGVwRNlpYomAHHXn
u6EiagYDfcCQ71UUyftMwovF/csYG5lFem6lc5tIsMXrWULLXS6sV3YtaYdt7opMZLxJ5GC8jRW9
Dotan/m1fLU5khsUj3HtNMia3HEcpXSGUTPBpKoVk+pbC8qFiJ8GCWmUyQoOfxcfxRO1+ElRtxYL
CMcp130H0gZ16ZHypM+KncFgRKq054Eibnyr17isaRpVwuknN+HaVRYpyGLsEsnC4xuNANgxq3Qz
PbDzbxPLDNnDhHSpivMrgpyFeT+n/NE7agHgYP0uaaBy43ATBagv5kwTALRbRQszJDlMY22nPljJ
6nJXeSRzAy6/weaaKKDt9DqthMdWDmTLFMG48hc9tJA0XDuWFHsm4drlMGZDJ1yDE+etCmA2SI/U
jYGFanJqaunKq4Ra221VTFANSs9lKDbRZ/bpkLXDPRAybFJQ0gKvdheysfSLkHaLztTFlYZhjNEm
IJyc4ZtDZsT3Ex+4B0VydEm0g7E0Vdv3bpWc+2JfjI5GTV6ieM5DyQTW8Q2KYgyqpdgnm3GitenV
sorviyzA5d8ZrlwFwWsG6Y1tQqpfEDZAtJkMGlun/xdyRThQkMtCeWo=


--===============0737489718==--