From: marko.makela
Date: October 19 2010 6:45am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3187 to 3188)
List-Archive: http://lists.mysql.com/commits/121056
Message-Id: <201010190646.o9J5VOPl000374@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1111961089=="

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

IDMxODggTWFya28gTcOka2Vsw6QJMjAxMC0xMC0xOQogICAgICBpYnVmX3NldF9kZWxfbWFyaygp
OiBEbyBub3QgY29tcGxhaW4gYWJvdXQgYWxyZWFkeSBkZWxldGUtbWFya2VkIHJlY29yZHMuCiAg
ICAgIAogICAgICBBY2NvcmRpbmcgdG8gYSBjb21tZW50IGluIHJvd191cGRfc2VjX2luZGV4X2Vu
dHJ5KCksIGl0IGlzIGEKICAgICAgbGVnaXRpbWF0ZSBzaXR1YXRpb24gdGhhdCBjYW4gYmUgY2F1
c2VkIGJ5IGEgbG9jayB3YWl0LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2lidWYvaWJ1ZjBpYnVmLmMKIDMxODcgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0xOSBbbWVyZ2Vd
CiAgICAgIE1lcmdlIEJ1ZyAjNTY2ODAgZnJvbSBteXNxbC01LjEuCiAgICAgIAogICAgICBBZGRp
dGlvbmFsIGZpeGVzIGluIDUuNToKICAgICAgCiAgICAgIGlidWZfc2V0X2RlbF9tYXJrKCk6IEFk
ZCBkaWFnbm9zdGljcyB3aGVuIHNldHRpbmcgYSBidWZmZXJlZCBkZWxldGUtbWFyayBmYWlscy4K
ICAgICAgCiAgICAgIGlidWZfZGVsZXRlKCk6IENvcnJlY3QgYSBtaXNsZWFkaW5nIGNvbW1lbnQg
YWJvdXQgbm9uLWZvdW5kIHJlY29yZHMuCiAgICAgIAogICAgICByZWNfcHJpbnQoKTogQWRkIGEg
Y29uc3QgcXVhbGlmaWVyIHRvIHRoZSBpbmRleCBwYXJhbWV0ZXIuCiAgICAgIAogICAgICBCdWcg
IzU2NjgwIHdyb25nIElubm9EQiByZXN1bHRzIGZyb20gYSBjYXNlLWluc2Vuc2l0aXZlIGNvdmVy
aW5nIGluZGV4CiAgICAgIAogICAgICByb3dfc2VhcmNoX2Zvcl9teXNxbCgpOiBXaGVuIGEgc2Vj
b25kYXJ5IGluZGV4IHJlY29yZCBtaWdodCBub3QgYmUKICAgICAgdmlzaWJsZSBpbiB0aGUgY3Vy
cmVudCB0cmFuc2FjdGlvbidzIHJlYWQgdmlldyBhbmQgd2UgY29uc3VsdCB0aGUKICAgICAgY2x1
c3RlcmVkIGluZGV4IGFuZCBvcHRpb25hbGx5IHNvbWUgdW5kbyBsb2cgcmVjb3JkcywgcmV0dXJu
IHRoZQogICAgICByZWxldmFudCBjb2x1bW5zIG9mIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3Jk
IHRvIE15U1FMIGluc3RlYWQgb2YgdGhlCiAgICAgIHNlY29uZGFyeSBpbmRleCByZWNvcmQuCiAg
ICAgIAogICAgICBpYnVmX2luc2VydF90b19pbmRleF9wYWdlX2xvdygpOiBOZXcgZnVuY3Rpb24s
IHJlZmFjdG9yZWQgZnJvbQogICAgICBpYnVmX2luc2VydF90b19pbmRleF9wYWdlKCkuCiAgICAg
IAogICAgICBpYnVmX2luc2VydF90b19pbmRleF9wYWdlKCk6IFdoZW4gd2UgYXJlIGluc2VydGlu
ZyBhIHJlY29yZCBpbiBwbGFjZQogICAgICBvZiBhIGRlbGV0ZS1tYXJrZWQgcmVjb3JkIGFuZCBz
b21lIGZpZWxkcyBvZiB0aGUgcmVjb3JkIGRpZmZlciwgdXBkYXRlCiAgICAgIHRoYXQgcmVjb3Jk
IGp1c3QgbGlrZSByb3dfaW5zX3NlY19pbmRleF9lbnRyeV9ieV9tb2RpZnkoKSB3b3VsZCBkby4K
ICAgICAgCiAgICAgIGJ0cl9jdXJfdXBkYXRlX2FsbG9jX3ppcCgpOiBNYWtlIHRoZSBmdW5jdGlv
biBwdWJsaWMuCiAgICAgIAogICAgICBteXNxbF9yb3dfdGVtcGxfdDogQWRkIGNsdXN0X3JlY19m
aWVsZF9uby4KICAgICAgCiAgICAgIHJvd19zZWxfc3RvcmVfbXlzcWxfcmVjKCksIHJvd19zZWxf
cHVzaF9jYWNoZV9yb3dfZm9yX215c3FsKCk6IEFkZCB0aGUKICAgICAgZmxhZyByZWNfY2x1c3Qs
IGZvciByZXR1cm5pbmcgZGF0YSBhdCBjbHVzdF9yZWNfZmllbGRfbm8gaW5zdGVhZCBvZgogICAg
ICByZWNfZmllbGRfbm8uIFJlc3VycmVjdCB0aGUgZGVidWcgYXNzZXJ0aW9uIHRoYXQgdGhlIHJl
Y29yZCBub3QgYmUKICAgICAgbWFya2VkIGZvciBkZWxldGlvbi4gKEJ1ZyAjNTU2MjYpCiAgICAg
IAogICAgICBbVU5JVl9ERUJVRyB8fCBVTklWX0lCVUZfREVCVUddIGlidWZfZGVidWcsIGJ1Zl9w
YWdlX2dldF9nZW4oKSwKICAgICAgYnVmX2ZsdXNoX3BhZ2VfdHJ5KCk6CiAgICAgIEltcGxlbWVu
dCBpbm5vZGJfY2hhbmdlX2J1ZmZlcmluZ19kZWJ1Zz0xIGZvciBldmljdGluZyBwYWdlcyBmcm9t
IHRoZQogICAgICBidWZmZXIgcG9vbCwgc28gdGhhdCBjaGFuZ2UgYnVmZmVyaW5nIHdpbGwgYmUg
YXR0ZW1wdGVkIG1vcmUKICAgICAgZnJlcXVlbnRseS4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTY2ODAucmVzdWx0CiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzU2NjgwLnRlc3QKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9i
dWYvYnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaWJ1Zi9pYnVmMGlidWYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1
ci5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwZmx1LmgKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL2lidWYwaWJ1Zi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9yZW0wcmVjLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBteXNxbC5o
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwdXBkLmgKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9yZW0vcmVtMHJlYy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNx
bC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwdXBkLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
aWJ1Zi9pYnVmMGlidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDE5MDYzNTE0LWs2M3Jkczg1c2o1
bzBmZGQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDE5MDY0NDM4LWdmbHMxbjZmaWduMWJycmgKQEAgLTM5
OTcsMjEgKzM5OTcsMjIgQEAgaWJ1Zl9zZXRfZGVsX21hcmsoCiAJCXJlYyA9IHBhZ2VfY3VyX2dl
dF9yZWMoJnBhZ2VfY3VyKTsKIAkJcGFnZV96aXAgPSBwYWdlX2N1cl9nZXRfcGFnZV96aXAoJnBh
Z2VfY3VyKTsKIAotCQlpZiAoVU5JVl9VTkxJS0VMWQotCQkgICAgKHJlY19nZXRfZGVsZXRlZF9m
bGFnKAorCQkvKiBEZWxldGUgbWFyayB0aGUgb2xkIGluZGV4IHJlY29yZC4gQWNjb3JkaW5nIHRv
IGEKKwkJY29tbWVudCBpbiByb3dfdXBkX3NlY19pbmRleF9lbnRyeSgpLCBpdCBjYW4gYWxyZWFk
eQorCQloYXZlIGJlZW4gZGVsZXRlIG1hcmtlZCBpZiBhIGxvY2sgd2FpdCBvY2N1cnJlZCBpbgor
CQlyb3dfaW5zX2luZGV4X2VudHJ5KCkgaW4gYSBwcmV2aW91cyBpbnZvY2F0aW9uIG9mCisJCXJv
d191cGRfc2VjX2luZGV4X2VudHJ5KCkuICovCisKKwkJaWYgKFVOSVZfTElLRUxZCisJCSAgICAo
IXJlY19nZXRfZGVsZXRlZF9mbGFnKAogCQkJICAgIHJlYywgZGljdF90YWJsZV9pc19jb21wKGlu
ZGV4LT50YWJsZSkpKSkgewotCQkJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7Ci0JCQlmcHV0
cygiICBJbm5vREI6IHJlY29yZCBpcyBhbHJlYWR5IGRlbGV0ZS1tYXJrZWRcbiIsCi0JCQkgICAg
ICBzdGRlcnIpOwotCQkJZ290byBmYWlsdXJlOworCQkJYnRyX2N1cl9zZXRfZGVsZXRlZF9mbGFn
X2Zvcl9pYnVmKHJlYywgcGFnZV96aXAsCisJCQkJCQkJICBUUlVFLCBtdHIpOwogCQl9Ci0KLQkJ
YnRyX2N1cl9zZXRfZGVsZXRlZF9mbGFnX2Zvcl9pYnVmKHJlYywgcGFnZV96aXAsIFRSVUUsIG10
cik7CiAJfSBlbHNlIHsKIAkJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7CiAJCWZwdXRzKCIg
IElubm9EQjogdW5hYmxlIHRvIGZpbmQgYSByZWNvcmQgdG8gZGVsZXRlLW1hcmtcbiIsCiAJCSAg
ICAgIHN0ZGVycik7Ci1mYWlsdXJlOgogCQlmcHV0cygiSW5ub0RCOiB0dXBsZSAiLCBzdGRlcnIp
OwogCQlkdHVwbGVfcHJpbnQoc3RkZXJyLCBlbnRyeSk7CiAJCWZwdXRzKCJcbiIKCg==

