From: marko.makela
Date: June 9 2011 6:50pm
Subject: bzr commit into mysql-5.1 branch (marko.makela:3642) Bug#12612184
List-Archive: http://lists.mysql.com/commits/139001
X-Bug: 12612184
Message-Id: <201106091851.p59Ip1gc015369@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0998173903=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjEvIGJh
c2VkIG9uIHJldmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xlLmNvbS0yMDExMDYwOTE4MDUxMC1sYjRy
bTVwNXFpYjdkbm9zCgogMzY0MiBNYXJrbyBNw6RrZWzDpAkyMDExLTA2LTA5CiAgICAgIERpc2Fi
bGUgYSBkZWJ1ZyBhc3NlcnRpb24gdGhhdCB3YXMgYWRkZWQgdG8gdHJhY2sgZG93biBCdWcjMTI2
MTIxODQuCiAgICAgIAogICAgICByb3dfYnVpbGQoKTogVGhlIHJlY29yZCBtYXkgY29udGFpbiBu
dWxsIEJMT0IgcG9pbnRlcnMgd2hlbiB0aGUgc2VydmVyCiAgICAgIGlzIHJvbGxpbmcgYmFjayBh
biBpbnNlcnQgdGhhdCB3YXMgaW50ZXJydXB0ZWQgYnkgYSBzZXJ2ZXIgY3Jhc2guCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vcm93L3JvdzByb3cuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHJvdy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93
LmMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNjA5MTgwNTEwLWxiNHJtNXA1
cWliN2Rub3MKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTg1MDQxLWY1dXIyNGM1bWo3cmcxY3UKQEAgLTIx
MCw3ICsyMTAsMTEgQEAgcm93X2J1aWxkKAogCQl1dF9hZChyZWNfb2Zmc192YWxpZGF0ZShyZWMs
IGluZGV4LCBvZmZzZXRzKSk7CiAJfQogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmlu
ZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWYgMC8qIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBk
ZWZpbmVkIFVOSVZfQkxPQl9MSUdIVF9ERUJVRyovCisJLyogVGhpcyBvbmUgY2FuIGZhaWwgaW4g
dHJ4X3JvbGxiYWNrX29yX2NsZWFuX2FsbF93aXRob3V0X3Nlc3MoKQorCWlmIHRoZSBzZXJ2ZXIg
Y3Jhc2hlZCBkdXJpbmcgYW4gaW5zZXJ0IGJlZm9yZSB0aGUKKwlidHJfc3RvcmVfYmlnX3JlY19l
eHRlcm5fZmllbGRzKCkgZGlkIG10cl9jb21taXQoKQorCWFsbCBCTE9CIHBvaW50ZXJzIHRvIHRo
ZSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLiAqLwogCXV0X2EoIXJlY19vZmZzX2FueV9udWxsX2V4
dGVybihyZWMsIG9mZnNldHMpKTsKICNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZfQkxPQl9M
SUdIVF9ERUJVRyAqLwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3Jvdy9yb3cwcm93LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHJvdy5j
CXJldmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xlLmNvbS0yMDExMDYwOTE4MDUxMC1sYjRybTVwNXFp
Yjdkbm9zCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHJvdy5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA5MTg1MDQxLWY1dXIyNGM1bWo3cmcxY3UKQEAg
LTIzMSw3ICsyMzEsMTEgQEAgcm93X2J1aWxkKAogCQl1dF9hZChyZWNfb2Zmc192YWxpZGF0ZShy
ZWMsIGluZGV4LCBvZmZzZXRzKSk7CiAJfQogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRl
ZmluZWQgVU5JVl9CTE9CX0xJR0hUX0RFQlVHCisjaWYgMCAvKiBkZWZpbmVkIFVOSVZfREVCVUcg
fHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8KKwkvKiBUaGlzIG9uZSBjYW4gZmFp
bCBpbiB0cnhfcm9sbGJhY2tfYWN0aXZlKCkgaWYKKwl0aGUgc2VydmVyIGNyYXNoZWQgZHVyaW5n
IGFuIGluc2VydCBiZWZvcmUgdGhlCisJYnRyX3N0b3JlX2JpZ19yZWNfZXh0ZXJuX2ZpZWxkcygp
IGRpZCBtdHJfY29tbWl0KCkKKwlhbGwgQkxPQiBwb2ludGVycyB0byB0aGUgY2x1c3RlcmVkIGlu
ZGV4IHJlY29yZC4gKi8KIAl1dF9hKCFyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZz
ZXRzKSk7CiAjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0JMT0JfTElHSFRfREVCVUcgKi8K
IAoK

