From: marko.makela
Date: April 26 2010 7:39am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3416)
List-Archive: http://lists.mysql.com/commits/106469
Message-Id: <201004260740.o3Q7e7aA023784@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0547329174=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6Y2FsdmluLnN1bkBvcmFjbGUuY29tLTIwMTAwNDIyMTkxNjE0LTJhdHN3Ymls
eXl4ZXA2cm0KCiAzNDE2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDQtMjYKICAgICAgYnRyX3BhZ2Vf
c3BsaXRfYW5kX2luc2VydCgpOiBTaWxlbmNlIGEgY29tcGlsZXIgd2FybmluZwogICAgICBhYm91
dCBwb3NzaWJseSB1bmluaXRpYWxpemVkIHZhcmlhYmxlIGluc2VydF9sZWZ0LgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBidHIuYwo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCTIwMTAtMDQtMjEgMTg6NTM6NTkgKzAwMDAK
KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJMjAxMC0wNC0yNiAwNzoz
OTo0OSArMDAwMApAQCAtMTkzMiw2ICsxOTMyLDcgQEAgZnVuY19zdGFydDoKIAkvKiAxLiBEZWNp
ZGUgdGhlIHNwbGl0IHJlY29yZDsgc3BsaXRfcmVjID09IE5VTEwgbWVhbnMgdGhhdCB0aGUKIAl0
dXBsZSB0byBiZSBpbnNlcnRlZCBzaG91bGQgYmUgdGhlIGZpcnN0IHJlY29yZCBvbiB0aGUgdXBw
ZXIKIAloYWxmLXBhZ2UgKi8KKwlpbnNlcnRfbGVmdCA9IEZBTFNFOwogCiAJaWYgKG5faXRlcmF0
aW9ucyA+IDApIHsKIAkJZGlyZWN0aW9uID0gRlNQX1VQOwpAQCAtMTk0NSw3ICsxOTQ2LDYgQEAg
ZnVuY19zdGFydDoKIAl9IGVsc2UgaWYgKGJ0cl9wYWdlX2dldF9zcGxpdF9yZWNfdG9fcmlnaHQo
Y3Vyc29yLCAmc3BsaXRfcmVjKSkgewogCQlkaXJlY3Rpb24gPSBGU1BfVVA7CiAJCWhpbnRfcGFn
ZV9ubyA9IHBhZ2Vfbm8gKyAxOwotCQlpbnNlcnRfbGVmdCA9IEZBTFNFOwogCiAJfSBlbHNlIGlm
IChidHJfcGFnZV9nZXRfc3BsaXRfcmVjX3RvX2xlZnQoY3Vyc29yLCAmc3BsaXRfcmVjKSkgewog
CQlkaXJlY3Rpb24gPSBGU1BfRE9XTjsKQEAgLTE5NjgsMTMgKzE5NjgsOSBAQCBmdW5jX3N0YXJ0
OgogCQkJCXBhZ2VfZ2V0X2luZmltdW1fcmVjKHBhZ2UpKTsKIAkJfSBlbHNlIHsKIAkJCXNwbGl0
X3JlYyA9IE5VTEw7Ci0JCQlpbnNlcnRfbGVmdCA9IEZBTFNFOwogCQl9CiAJfQogCi0JLyogQXQg
dGhpcyBwb2ludCwgaW5zZXJ0X2xlZnQgaXMgaW5pdGlhbGl6ZWQgaWYgc3BsaXRfcmVjID09IE5V
TEwKLQlhbmQgbWF5IGJlIHVuaW5pdGlhbGl6ZWQgb3RoZXJ3aXNlLiAqLwotCiAJLyogMi4gQWxs
b2NhdGUgYSBuZXcgcGFnZSB0byB0aGUgaW5kZXggKi8KIAluZXdfYmxvY2sgPSBidHJfcGFnZV9h
bGxvYyhjdXJzb3ItPmluZGV4LCBoaW50X3BhZ2Vfbm8sIGRpcmVjdGlvbiwKIAkJCQkgICBidHJf
cGFnZV9nZXRfbGV2ZWwocGFnZSwgbXRyKSwgbXRyKTsKCg==

--===============0547329174==
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:00 +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=


--===============0547329174==--