From: marko.makela
Date: June 2 2010 11:34am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3136)
List-Archive: http://lists.mysql.com/commits/109950
Message-Id: <201006021134.o52B5GkU028677@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1894177057=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MDIxMTA0MDAtNTY4YTNi
MmdkOXV4eHh2ZwoKIDMxMzYgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMgogICAgICBNZXJnZSBm
cm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2bm86IDM0OTMK
ICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAyMTAxOTQw
LTYweDMyeGlpdnRxajl2YTEKICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDYwMTEzNTgwMi1oZ3BsY3ByODA4OXVyYThnCiAgICAgIGNvbW1pdHRlcjogTWFya28gTcOk
a2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmljazogNS4xLWlu
bm9kYgogICAgICB0aW1lc3RhbXA6IFdlZCAyMDEwLTA2LTAyIDEzOjE5OjQwICswMzAwCiAgICAg
IG1lc3NhZ2U6CiAgICAgICAgZmlsX3ByaW50X29ycGhhbmVkX3RhYmxlc3BhY2VzKCk6IFVudXNl
ZCBmdW5jdGlvbiwgcmVtb3ZlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2ZpbC9maWwwZmlsLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2ZpbDBmaWwuaAo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29t
LTIwMTAwNjAyMTEwNDAwLTU2OGEzYjJnZDl1eHh4dmcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9m
aWwvZmlsMGZpbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAyMTEzNDQx
LTk2Zm55NzRzbTVvczJsMnMKQEAgLTM1NjQsMzkgKzM1NjQsNiBAQCBuZXh0X2RhdGFkaXJfaXRl
bToKIAlyZXR1cm4oZXJyKTsKIH0KIAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotSWYgd2UgbmVlZCBjcmFz
aCByZWNvdmVyeSwgYW5kIHdlIGhhdmUgY2FsbGVkCi1maWxfbG9hZF9zaW5nbGVfdGFibGVfdGFi
bGVzcGFjZXMoKSBhbmQgZGljdF9sb2FkX3NpbmdsZV90YWJsZV90YWJsZXNwYWNlcygpLAotd2Ug
Y2FuIGNhbGwgdGhpcyBmdW5jdGlvbiB0byBwcmludCBhbiBlcnJvciBtZXNzYWdlIG9mIG9ycGhh
bmVkIC5pYmQgZmlsZXMKLWZvciB3aGljaCB0aGVyZSBpcyBub3QgYSBkYXRhIGRpY3Rpb25hcnkg
ZW50cnkgd2l0aCBhIG1hdGNoaW5nIHRhYmxlIG5hbWUKLWFuZCBzcGFjZSBpZC4gKi8KLVVOSVZf
SU5URVJOCi12b2lkCi1maWxfcHJpbnRfb3JwaGFuZWRfdGFibGVzcGFjZXModm9pZCkKLS8qPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotewotCWZpbF9zcGFjZV90KglzcGFjZTsK
LQotCW11dGV4X2VudGVyKCZmaWxfc3lzdGVtLT5tdXRleCk7Ci0KLQlzcGFjZSA9IFVUX0xJU1Rf
R0VUX0ZJUlNUKGZpbF9zeXN0ZW0tPnNwYWNlX2xpc3QpOwotCi0Jd2hpbGUgKHNwYWNlKSB7Ci0J
CWlmIChzcGFjZS0+cHVycG9zZSA9PSBGSUxfVEFCTEVTUEFDRSAmJiBzcGFjZS0+aWQgIT0gMAot
CQkgICAgJiYgIXNwYWNlLT5tYXJrKSB7Ci0JCQlmcHV0cygiSW5ub0RCOiBXYXJuaW5nOiB0YWJs
ZXNwYWNlICIsIHN0ZGVycik7Ci0JCQl1dF9wcmludF9maWxlbmFtZShzdGRlcnIsIHNwYWNlLT5u
YW1lKTsKLQkJCWZwcmludGYoc3RkZXJyLCAiIG9mIGlkICVsdSBoYXMgbm8gbWF0Y2hpbmcgdGFi
bGUgaW5cbiIKLQkJCQkiSW5ub0RCOiB0aGUgSW5ub0RCIGRhdGEgZGljdGlvbmFyeS5cbiIsCi0J
CQkJKHVsb25nKSBzcGFjZS0+aWQpOwotCQl9Ci0KLQkJc3BhY2UgPSBVVF9MSVNUX0dFVF9ORVhU
KHNwYWNlX2xpc3QsIHNwYWNlKTsKLQl9Ci0KLQltdXRleF9leGl0KCZmaWxfc3lzdGVtLT5tdXRl
eCk7Ci19Ci0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyBUUlVFIGlmIGEgc2luZ2xlLXRhYmxl
IHRhYmxlc3BhY2UgZG9lcyBub3QgZXhpc3QgaW4gdGhlIG1lbW9yeSBjYWNoZSwKIG9yIGlzIGJl
aW5nIGRlbGV0ZWQgdGhlcmUuCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL2ZpbDBmaWwuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2ZpbDBmaWwu
aAlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MDIxMTA0MDAtNTY4YTNiMmdkOXV4
eHh2ZworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZmlsMGZpbC5oCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAyMTEzNDQxLTk2Zm55NzRzbTVvczJsMnMKQEAgLTUw
NiwxNiArNTA2LDYgQEAgVU5JVl9JTlRFUk4KIHVsaW50CiBmaWxfbG9hZF9zaW5nbGVfdGFibGVf
dGFibGVzcGFjZXModm9pZCk7CiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ki8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKLUlmIHdlIG5lZWQgY3Jhc2ggcmVjb3ZlcnksIGFuZCB3ZSBo
YXZlIGNhbGxlZAotZmlsX2xvYWRfc2luZ2xlX3RhYmxlX3RhYmxlc3BhY2VzKCkgYW5kIGRpY3Rf
bG9hZF9zaW5nbGVfdGFibGVfdGFibGVzcGFjZXMoKSwKLXdlIGNhbiBjYWxsIHRoaXMgZnVuY3Rp
b24gdG8gcHJpbnQgYW4gZXJyb3IgbWVzc2FnZSBvZiBvcnBoYW5lZCAuaWJkIGZpbGVzCi1mb3Ig
d2hpY2ggdGhlcmUgaXMgbm90IGEgZGF0YSBkaWN0aW9uYXJ5IGVudHJ5IHdpdGggYSBtYXRjaGlu
ZyB0YWJsZSBuYW1lCi1hbmQgc3BhY2UgaWQuICovCi1VTklWX0lOVEVSTgotdm9pZAotZmlsX3By
aW50X29ycGhhbmVkX3RhYmxlc3BhY2VzKHZvaWQpOwotLyo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PSovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJldHVybnMgVFJVRSBpZiBhIHNpbmdsZS10
YWJsZSB0YWJsZXNwYWNlIGRvZXMgbm90IGV4aXN0IGluIHRoZSBtZW1vcnkgY2FjaGUsCiBvciBp
cyBiZWluZyBkZWxldGVkIHRoZXJlLgoK

