From: marko.makela
Date: May 19 2010 8:07am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3472)
List-Archive: http://lists.mysql.com/commits/108578
Message-Id: <201005190807.o4J6L11H012742@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2059693688=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwODAxNTItaDM1NTVv
cW11M3dvOTVzbwoKIDM0NzIgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBNYWtlIFVO
SVZfREVCVUcgVmFsZ3JpbmQgZnJpZW5kbHkuIFVzZSB8IGluc3RlYWQgb2YgKywKICAgICAgYW5k
IG1hc2sgb3V0IHRoZSBkb250LWNhcmUgYml0cyBpbiBkZWJ1ZyBhc3NlcnRpb25zLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9tYWNoMGRhdGEuaWMK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL21hY2gwZGF0
YS5pYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvbWFjaDBkYXRhLmljCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgwMTUyLWgzNTU1b3FtdTN3bzk1
c28KKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvbWFjaDBkYXRhLmljCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgwNzQzLTVteWYxZzd2NnBmeXNpZHQK
QEAgLTM2LDcgKzM2LDcgQEAgbWFjaF93cml0ZV90b18xKAogCXVsaW50CW4pCS8qITwgaW46IHVs
aW50IGludGVnZXIgdG8gYmUgc3RvcmVkLCA+PSAwLCA8IDI1NiAqLwogewogCXV0X2FkKGIpOwot
CXV0X2FkKG4gPD0gMHhGRlVMKTsKKwl1dF9hZCgobiB8IDB4RkZVTCkgPD0gMHhGRlVMKTsKIAog
CWJbMF0gPSAoYnl0ZSluOwogfQpAQCAtNjUsNyArNjUsNyBAQCBtYWNoX3dyaXRlX3RvXzIoCiAJ
dWxpbnQJbikJLyohPCBpbjogdWxpbnQgaW50ZWdlciB0byBiZSBzdG9yZWQgKi8KIHsKIAl1dF9h
ZChiKTsKLQl1dF9hZChuIDw9IDB4RkZGRlVMKTsKKwl1dF9hZCgobiB8IDB4RkZGRlVMKSA8PSAw
eEZGRkZVTCk7CiAKIAliWzBdID0gKGJ5dGUpKG4gPj4gOCk7CiAJYlsxXSA9IChieXRlKShuKTsK
QEAgLTgxLDEwICs4MSw3IEBAIG1hY2hfcmVhZF9mcm9tXzIoCiAvKj09PT09PT09PT09PT0qLwog
CWNvbnN0IGJ5dGUqCWIpCS8qITwgaW46IHBvaW50ZXIgdG8gMiBieXRlcyAqLwogewotCXV0X2Fk
KGIpOwotCXJldHVybiggKCh1bGludCkoYlswXSkgPDwgOCkKLQkJKyAodWxpbnQpKGJbMV0pCi0J
CSk7CisJcmV0dXJuKCgodWxpbnQpKGJbMF0pIDw8IDgpIHwgKHVsaW50KShiWzFdKSk7CiB9CiAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKQEAgLTEyOSw3ICsxMjYsNyBAQCBtYWNoX3dyaXRlX3RvXzMoCiAJdWxpbnQJbikJLyoh
PCBpbjogdWxpbnQgaW50ZWdlciB0byBiZSBzdG9yZWQgKi8KIHsKIAl1dF9hZChiKTsKLQl1dF9h
ZChuIDw9IDB4RkZGRkZGVUwpOworCXV0X2FkKChuIHwgMHhGRkZGRkZVTCkgPD0gMHhGRkZGRkZV
TCk7CiAKIAliWzBdID0gKGJ5dGUpKG4gPj4gMTYpOwogCWJbMV0gPSAoYnl0ZSkobiA+PiA4KTsK
QEAgLTE0OCw4ICsxNDUsOCBAQCBtYWNoX3JlYWRfZnJvbV8zKAogewogCXV0X2FkKGIpOwogCXJl
dHVybiggKCh1bGludCkoYlswXSkgPDwgMTYpCi0JCSsgKCh1bGludCkoYlsxXSkgPDwgOCkKLQkJ
KyAodWxpbnQpKGJbMl0pCisJCXwgKCh1bGludCkoYlsxXSkgPDwgOCkKKwkJfCAodWxpbnQpKGJb
Ml0pCiAJCSk7CiB9CiAKQEAgLTE4Myw5ICsxODAsOSBAQCBtYWNoX3JlYWRfZnJvbV80KAogewog
CXV0X2FkKGIpOwogCXJldHVybiggKCh1bGludCkoYlswXSkgPDwgMjQpCi0JCSsgKCh1bGludCko
YlsxXSkgPDwgMTYpCi0JCSsgKCh1bGludCkoYlsyXSkgPDwgOCkKLQkJKyAodWxpbnQpKGJbM10p
CisJCXwgKCh1bGludCkoYlsxXSkgPDwgMTYpCisJCXwgKCh1bGludCkoYlsyXSkgPDwgOCkKKwkJ
fCAodWxpbnQpKGJbM10pCiAJCSk7CiB9CiAKQEAgLTcyMSw3ICs3MTgsNyBAQCBtYWNoX3JlYWRf
ZnJvbV8yX2xpdHRsZV9lbmRpYW4oCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PSovCiAJ
Y29uc3QgYnl0ZSoJYnVmKQkJLyohPCBpbjogZnJvbSB3aGVyZSB0byByZWFkICovCiB7Ci0JcmV0
dXJuKCh1bGludCkoKmJ1ZikgKyAoKHVsaW50KSgqKGJ1ZiArIDEpKSkgKiAyNTYpOworCXJldHVy
bigodWxpbnQpKGJ1ZlswXSkgfCAoKHVsaW50KShidWZbMV0pIDw8IDgpKTsKIH0KIAogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
Cg==

