From: marko.makela
Date: December 2 2010 8:32am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3251) Bug#58226
List-Archive: http://lists.mysql.com/commits/125762
X-Bug: 58226
Message-Id: <201012020832.oB28Wm7w011473@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0994631674=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTEzMDkwMi1xMGc1
NHVmaWkwNm9yNG9lCgogMzI1MSBNYXJrbyBNw6RrZWzDpAkyMDEwLTEyLTAyCiAgICAgIEZpeCBV
TklWX01FTV9ERUJVRyBjb21waWxhdGlvbiBmYWlsdXJlIGNhdXNlZCBieSBCdWcjNTgyMjYgZml4
LgogICAgICAKICAgICAgVG8gZml4IEJ1ZyM1ODIyNiAoc3BlZWQgdXAgVU5JVl9ERUJVRyksIGFt
b25nIG90aGVyIHRoaW5ncyB3ZSBubyBsb25nZXIKICAgICAgZGlzYWJsZSB0aGUgaW5saW5pbmcg
b2YgdGhlIGZ1bmN0aW9ucyB0aGF0IGFyZSBkZWZpbmVkIGluIElubm9EQiAuaWMgZmlsZXMuCiAg
ICAgIEluc2lkZSBVTklWX01FTV9ERUJVRywgdGhlcmUgd2FzIGFuIGltcGxpY2l0IHR5cGUgY29u
dmVyc2lvbiBmcm9tIHZvaWQqCiAgICAgIHRoYXQgaXMgYWxsIHJpZ2h0IGluIEMsIGJ1dCBub3Qg
aW4gQysrLiBOb3cgdGhhdCBpbmxpbmluZyB3YXMgZW5hYmxlZCwKICAgICAgdGhlIEMrKyBjb21w
aWxlciB3b3VsZCBzZWUgdGhlIGNvZGUgYW5kIGNvbXBsYWluLgogICAgICAKICAgICAgQXBwcm92
ZWQgYnkgSmltbXkgWWFuZyBvbiBJUkMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9tZW0wbWVtLmljCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvbWVtMG1lbS5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL21l
bTBtZW0uaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDExMzA5MDItcTBn
NTR1ZmlpMDZvcjRvZQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbWVtMG1lbS5pYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMjA4MzIyNy1sN2tjNmh3MDVzZDg1
bHppCkBAIC0zNTAsMjcgKzM1MCwyNyBAQCBtZW1faGVhcF9nZXRfdG9wKAogCXVsaW50CQluKQkv
KiE8IGluOiBzaXplIG9mIHRoZSB0b3Btb3N0IGVsZW1lbnQgKi8KIHsKIAltZW1fYmxvY2tfdCoJ
YmxvY2s7Ci0Jdm9pZCoJCWJ1ZjsKKwlieXRlKgkJYnVmOwogCiAJdXRfYWQobWVtX2hlYXBfY2hl
Y2soaGVhcCkpOwogCiAJYmxvY2sgPSBVVF9MSVNUX0dFVF9MQVNUKGhlYXAtPmJhc2UpOwogCi0J
YnVmID0gKGJ5dGUqKWJsb2NrICsgbWVtX2Jsb2NrX2dldF9mcmVlKGJsb2NrKSAtIE1FTV9TUEFD
RV9ORUVERUQobik7CisJYnVmID0gKGJ5dGUqKSBibG9jayArIG1lbV9ibG9ja19nZXRfZnJlZShi
bG9jaykgLSBNRU1fU1BBQ0VfTkVFREVEKG4pOwogCiAjaWZkZWYgVU5JVl9NRU1fREVCVUcKLQl1
dF9hZChtZW1fYmxvY2tfZ2V0X3N0YXJ0KGJsb2NrKSA8PSh1bGludCkoKGJ5dGUqKWJ1ZiAtIChi
eXRlKilibG9jaykpOworCXV0X2FkKG1lbV9ibG9ja19nZXRfc3RhcnQoYmxvY2spIDw9ICh1bGlu
dCkgKGJ1ZiAtIChieXRlKikgYmxvY2spKTsKIAogCS8qIEluIHRoZSBkZWJ1ZyB2ZXJzaW9uLCBh
ZHZhbmNlIGJ1ZiB0byBwb2ludCBhdCB0aGUgc3RvcmFnZSB3aGljaAogCXdhcyBnaXZlbiB0byB0
aGUgY2FsbGVyIGluIHRoZSBhbGxvY2F0aW9uKi8KIAotCWJ1ZiA9IChieXRlKilidWYgKyBNRU1f
RklFTERfSEVBREVSX1NJWkU7CisJYnVmICs9IE1FTV9GSUVMRF9IRUFERVJfU0laRTsKIAogCS8q
IENoZWNrIHRoYXQgdGhlIGZpZWxkIGxlbmd0aHMgYWdyZWUgKi8KLQl1dF9hZChuID09ICh1bGlu
dCltZW1fZmllbGRfaGVhZGVyX2dldF9sZW4oYnVmKSk7CisJdXRfYWQobiA9PSBtZW1fZmllbGRf
aGVhZGVyX2dldF9sZW4oYnVmKSk7CiAjZW5kaWYKIAotCXJldHVybihidWYpOworCXJldHVybigo
dm9pZCopIGJ1Zik7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKCg==