--===============1111961089==
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: f7f48481e242727c749e88921504ffa55e90b0a0
# timestamp: 2010-10-19 09:46:05 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   k63rds85sj5o0fdd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXe4sF4AAdHflEgwcnf//3cv
FyC//9/wBAAIAFAEbPbJnO971KrpXpt4SURoEwqemyp/pT00xU8p6Ypppo0eSaYgNGgMlMJkyNNK
eUeiNAAAAAAAAShNE0J6E0ZU9T9UPUZPQI0DQA0BoNBCRA2hAwmBAGTBGmhiNNAyAEkUBoEwg0k8
JgSGhpoaAABkQwBCDGIYBmz9VvX/I/HlZZfrryb9e45YZ8CnC+GAIcWolxs7cb5Rhomnfzry34YK
qobvkQ3flpurKoq01ti40eHbThy6bV7F2eLFNa9fXAbRni/2aSb5DWNylZMbTVG2PZKWbvoiJiZx
6/uMc8dhe/Hb2A7BMpCfrzhHoJPLUjL7HeVxxzyryEfldCnQWX7OgLn15VX6ZM1SlSM2SRr4UZ4X
z6XOdUTFmYKXtEQiINmjMKIa5J0VZCHFCEulWset1RU5ItXb1JtDNLxKVThBuRRDnUQh5eH6NsHN
gaomUx2c01EV4V6F2myh8b+S6t0Iip+lk7FqE/YK59LLxF0ENcvOqmhbuZxRcRGL1HomaXhqsToh
NKYFAyTBHOJgGMjVQcYWqUWA+ug0ykxpKzOuZgSHiwvCLWGmmpZKx77UWp/2F4YYTT2XQjDpBhVL
ND5SMlzmdMG5eLXjBUjMQDFXFyYmxpeGLriXA3M0DEMpvGYCk5YwrnMSkLbLby8kOXArGExkYKBV
GhbYS1lz81JQC6pr8leNEMXJMixWJMKprclnUZa7ygIGLG5Mr10VRECnnEIJAfNDzYptiHXv2rO0
FLUZVvuFrgtXzB5273Oru4OXnCG+HjMuuaYkUnMJ0YZLMbTYNoSPDlD2WJFSjJS2MJIrDgkeuBhf
WQ40InD+sCwZRebIPg1bSRg/pT17vRcxro/XpF3WJEfZ0pML6lhV2FIMshKHadtJ72vUq/hHMYw2
XZpR3SLkjCrM1GA3odw3Nt4Y8M9lqgSJ4lOblc53LQGgMloxloR3KguSnniP6+vabGDQVO9hrKMj
jp4brXk7Z50UaAvVI0b7n1PA2HPdxzNnLNVlsjZ/y5PWkd7g8WYuOhbQdS44WY4ykHOzQiVEqJFF
jIbQcmC9ORq4PdqithSiMJjeLv58sTOLa8RwIi4CPmLXSLEL2boDT42pksCeMh2pbtRjmnG+6pFn
bhoZoDpBMVOIFmGFRXD153SqsMA3743Bisx6ZTcwaczGZO9wOTpH7vCIF0BOEHAM5w4a6khjLKip
995EQFRLBI6kiWxrdAfM3itpsMFuzIuNqR3GsiDlHgKncE6BGJSigRMq70+MrwSZkmDDZqOp0jrD
XPiUYRHQkqRbIxH0JFYDQFHMovufuvAoxiMUQ3lQpSpTGZ8MCjmokqWDsC83+FJkpRXXukJBWdMw
BUskUOU41tooTzpmBi+TlcJgyy8Z61Nc5scegLH1BBUwJkXUQa6hAVYSSHsLoDrBSyhepGvZZqHI
lgWpuxaSKByFwhJpIyNNxqyiyxEgbSEUBIKAEIJUTTWIN/Bg4fxdyRThQkHe4sF4


--===============1111961089==--