--===============0998173903==
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/mysql-5.1/
# testament_sha1: 111c3f614066bb12f74c4df6429bb4fb3c2c7491
# timestamp: 2011-06-09 21:50:55 +0300
# base_revision_id: dmitry.shulga@stripped\
#   lb4rm5p5qib7dnos
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUgeIoIAAnjflAAwWnP/91fn
hwC////0BAAIAFAFjeZOgjudQKUAASSp6nqniT0yNMiPImTJpo9RpoAaDI0aBlExU9TeDSamp6Ro
AAAaDQANAGp6pqeRDQzKDQAAAAAAADmATATIwAjExMJhMENMTTASSAhpMRoymmBDRT00E2kaNPU0
BmoYDhITsG1US1cAx66jYVU0UmAOOSq6CcPe51MNXw9hduvhsQnMCQSSUck7kdlR5rghImOLEtaV
LLfvND8VvtP1Dj9v79D+GNZKQS3L09Sw7CyouKx9cY3jEloctw95a8+Cs+49Rfcw8J3vNQ/fMpCB
IhyNvdyD7m7vM9vUA5hVZykUISEimmr0rlYKwdOxoVxc6+0LasmhYE5RroAwzPX1hM8l4fZhvioE
ocaREucOwotcRxfKsjAFRJjs080LsUeoY2OWoDzVKhSQqnVv+CFkhyr3FCZdGiyFerYOViDoyvXt
3EkL38DXXpRINQxthhW49bFsF6tMQiw8YHKdEEHcUfqHNAxEHAaTZl8KF4ymbT3AQcauG27Mr36U
Ke66GDiVg5QHrHABzuChCCNXiwzfkI2ItyLJh1tpHVbM7puvsfFQ12rfot1XLM4kQpJQiYsPAiyv
Th5ouTmuHletbIkVXGJfCoyUbDNRAwKgxI11k8AKKUbZhqNV5uHMokjCtallFOgVWD1vNIHinLQB
SbyDXJs4PiZxLbZlKAULlXlA0PFiKcQouwOLGY2iVxbIOEReJTAaLarwNNAAVOjTFZyGaxIXCgsJ
FVCako55cXhiiRE2BAHXPFtUxIYdCpjHE5pSQNLCGJAlFUCIUoUtIBdK0PIDyzA8STnQ3JMgAL5o
HOKuU5JBYhLYo4GZMzRrcaweM5wZNYQRCPsPk8DYfQRGZFrhhDgRtHJ4MEQbjcw1kz8Up8vcvAgc
IszmRL4np9T0mis9uBAXQ7k3geEiiZBE35S309PbJ3WCwJY7k9fV1l6OFHaX+pI8dZbwj8RKpbU8
yX2tSORFTfwGXOxeS86HWHMNxt4rJaHFRFbyBkWezqMoR+Z8UmDSuXYWfKmgDSuM0YYJx+awLySg
q5Hbb6fRducEzAGyhrEnFj9CtHKWIEBHGsd1PM+7I6p3hEGyHosx6K8qM1cQL5YT4DghaWqoobSR
3LWqJ+sw+rztIWjhwwZHq8A053rZ44QbT2mRsJ1eJ3juw8WdgXlyNLsII1BVEpAj9TSQWk56sWdA
LMR5rlLV7rBpSMQ00yqTAwR8dCusJljZETUlSJkkd5CQWxWJwT++B0A5Dg5jtq5qxWn2PAmUDcw4
6GZA3s2sCw7VcLnmzCzF+LKjz31kR9lSolcP3ppKC/OhqCCfaaYFzF4rMEQoiJ7GVDEA03mcA8l/
m/bOmaN4/070dxwYJzNDwOK3CZYpH33oxBTXM48goiEB4OZI5Jw95vcUEmBtyjanYu6k+ESqCFam
8kjM/k80w7rkt9pC4yOabmBapSUzaOq64odK9w4H0HVD4JPGBmDZiLQnqpRcDkzBNy5c9CZIp4pl
sQEhTPY+Bv8xKtEFYOGVblyWjtrSC/KsyV2TDBBVPVMYtJcdYZNABiq9DJBxtTksS1SKkqcYL3gb
SU7SoF7FYomiRW2HqLyEwcy6pBXWLJ4OHjJrTeorXmSg+c1jtUMAwpFYvHnYrEPKBb8dBNthYiY0
L0xWXOYl+gOvds0PHkAwDowHlZZjboG67CpUSouBvIPqE4oq4A6tLW0/m3JS51CtbmBWajC2pSDN
EEguWbqECIyXQu1wFinUUvUof8XfT/xdyRThQkEgeIoI


--===============0998173903==--