From: marko.makela
Date: June 9 2011 7:29pm
Subject: bzr push into mysql-5.1 branch (marko.makela:3641 to 3642) Bug#12612184
List-Archive: http://lists.mysql.com/commits/139005
X-Bug: 12612184
Message-Id: <201106091929.p59JTl9h012559@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0463584063=="

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

IDM2NDIgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0wOQogICAgICBEaXNhYmxlIGEgZGVidWcgYXNz
ZXJ0aW9uIHRoYXQgd2FzIGFkZGVkIHRvIHRyYWNrIGRvd24gQnVnIzEyNjEyMTg0LgogICAgICAK
ICAgICAgcm93X2J1aWxkKCk6IFRoZSByZWNvcmQgbWF5IGNvbnRhaW4gbnVsbCBCTE9CIHBvaW50
ZXJzIHdoZW4gdGhlIHNlcnZlcgogICAgICBpcyByb2xsaW5nIGJhY2sgYW4gaW5zZXJ0IHRoYXQg
d2FzIGludGVycnVwdGVkIGJ5IGEgc2VydmVyIGNyYXNoLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3Jvdy9yb3cwcm93LmMKIDM2NDEgRG1pdHJ5IFNodWxnYQkyMDExLTA2LTEwCiAgICAgIEZvbGxv
dy11cCBmb3IgcGF0Y2ggb2YgYnVnIzExNzY0MzM0LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNx
bC10ZXN0L3IvZXZlbnRzX2J1Z3MucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9ldmVudHNfYnVn
cy50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwlyZXZpZDpkbWl0cnkuc2h1bGdh
QG9yYWNsZS5jb20tMjAxMTA2MDkxODA1MTAtbGI0cm01cDVxaWI3ZG5vcworKysgYi9zdG9yYWdl
L2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTA2MDkxODUwNDEtZjV1cjI0YzVtajdyZzFjdQpAQCAtMjEwLDcgKzIxMCwxMSBAQCByb3dfYnVp
bGQoCiAJCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9mZnNldHMpKTsKIAl9
CiAKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRfREVC
VUcKKyNpZiAwLyogZGVmaW5lZCBVTklWX0RFQlVHIHx8IGRlZmluZWQgVU5JVl9CTE9CX0xJR0hU
X0RFQlVHKi8KKwkvKiBUaGlzIG9uZSBjYW4gZmFpbCBpbiB0cnhfcm9sbGJhY2tfb3JfY2xlYW5f
YWxsX3dpdGhvdXRfc2VzcygpCisJaWYgdGhlIHNlcnZlciBjcmFzaGVkIGR1cmluZyBhbiBpbnNl
cnQgYmVmb3JlIHRoZQorCWJ0cl9zdG9yZV9iaWdfcmVjX2V4dGVybl9maWVsZHMoKSBkaWQgbXRy
X2NvbW1pdCgpCisJYWxsIEJMT0IgcG9pbnRlcnMgdG8gdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNv
cmQuICovCiAJdXRfYSghcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKHJlYywgb2Zmc2V0cykpOwog
I2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RFQlVHICovCiAKCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzByb3cuYycKLS0tIGEv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwcm93LmMJcmV2aWQ6ZG1pdHJ5LnNodWxnYUBv
cmFjbGUuY29tLTIwMTEwNjA5MTgwNTEwLWxiNHJtNXA1cWliN2Rub3MKKysrIGIvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL3Jvdy9yb3cwcm93LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTA2MDkxODUwNDEtZjV1cjI0YzVtajdyZzFjdQpAQCAtMjMxLDcgKzIzMSwxMSBAQCByb3df
YnVpbGQoCiAJCXV0X2FkKHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9mZnNldHMpKTsK
IAl9CiAKLSNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKKyNpZiAwIC8qIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQkxPQl9M
SUdIVF9ERUJVRyAqLworCS8qIFRoaXMgb25lIGNhbiBmYWlsIGluIHRyeF9yb2xsYmFja19hY3Rp
dmUoKSBpZgorCXRoZSBzZXJ2ZXIgY3Jhc2hlZCBkdXJpbmcgYW4gaW5zZXJ0IGJlZm9yZSB0aGUK
KwlidHJfc3RvcmVfYmlnX3JlY19leHRlcm5fZmllbGRzKCkgZGlkIG10cl9jb21taXQoKQorCWFs
bCBCTE9CIHBvaW50ZXJzIHRvIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkLiAqLwogCXV0X2Eo
IXJlY19vZmZzX2FueV9udWxsX2V4dGVybihyZWMsIG9mZnNldHMpKTsKICNlbmRpZiAvKiBVTklW
X0RFQlVHIHx8IFVOSVZfQkxPQl9MSUdIVF9ERUJVRyAqLwogCgo=

--===============0463584063==
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 22:29:41 +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


--===============0463584063==--