--===============1894177057==
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: 2ff5ba923bccf0ac14fd5f93a94fa9238a4ac60a
# timestamp: 2010-06-02 14:34:48 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   568a3b2gd9uxxxvg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb+8ys0AAmTflAAQUm//91MC
AoC///9wBAAIAFAErXs53dHNinUVruISSRkmKn5NGmp5qNCMap6nkmjJ6mnqaMJSjCZPSaMqaNqD
QDTTQGgABJE0Chqn6Kfqn6TCTaTENNDTTID1BgNAAANAAAAAAEkhTADQj1NEbRJtTxJo0NANNdXq
wX57HX6xunocp77GpeovcdWREzjnzui58+bnB8LTEcZmZl5fRfiKasPnqyyr1s7Q2u7PRuZTcMb/
qeX9fAedrjH+OODJW2YQZqP3o8T9fbqBIwtKgTDlLbhk7dv5ml34FtSXwFdAJuQuQFopG208NRs2
6OK2hYpCBlyEqLaZmmVC+E0i5JSl2uoSWOIBnxFG1vZSYLvrNW0lBWLSQszIr01tJgZTIO3WdnLs
0T03kJmJRmhJ4WpaBtMsLwDCsU19GBRkXohBRz2CMleraTfWaBBXB4o0+JTIi+Qkq7G50UwLBM22
w0bH3zs1uCS1SApCyNAeH0tbwvgKTCbhdU9E3owzegiRZo4KV4AZneBnkZy1/6IFm1ObaXClCSqF
BazOKncVwst1TplC40ODL1gVJvoUGQE3HtqjoiRMTruFj7EQNWmybFxLU6WBiX7k+txbAiWJxOJ8
GxU4sDUPLDqBJQEqrrY0b2rwFXrIK4wiGoUgL5h1GugUuYDTitipGDioir7woyKB5cSnJLdosqVE
tsYJm7JSF0eKZab1N8fCdYJjWFRFHDLcZiYsL2UAq8armjJFBt5ZkdJdkn1c7Zr4N0dsdMtm7GFG
yUjbsatVks4VHBrNRXRa7XF4LgWwyPUD3HyH9Op4FotA+qYRYUpmG9XahFviMF0Ga1kO07dXhHxz
6Hs+YUTMeSFmn4EDjcJTncdsI8SdAUEJjEgjcJeewpIGHZW2AfopQHlnelyWsiov7hPKXV7fB0mL
ir327hcORAmKHIcZKgnNRza3jDcb4MMgHK5ARjpDgqYcMOMK40BOEi0f4qYVfksPMWS3U9hOJzRU
05Fe1OQHNichjrLCBDYzRImcl5G8mwXJ1RBGfj/aqo1BYaN2ult809eLU+7j7gHVG5MGO3YdK+Ff
DPeFSVCHVCvYwo3nnzmN5OSFM+ZfgrXdQExQw3n3OY46AYuKWZuki8ldsyZhN0MuOphtI20W2uax
eW0qM48+ENLrXI17BIlXsr9i5IroVXvjofRaLAXAvkOP+zKN4mMRL4IosAKFQwLeGgFiLHhBhLvc
VoBg+NmPpRMqD6AFADHiJaTYdjJMSRLVWSV2K8pHKqBBPVL4JOJklrZDw7rjOYoW/etASZMwc3XW
g6gCYYlyQPS85DugN6My3YyLqBbqNw2Oq/Bw4JVCrJdNZwnLh0pCyCiIcxN4EcRiWXCxeAQRauc3
1LnTCZepkiDDwIXkMSM14d9hmJik7MWgVflgoFh3DMvIKbx1JsDnPjjVJs6kWLk0BTODE9DKxbiY
VOdDBa5YLJKv0yM4I1C3Ks4JqQOie8lWofwUNx/i7kinChIX95lZoA==


--===============1894177057==--