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

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

IDMwNjQgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBNZXJnZSBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDQ2CiAgICAgICAg
cmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTA1MTAwNTA3LTZrY2Qy
aGYzMmhydXhidjcKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTA1MDk1MzI4LXZldG5sMGZsaG1oYW83cDUKICAgICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtl
bMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmljazogNS4xLWlu
bm9kYgogICAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAtMDUtMDUgMTM6MDU6MDcgKzAzMDAKICAg
ICAgICBtZXNzYWdlOgogICAgICAgICAgQWRkIFZhbGdyaW5kIGRpYWdub3N0aWNzIHRvIHRyYWNr
IGRvd24gQnVnICMzODk5OS4KICAgICAgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCiAzMDYzIEppbW15IFlhbmcJMjAxMC0wNS0wNAogICAg
ICBGaXggYnVnICM1MzE2NSwgU2V0dGluZyBpbm5vZGJfY2hhbmdlX2J1ZmZlcmluZz1ERUZBVUxU
IHByb2R1Y2VzIGluY29ycmVjdCByZXN1bHQuCiAgICAgIAogICAgICByYjovLzI5NSBhcHByb3Zl
ZCBieSBNYXJrbwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIv
aGFfaW5ub2RiLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
c2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwkyMDEwLTA1LTA0IDEw
OjUyOjE0ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwkyMDEwLTA1
LTA1IDEwOjE0OjA2ICswMDAwCkBAIC0yNDk4LDYgKzI0OTgsNyBAQCByb3dfc2VsX2ZpZWxkX3N0
b3JlX2luX215c3FsX2Zvcm1hdCgKIAlieXRlKglwYWRfcHRyOwogCiAJdXRfYWQobGVuICE9IFVO
SVZfU1FMX05VTEwpOworCVVOSVZfTUVNX0FTU0VSVF9SVyhkYXRhLCBsZW4pOwogCiAJc3dpdGNo
ICh0ZW1wbC0+dHlwZSkgewogCWNhc2UgREFUQV9JTlQ6CkBAIC0yNzQ2LDYgKzI3NDcsOSBAQCBy
b3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAkJCS8qIE15U1FMIGFzc3VtZXMgdGhhdCB0aGUgZmll
bGQgZm9yIGFuIFNRTAogCQkJTlVMTCB2YWx1ZSBpcyBzZXQgdG8gdGhlIGRlZmF1bHQgdmFsdWUu
ICovCiAKKwkJCVVOSVZfTUVNX0FTU0VSVF9SVyhwcmVidWlsdC0+ZGVmYXVsdF9yZWMKKwkJCQkJ
ICAgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKKwkJCQkJICAgdGVtcGwtPm15c3FsX2NvbF9s
ZW4pOwogCQkJbXlzcWxfcmVjW3RlbXBsLT5teXNxbF9udWxsX2J5dGVfb2Zmc2V0XQogCQkJCXw9
IChieXRlKSB0ZW1wbC0+bXlzcWxfbnVsbF9iaXRfbWFzazsKIAkJCW1lbWNweShteXNxbF9yZWMg
KyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKQEAgLTMwNzAsNiArMzA3NCwxMSBAQCByb3dfc2Vs
X3BvcF9jYWNoZWRfcm93X2Zvcl9teXNxbCgKIAogCQlmb3IgKGkgPSAwOyBpIDwgcHJlYnVpbHQt
Pm5fdGVtcGxhdGU7IGkrKykgewogCQkJdGVtcGwgPSBwcmVidWlsdC0+bXlzcWxfdGVtcGxhdGUg
KyBpOworI2lmIDAgLyogU29tZSBvZiB0aGUgY2FjaGVkX3JlYyBtYXkgbGVnaXRpbWF0ZWx5IGJl
IHVuaW5pdGlhbGl6ZWQuICovCisJCQlVTklWX01FTV9BU1NFUlRfUlcoY2FjaGVkX3JlYworCQkJ
CQkgICArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAorCQkJCQkgICB0ZW1wbC0+bXlzcWxfY29s
X2xlbik7CisjZW5kaWYKIAkJCXV0X21lbWNweShidWYgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNl
dCwKIAkJCQkgIGNhY2hlZF9yZWMgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKIAkJCQkgIHRl
bXBsLT5teXNxbF9jb2xfbGVuKTsKQEAgLTMwODQsNiArMzA5MywxMSBAQCByb3dfc2VsX3BvcF9j
YWNoZWRfcm93X2Zvcl9teXNxbCgKIAkJfQogCX0KIAllbHNlIHsKKyNpZiAwIC8qIFNvbWUgb2Yg
dGhlIGNhY2hlZF9yZWMgbWF5IGxlZ2l0aW1hdGVseSBiZSB1bmluaXRpYWxpemVkLiAqLworCQlV
TklWX01FTV9BU1NFUlRfUlcocHJlYnVpbHQtPmZldGNoX2NhY2hlCisJCQkJICAgW3ByZWJ1aWx0
LT5mZXRjaF9jYWNoZV9maXJzdF0sCisJCQkJICAgcHJlYnVpbHQtPm15c3FsX3ByZWZpeF9sZW4p
OworI2VuZGlmCiAJCXV0X21lbWNweShidWYsCiAJCQkgIHByZWJ1aWx0LT5mZXRjaF9jYWNoZVtw
cmVidWlsdC0+ZmV0Y2hfY2FjaGVfZmlyc3RdLAogCQkJICBwcmVidWlsdC0+bXlzcWxfcHJlZml4
X2xlbik7CkBAIC0zMTM0LDYgKzMxNDgsOCBAQCByb3dfc2VsX3B1c2hfY2FjaGVfcm93X2Zvcl9t
eXNxbCgKIAl9CiAKIAl1dF9hZChwcmVidWlsdC0+ZmV0Y2hfY2FjaGVfZmlyc3QgPT0gMCk7CisJ
VU5JVl9NRU1fSU5WQUxJRChwcmVidWlsdC0+ZmV0Y2hfY2FjaGVbcHJlYnVpbHQtPm5fZmV0Y2hf
Y2FjaGVkXSwKKwkJCSBwcmVidWlsdC0+bXlzcWxfcm93X2xlbik7CiAKIAlpZiAoVU5JVl9VTkxJ
S0VMWSghcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAJCQkJICBwcmVidWlsdC0+ZmV0Y2hfY2Fj
aGVbCgo=

--===============0140775019==
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:31 +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


--===============0140775019==--