--===============0994631674==
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: 5077521477c77f3e448cb9a366324ae1a5d1e35d
# timestamp: 2010-12-02 10:32:33 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   q0g54ufii06or4oe
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSPnVqgAAgRflAAwWn///3/3
XzC////wBAAIAFAE3vb3ABnYNFGnQNCSZqbVPI0xJ5ATaRkeo9QNGgNNGanqaMQOMmTRiGJpgIGB
NMEYJiaaaADCEIptoKDQaA0AAAAAAAAAaaTTVT1NMIYEYj0gGgYQxMIMjIGgJIiADQgDJDRojTUb
Uj0PUBo0AaJpqXHYJCuN2nETfl6fecc6it8o2REv14Z6OHKajk76uO1LYoPD0zB+WvTtElE0VQBq
aabG8tEgwUU2VGMFjATf19m7fqUAkMeDBsWtz8uGqJ8mqQ0M06lBywkr9++822a3gbw4JZDloR0G
m0PdZwb+KkGiKYryh6snXAQehUgiBzCoIoka2u8oMrz6HPOyek9SbVnXoQttYbhb9A7wnjTEoW0R
d/C9adWy8vEX8+xds/Tq1UaVbEjt146mO4R1QuvpgrBkMwzV+LtgJdicRsUBfO5tXQWV6toSp8ly
PaQYZVwKYeS/pbFgkeM4jDHt4FmM6+SEYLBkEqn17Nc+S+K8z22R3ZfUsPlmKmUrDKEeEtq8zUtM
xFKCApsJ9haLwIk0XFQzs9Sk4ZejeiKo02ceEMbMWaheL8icWWKKxha0xnZory8vI7aJLWxPXXIw
qtYs2vUVFFqxjaoq7hw1W2rLUZ+atdR2TL0LqRgxwGHsUS0VAsnq1Zk5POqNs0xYqpSkokFxygLx
uXZZgmFK65m6nRcQpoT571VVSYVK7KAq6MW1rinc1tVfIVMBPWEvGNluhhTSWElBHKQWyrLZ5q3V
bW75YNPeFECh01DVgsBxZ2ias0DzMR94MeVHd18UQgoRS8WWeIt94ENdqDOxDBmagGEKdCs20kVr
26mEw26qagGvRkJdhj7JVVp0tiRGc4UKBsrCRFec8RsdiOkUJn/RFBRJUaUV0Pf4mWFTmwP7vxdM
HZ0X/Pd5HuEdX+V2+/BIzJE0AqqyEfVxrbJqG/vJ7kbahFHwPKG1MXfXDrdbjVtPcuOBh+o287/j
Fmi7JnN/RAyuXVefZ9qMDmLq5q51iv8+6rnef92MnYdIgqvgkbHCF4zGbTlI/3DGzvfAjNStRQpq
BR1zqu/3qD5K+8oXQxupp69h4PQ90Du1wjOodFEFzgXHwkWlBzZEkDqOrAfHJiDMuO9Xr6RwOQ28
JuBlySYVjrHjkllnPqaXxc7xEzcEGvs1G5MuHCa/PN48KdtF1pWrEVqHNbmLVpjoR001T5qdbjjP
geutfh22FzHJjwod2gFBcuiITqt5HENixYLKHW7wFyMAGVimMOHaDZy4mR4rKMlZdDqibvoRngtu
Dcu4QazlMAuOATQhYgSfDdXYyQ1MsQ5d0sWpu0nMUwdrHsFsEf1mHFIq6+sLQg+8TIWk3dB/XckO
PW5PIouN70C3UW1p/YK3mkMJmXaI0XvPwGfr2LD1LQolzam86r3qZokFCLTsQJEZk+LRKQkdkoqq
CJCqpNYhkIwF6oLs0iAlModfT/1LiG3ibfL5Vb3EIpKFgvXqqhNOdF+6R6gkubq+3H5rq/t2wn4s
yc/nwqgFtHwohmuOjIpTMku+mMcjiGNdZsCrnIRBgrisJ+CkmSQmGS0Ea8TqScasAP2A3CcYwuv4
WhG5e3vvI1IpMvNy+uy0jEqg37jZGihLE1sbxlexY9siHOwLgipnUr6tVqzF0XoX7dC1VX1ZY2ci
vFsQmwCu6bcKAZLunVh2YK+CsoJCo/+P9f+i7kinChIEfOrVAA==


--===============0994631674==--