From: marko.makela
Date: May 5 2010 10:14am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3064)
List-Archive: http://lists.mysql.com/commits/107457
Message-Id: <201005051014.o45A8t5m012425@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0122527851=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNTA0MTUyNTU2LWM0dzl1MTdm
YWZ5OThsZW0KCiAzMDY0IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMDUKICAgICAgTWVyZ2UgZnJv
bSBteXNxbC01LjEtaW5ub2RiOgogICAgICAKICAgICAgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgICByZXZubzogMzQ0
NgogICAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUwNTEw
MDUwNy02a2NkMmhmMzJocnV4YnY3CiAgICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDUwNTA5NTMyOC12ZXRubDBmbGhtaGFvN3A1CiAgICAgICAgY29tbWl0dGVyOiBN
YXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAgICAgYnJhbmNoIG5p
Y2s6IDUuMS1pbm5vZGIKICAgICAgICB0aW1lc3RhbXA6IFdlZCAyMDEwLTA1LTA1IDEzOjA1OjA3
ICswMzAwCiAgICAgICAgbWVzc2FnZToKICAgICAgICAgIEFkZCBWYWxncmluZCBkaWFnbm9zdGlj
cyB0byB0cmFjayBkb3duIEJ1ZyAjMzg5OTkuCiAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwc2VsLmMJMjAxMC0wNS0wNCAxMDo1MjoxNCArMDAwMAorKysgYi9zdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwc2VsLmMJMjAxMC0wNS0wNSAxMDoxNDowNiArMDAwMApAQCAtMjQ5OCw2ICsyNDk4
LDcgQEAgcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXQoCiAJYnl0ZSoJcGFkX3B0
cjsKIAogCXV0X2FkKGxlbiAhPSBVTklWX1NRTF9OVUxMKTsKKwlVTklWX01FTV9BU1NFUlRfUlco
ZGF0YSwgbGVuKTsKIAogCXN3aXRjaCAodGVtcGwtPnR5cGUpIHsKIAljYXNlIERBVEFfSU5UOgpA
QCAtMjc0Niw2ICsyNzQ3LDkgQEAgcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAJCQkvKiBNeVNR
TCBhc3N1bWVzIHRoYXQgdGhlIGZpZWxkIGZvciBhbiBTUUwKIAkJCU5VTEwgdmFsdWUgaXMgc2V0
IHRvIHRoZSBkZWZhdWx0IHZhbHVlLiAqLwogCisJCQlVTklWX01FTV9BU1NFUlRfUlcocHJlYnVp
bHQtPmRlZmF1bHRfcmVjCisJCQkJCSAgICsgdGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCisJCQkJ
CSAgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKIAkJCW15c3FsX3JlY1t0ZW1wbC0+bXlzcWxfbnVs
bF9ieXRlX29mZnNldF0KIAkJCQl8PSAoYnl0ZSkgdGVtcGwtPm15c3FsX251bGxfYml0X21hc2s7
CiAJCQltZW1jcHkobXlzcWxfcmVjICsgdGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCkBAIC0zMDcw
LDYgKzMwNzQsMTEgQEAgcm93X3NlbF9wb3BfY2FjaGVkX3Jvd19mb3JfbXlzcWwoCiAKIAkJZm9y
IChpID0gMDsgaSA8IHByZWJ1aWx0LT5uX3RlbXBsYXRlOyBpKyspIHsKIAkJCXRlbXBsID0gcHJl
YnVpbHQtPm15c3FsX3RlbXBsYXRlICsgaTsKKyNpZiAwIC8qIFNvbWUgb2YgdGhlIGNhY2hlZF9y
ZWMgbWF5IGxlZ2l0aW1hdGVseSBiZSB1bmluaXRpYWxpemVkLiAqLworCQkJVU5JVl9NRU1fQVNT
RVJUX1JXKGNhY2hlZF9yZWMKKwkJCQkJICAgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKKwkJ
CQkJICAgdGVtcGwtPm15c3FsX2NvbF9sZW4pOworI2VuZGlmCiAJCQl1dF9tZW1jcHkoYnVmICsg
dGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCiAJCQkJICBjYWNoZWRfcmVjICsgdGVtcGwtPm15c3Fs
X2NvbF9vZmZzZXQsCiAJCQkJICB0ZW1wbC0+bXlzcWxfY29sX2xlbik7CkBAIC0zMDg0LDYgKzMw
OTMsMTEgQEAgcm93X3NlbF9wb3BfY2FjaGVkX3Jvd19mb3JfbXlzcWwoCiAJCX0KIAl9CiAJZWxz
ZSB7CisjaWYgMCAvKiBTb21lIG9mIHRoZSBjYWNoZWRfcmVjIG1heSBsZWdpdGltYXRlbHkgYmUg
dW5pbml0aWFsaXplZC4gKi8KKwkJVU5JVl9NRU1fQVNTRVJUX1JXKHByZWJ1aWx0LT5mZXRjaF9j
YWNoZQorCQkJCSAgIFtwcmVidWlsdC0+ZmV0Y2hfY2FjaGVfZmlyc3RdLAorCQkJCSAgIHByZWJ1
aWx0LT5teXNxbF9wcmVmaXhfbGVuKTsKKyNlbmRpZgogCQl1dF9tZW1jcHkoYnVmLAogCQkJICBw
cmVidWlsdC0+ZmV0Y2hfY2FjaGVbcHJlYnVpbHQtPmZldGNoX2NhY2hlX2ZpcnN0XSwKIAkJCSAg
cHJlYnVpbHQtPm15c3FsX3ByZWZpeF9sZW4pOwpAQCAtMzEzNCw2ICszMTQ4LDggQEAgcm93X3Nl
bF9wdXNoX2NhY2hlX3Jvd19mb3JfbXlzcWwoCiAJfQogCiAJdXRfYWQocHJlYnVpbHQtPmZldGNo
X2NhY2hlX2ZpcnN0ID09IDApOworCVVOSVZfTUVNX0lOVkFMSUQocHJlYnVpbHQtPmZldGNoX2Nh
Y2hlW3ByZWJ1aWx0LT5uX2ZldGNoX2NhY2hlZF0sCisJCQkgcHJlYnVpbHQtPm15c3FsX3Jvd19s
ZW4pOwogCiAJaWYgKFVOSVZfVU5MSUtFTFkoIXJvd19zZWxfc3RvcmVfbXlzcWxfcmVjKAogCQkJ
CSAgcHJlYnVpbHQtPmZldGNoX2NhY2hlWwoK