--===============2059693688==
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.1-innodb/
# testament_sha1: 3c2ef6a3c5420b167222382b32c8716b1f299399
# timestamp: 2010-05-19 11:07:52 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   h3555oqmu3wo95so
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW/GU00AAibfgFAwW2///1en
Awq/7//0UAR4K3klbsbdw67O4SiJGBTammjyZT9FHppHlAAAA9QeoCShDQDU00BNPU0A0NAANABo
BIimhKfpNpMAptJ6mmmR6Q0A00Ym1NDQc0xMmTRhMExNMAmAQwRgRgEkkAmyU9NMjEI2lHogek0A
9T0mmmgGPlCgiiM2bEsyNGjbx0GofZvPlgosA1hc27J10EtvAbcTmqL6O2//BwNdWox52DaO6nM2
3+Es9eDPDvjnyTNldUOW8uSldVTkdgc0aQNXXze37zlGePbpOw8NUzSIp4ScTDWy8uV2vHs0athX
qm6HTYBGnHKDcQrTv6t/Rw6F7pUvMgciY2zl5DtG0daccKBxKsH+ndB+RA+AvEuB7JGE9SUYbVjn
SW0iGCWCEu2RRV7kW+SsE28bvvENByBUpqEQIjKgyEd5nDArjT3BUkp6mtqx6a4IHaKGyZYwnUk8
l4wOymoapU3E5fVRVtS2c9kEEHcIF4RhKYFh5SjjIVNuaN87K8RZNQR8iO8mqCakdIDBn5tzRYTV
UJdFGJrKXwzFyvhEpApoM32qnZLa4PgTkInMFAqouzRqQoNcpMZQ1wfhpdjNUW2xl9A8L1kuMeuk
rVkwXiaI3jOWhnHaBSLSszVvrvJXvLwkOlTkYwfykwFdITFoeEJrhSLQEb1yE+aiEz2oImKwpDQD
CeRGOEjnjWKtlJQYi0J8ccHMiB4i0jCM5VibvyWTMptvDEFHOUhLPOvaiLizetGXMztcAyMmJFus
bUUEN1UOrpa4tx09M1wVzE5lziMUgzef39TvBeImWoxxUSefM3Vx/kKqx8xV16iqEllIy1ir+1hP
SioLT27JEOD1HWUA47hH+ec1w4CKslOOqIw8ZhGfvsM8pvs4PqFTSkYMuxdUoWGBrOJ2jEhN4paw
iOI+rh7pjG+4QxQERQXwDpKzIHvrJz3yhmLyQOT5WKyZliIUfARlm10DOZIJUJ2C0r55C4MKuwRB
MRPRCQ4V169WhGIhljJRlUxsa987yegtkHgZLm0lxnba4wJGF3gmIfCfFkGMKZSqxRzCHp2G/QGL
QKIyiNgw40BpKj49W0txcGWkW6EBbhTbfLWZdQUJtYNjB1aCLXvTPt9IqBRymsu1BEaTipcghXJa
g68ZI4AZn3AebKTNc5rVh+mEXBYkbpkwjVOIZS7UDNspkDDeIwOzYI6HbT5jk1+dVEWNZc+Sg71p
84rK3xq48tSXAdFxYDYaqRO3Wp2clciHYENDKLLawjmpqoyGxInA3NtlRoXiI3hBcHKul+bFo5zk
z5CALhI5oIBb8qaKNKNESobwKJ/EN2eNUbC/n6MCRcsRorxhaqMqUJ5ZIG9B9dEVQWmYWkCMNq1r
02lTuwC2FV8KpBRxj9dZWqdZKvh4c5Y8nmIGRhKFSsaRMTaxxcoTrMuBBkkVFZXsre9BQVDawJ6u
zuXaKRQhQ5zTCv6BNqtNkW7NLYrxhg/4u5IpwoSDfjKaaA==


--===============2059693688==--