From: marko.makela
Date: August 19 2010 10:23am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3168) Bug#56114
List-Archive: http://lists.mysql.com/commits/116222
X-Bug: 56114
Message-Id: <201008191023.o7JA45LJ007927@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1901214802=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA4MTkwNDE2NDctd3g5dDlq
dHVrZHRiMjNqdgoKIDMxNjggTWFya28gTcOka2Vsw6QJMjAxMC0wOC0xOQogICAgICBCdWcjNTYx
MTQgRGlzYWxsb3cgdHJ4LT5kaWN0X29wZXJhdGlvbl9sb2NrX21vZGU9PVJXX1hfTEFUQ0ggaW4g
c3J2X3N1c3BlbmRfbXlzcWxfdGhyZWFkKCkKICAgICAgCiAgICAgIE9ubHkgYWxsb3cgdHJ4LT5k
aWN0X29wZXJhdGlvbl9sb2NrX21vZGUgdG8gYmUgMCBvciBSV19TX0xBVENIIGluCiAgICAgIHNy
dl9zdXNwZW5kX215c3FsX3RocmVhZCgpLiBUcmFuc2FjdGlvbnMgdGhhdCBtb2RpZnkgSW5ub0RC
CiAgICAgIGRhdGEgZGljdGlvbmFyeSB0YWJsZXMgbXVzdCBiZSBmcmVlIG9mIGxvY2sgd2FpdHMs
IGJlY2F1c2UgdGhleQogICAgICBtdXN0IGJlIGhvbGRpbmcgdGhlIGRhdGEgZGljdGlvbmFyeSBs
YXRjaCBpbiBleGNsdXNpdmUgbW9kZS4KICAgICAgVGhlIHRyYW5zYWN0aW9ucyBtdXN0IG5vdCBi
ZSBhY2Nlc3NpbmcgYW55IG90aGVyIHRhYmxlcyBvdGhlciB0aGFuCiAgICAgIHRoZSBkYXRhIGRp
Y3Rpb25hcnkgdGFibGVzLgogICAgICAKICAgICAgVGhpcyBjb2RlIHdhcyBhY2NpZGVudGFsbHkg
YWRkZWQgaW4gdGhlIElubm9EQiBQbHVnaW4sIGFzIGEgd3JvbmcgZml4CiAgICAgIG9mIGFuIGFz
c2VydGlvbiBmYWlsdXJlLiAoRmFzdCBpbmRleCBjcmVhdGlvbiB3YXMgYWNjZXNzaW5nIGJvdGgK
ICAgICAgZGF0YSBkaWN0aW9uYXJ5IHRhYmxlcyBhbmQgdXNlciB0YWJsZXMgaW4gdGhlIHNhbWUg
dHJhbnNhY3Rpb24uKQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9z
cnYwc3J2LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYu
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jCXJldmlkOmppbW15LnlhbmdA
b3JhY2xlLmNvbS0yMDEwMDgxOTA0MTY0Ny13eDl0OWp0dWtkdGIyM2p2CisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2Uvc3J2L3NydjBzcnYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDgxOTEwMjMzMi12Zm1naDd1emRmcG5kcTFoCkBAIC0xNTgzLDEzICsxNTgzLDIwIEBAIHNydl9z
dXNwZW5kX215c3FsX3RocmVhZCgKIAloYWRfZGljdF9sb2NrID0gdHJ4LT5kaWN0X29wZXJhdGlv
bl9sb2NrX21vZGU7CiAKIAlzd2l0Y2ggKGhhZF9kaWN0X2xvY2spIHsKKwljYXNlIDA6CisJCWJy
ZWFrOwogCWNhc2UgUldfU19MQVRDSDoKIAkJLyogUmVsZWFzZSBmb3JlaWduIGtleSBjaGVjayBs
YXRjaCAqLwogCQlyb3dfbXlzcWxfdW5mcmVlemVfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CiAJCWJy
ZWFrOwotCWNhc2UgUldfWF9MQVRDSDoKLQkJLyogUmVsZWFzZSBmYXN0IGluZGV4IGNyZWF0aW9u
IGxhdGNoICovCi0JCXJvd19teXNxbF91bmxvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CisJZGVm
YXVsdDoKKwkJLyogVGhlcmUgc2hvdWxkIG5ldmVyIGJlIGEgbG9jayB3YWl0IHdoZW4gdGhlCisJ
CWRpY3Rpb25hcnkgbGF0Y2ggaXMgcmVzZXJ2ZWQgaW4gWCBtb2RlLiAgRGljdGlvbmFyeQorCQl0
cmFuc2FjdGlvbnMgc2hvdWxkIG9ubHkgYWNxdWlyZSBsb2NrcyBvbiBkaWN0aW9uYXJ5CisJCXRh
Ymxlcywgbm90IG90aGVyIHRhYmxlcy4gQWxsIGFjY2VzcyB0byBkaWN0aW9uYXJ5CisJCXRhYmxl
cyBzaG91bGQgYmUgY292ZXJlZCBieSBkaWN0aW9uYXJ5CisJCXRyYW5zYWN0aW9ucy4gKi8KKwkJ
dXRfZXJyb3I7CiAJCWJyZWFrOwogCX0KIApAQCAtMTYwMiwxMyArMTYwOSw4IEBAIHNydl9zdXNw
ZW5kX215c3FsX3RocmVhZCgKIAkvKiBBZnRlciByZXN1bWluZywgcmVhY3F1aXJlIHRoZSBkYXRh
IGRpY3Rpb25hcnkgbGF0Y2ggaWYKIAluZWNlc3NhcnkuICovCiAKLQlzd2l0Y2ggKGhhZF9kaWN0
X2xvY2spIHsKLQljYXNlIFJXX1NfTEFUQ0g6CisJaWYgKGhhZF9kaWN0X2xvY2spIHsKIAkJcm93
X215c3FsX2ZyZWV6ZV9kYXRhX2RpY3Rpb25hcnkodHJ4KTsKLQkJYnJlYWs7Ci0JY2FzZSBSV19Y
X0xBVENIOgotCQlyb3dfbXlzcWxfbG9ja19kYXRhX2RpY3Rpb25hcnkodHJ4KTsKLQkJYnJlYWs7
CiAJfQogCiAJaWYgKHdhc19kZWNsYXJlZF9pbnNpZGVfaW5ub2RiKSB7Cgo=