--===============0122527851==
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.5-innodb/
# testament_sha1: 7da5ed0f07d4fd02092a8e0023dd897dda262f90
# timestamp: 2010-05-05 13:14:15 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   c4w9u17fafy98lem
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWftBnQoAAnJfgGAwW3///3cn
H4q////wUAV4Pdo2wW2rbsoOt2QSVKfqn6SH+qMk0PUPNUP1TI09T9UAGgAAABJQEGhPRqNJk1PU
aPSntI00yENqHoEaM01BKaQRNNE2pqfoAApiepo00DTTRoeoNADjJk00wmRkDAjE0YIwg0aYABBJ
JNNCYJTepsk1PaaRplGNEaGmTCMmmTRocsk4zEmBMkJC93J2CbDiVuLTlzbdZ2ifjYXttzBqpu0b
K9vbMmXmwCapXNVUIg1kt0HuwLlx8jTzGYRAgJAkIXdfKLCRfRWaDGYoJIbj3t4RqsWGXfkjMLZP
NSSfLEUZyerOS5ip8H9FtFRLjGT4SEXibqTCXPtKfG4eE4rnT5EO3SOQIOfnlpN1ep8/IfzHBaEu
tk4ucI5Qr1A9SnmdZUQPAZjpo0I5iNHjsG8ojoClOVVXguxT9NfamRB4MXFVzW3HpMHcKhRlxHRJ
qttYzLYMc7cC0oRyRo7GJahXldpZnQJZJNDljB3uiQxf63CT2oXBWPE5h19NddYYG0chOAqlFdWw
TIPgwaPHdda186yUWFsm4DZUaCuS3Ffq3VRTiLbcYSKQFpO4zI3Kr4Kr8LGw7NbGlByyNB953X5c
Gcj2BM7P1BY8HrcKD1FVGPhFQE6cGXjbrRmLCibQNXXdcEmv6IwjexNZwIUlbWm+BDDJ7+m9EYQL
KVQsV5AsbEjUcisMDcLwctXLQ42bBm98v4bNQQuZgHClHNWfoNg9ta1LIeqmaiBYuXw27b9bm3K0
UJvL043qJgnF5rN9xtFrgL814LQn/1PIcXLkU1vLVr6sdGRslVpTcWRTYQM3ZmgzNM6rQtsVlibK
My0rUKVtLx3mTtiqwLjFVyy5/05uvTbSmRhqgMJp+ZqCMU7vUkRHQhe05UNuRhwLAUFkMBHqRBc3
Aze+EnJweGlIsWs1dqcB/PUNlkwzM352fp/Yj0ClHni/aPOYiRahtN3gi+ARCQVhWfgPsiVaHvBh
PfuxRpR4B8w9IaaaU7JiHUu5NKpp66ZS2ImRNwhNqOBQI7Tx9qXRxYJY+9aE4O/6CM2qhkQKLIxu
S1lojgmtRfR2QsbrHMZ6xzxEWc0GW8/RNmzo7ukBxyhTF2c5lAqXxR0HEH9rLVOoHT20mAaar0Do
hM4SZcGQlcOndY1UoaBj05MilAO0x7qDDaQMV6+TBcV+6WGBzYVbz4SwckqR0CJO6PdomXTKccZt
hr0FJGDus4kjWeWmggG4HZJwNOazlTCKiJMDI+5GciZEk8DbNoDYWWoesgTziJlHIFt5SrdhkyLK
rlShC+YlbQUHpu4h7NXF4MXcatlOtWh6TmMqPwQOLhSwBtDYDFbBfM1qUeDGMrN6KzKJxA1DGWu4
LkoI71Dep1hXWVLbe+SlBTlQb4pjhN4jhcse/mIsymTC42n9DAR7QtBaTw94OWE+NaIBqBiAiFIk
yuO9NQFORln07RSpayK2egqZhLmEZCo7zMmuVA8kJSsihpguTQSkQSF5MF8Fi4xSfWaRDBFBItqK
GJkngGKdpETdDtv1tvz3WJJhM/OUIRPIFs5ebc4PYS7RidBwPR4iVAUrW5UbuWQWyKaWOl5nqMdh
M8YJgvVyX9nE2mzE3VIVKVVcAqmIPQTSuQyKV2HUzBicy0q8tQK1S2wkHijodvtJWJV7olpe8ZrF
zrPSRuMRVOgdKqLkpFgxTMjnxPW+lhujh5jfF1D3kArE95aFYxIxRAlpHD1MzwtTWXphFiiNPguI
uHdvSznIrVzIYX3qWjnmIiC5+31Jx7xaeNSsMMTOSdjRPd2LZFJlUg5Xfrdb/4u5IpwoSH2gzoUA


--===============0122527851==--