--===============1901214802==
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: 66f40b718b80aa801b97b22be8c942733fc4d073
# timestamp: 2010-08-19 13:23:39 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   wx9t9jtukdtb23jv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY52dtoAAfVflAAwWnf//39m
3MC////4BAAIAFAFTab0Tc53XVxpbjobgkkmmQJoNMQyQaTE0bU0NDTTQ0DEAZCRiMmimnqn6m1T
T1BkHqNMIyGjIwJjUCSIEFPCaU8mmo9T1GNCaANAaaGg0Mg4yZMmIxMAJkwTIAaMIwBDAJIkKeam
1GaqflJ4nqnqaejSDQAbU9RkA0AYBhhmZF51+QZdGqyvRJtwP47v9/abeCkqqfoyMKVkU44UnLbt
hKOX9l1lp00fXj42ZkaqN1LDsnXu3QMmmxlPzxyRmq2X+rRjfnud/thjX/e1VETmvXrfK3PrQVVs
+zUghG3qByNX5lA99hxO9t0ZlmFR1zocVcMZyjwWTjlU7FHZsZyZmaQ0YmLTIMdpZmJRsw5Nu47c
e94uhDssblMvNq9m6V3BvlstMF4iPBelcZUuWbX6NPD6BbFXtTGM+EJ9Sikc6UQ6PVLjzU8UBGxm
ETtEd9QAxWGipdNN4jChURlZMpW6fctdqiERiDYc04j25RdPq5N5yyWUWumlhQrLa45q4Zi+whe/
zqwd5V1CKl2LLz2HTIIhTQMyyNd+xSyK7ETsRGiidWi0qa+D9Sso2rO4MehuxE5plW2YqBQzGi3J
grC+m4LwsWDxha9zBKayHMDVdqJldynXAqK8O9pWNF4xKnCyrIL+Nt7KlQGKtC1p8s0Lsq6ijE5V
GUVoeOhPW99yrI6BytZ67QhFTWqRGJgIJvA5rWLKG/I1mbEh9YnOAqbFiwpC6FMI6BhLaLyBuTWh
ltsHSGjWfiU2ozUVIITWjkqkBbRwrVNM0CcJp2nW7H3F9dpVbzSOOq7dgb866g2pd5X8ykzMMfTz
eB6yJDrqR9R55EzqGLH9497N4DP8e7yNeJlwYHc2FBA+Hmc6jpHCRQudujmWLG6tL++QriBEN/Mk
PejIvg9UZB7eolypdFVLW0vbGxvkDofmvR+7UrEFMj2v205m1hiPfInZ7mVGBNU3kBtaM6VqgAyb
PoXn3yUEzH8DWJFzGFLjcX3AegbIlcBp1Or4CyJ0jh3JpGD0NUnZAwargYjAx5biyRwjwLFWmYxU
ScEo8cxrYDSmOVlVkDmD8u0SAgh3xbtxBt1l27gvc5MRccfRslkhZyPcnzAo6dNMnwjdVdU/hfuG
qmDIVsVZnY10ydvp+3dBpo6qa+JtO1xrAlwMpPUnJtkqfqviPhDge4vAxou2MNokDJtyLJCbWQVp
bTPZcGBOePHAxFe5tkJ3o4qQ8LB4EXihsMLhxm5RPpDqpS3yjvens2WKkM6LXHNgZ9KO1hP4VmdH
nlWtXPP6GVK3kB2bOT03YXwpIsyZJauKizEMxhNobjqDnXtV61pixjOnS7dYcgFMcgtB3D6jJTIr
dtrSGNwEufSoekBcUkHJsjZg5JzJHET/B1BMtWJvDSGkHOxgZZDNSg+duWoJlKMNU7Ngw7MlRkES
ARG8ooygnaQcOlR7u4noVRIKkWCkyZPjycYyVRqE2PAwaPNs04bqAnvEHoqhAH3xoN2JGAYrU6wL
qLTkWTOZ5djMnG4iqhVa4dAoFEdWpknAFeZb2eWtbmJ1xvsRjfvuS0yAvV2yOW/RTmskiDlQRZDD
KGZjTreDQKUgQZ3RCO9KmcwnF9jX0UioKRsWmB8zpWxMcNmi8wY56yDQwRcYSzunZ8cudeGdkda+
BEMA9QxK3QpE9Myy50ZM6bApDgzDQvYZCmbwXJRcFeWGEHFeM3/mnBgaH032mj2mrDeN/1BeSKUC
pctMtgt8AjQSRoapRqibU4ODVaFzUK1gzA3lByc8hWmbP/i3r/4u5IpwoSEc7O20


--===============1901214802==--