From: marko.makela
Date: May 31 2011 7:42am
Subject: bzr commit into mysql-5.5 branch (marko.makela:3414) Bug#12606344
List-Archive: http://lists.mysql.com/commits/138369
X-Bug: 12606344
Message-Id: <201105310742.p4V7gPsT009936@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0537126588=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOmRhdmkuYXJuYXV0QG9yYWNsZS5jb20tMjAxMTA1MzAxNTE3MjItcGk0Nnk0
MG5tMjducm12NQoKIDM0MTQgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0zMQogICAgICBCdWcjMTI2
MDYzNDQgLSBBREQgVkFMR1JJTkQgRElBR05PU1RJQ1MgVE8gTVRSX1NUQVJULCBNVFJfQ09NTUlU
CiAgICAgIAogICAgICBtdHJfc3RhcnQoKTogRGVjbGFyZSB0aGUgbXRyIG1lbW9yeSBhcmVhIHVu
aW5pdGlhbGl6ZWQgaW4gVmFsZ3JpbmQKICAgICAgYmVmb3JlIGluaXRpYWxpemluZyB0aGUgZmll
bGRzLgogICAgICAKICAgICAgbXRyX2NvbW1pdCgpOiBEZWNsYXJlIGV2ZXJ5dGhpbmcgdW5pbml0
aWFsaXplZCBleGNlcHQKICAgICAgbXRyLT5zdGFydF9sc24sIG10ci0+ZW5kX2xzbiBhbmQgbXRy
LT5zdGF0ZS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL210
cjBtdHIuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9tdHIvbXRyMG10ci5jCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbXRyMG10ci5pYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL210cjBtdHIuaWMJcmV2aWQ6ZGF2aS5hcm5hdXRAb3JhY2xlLmNv
bS0yMDExMDUzMDE1MTcyMi1waTQ2eTQwbm0yN25ybXY1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9tdHIwbXRyLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTMx
MDc0MjE0LTE5OG4wdnB0Z2J6OHlueXEKQEAgLTM3LDYgKzM3LDggQEAgbXRyX3N0YXJ0KAogLyo9
PT09PT0qLwogCW10cl90KgltdHIpCS8qITwgb3V0OiBtaW5pLXRyYW5zYWN0aW9uICovCiB7CisJ
VU5JVl9NRU1fSU5WQUxJRChtdHIsIHNpemVvZiAqbXRyKTsKKwogCWR5bl9hcnJheV9jcmVhdGUo
JihtdHItPm1lbW8pKTsKIAlkeW5fYXJyYXlfY3JlYXRlKCYobXRyLT5sb2cpKTsKIAoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbXRyL210cjBtdHIuYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9tdHIvbXRyMG10ci5jCXJldmlkOmRhdmkuYXJuYXV0QG9yYWNsZS5jb20tMjAx
MTA1MzAxNTE3MjItcGk0Nnk0MG5tMjducm12NQorKysgYi9zdG9yYWdlL2lubm9iYXNlL210ci9t
dHIwbXRyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MzEwNzQyMTQtMTk4
bjB2cHRnYno4eW55cQpAQCAtMjY1LDkgKzI2NSwyMCBAQCBtdHJfY29tbWl0KAogCW10cl9tZW1v
X3BvcF9hbGwobXRyKTsKICNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KIAotCXV0X2QobXRy
LT5zdGF0ZSA9IE1UUl9DT01NSVRURUQpOwogCWR5bl9hcnJheV9mcmVlKCYobXRyLT5tZW1vKSk7
CiAJZHluX2FycmF5X2ZyZWUoJihtdHItPmxvZykpOworI2lmZGVmIFVOSVZfREVCVUdfVkFMR1JJ
TkQKKwkvKiBEZWNsYXJlIGV2ZXJ5dGhpbmcgdW5pbml0aWFsaXplZCBleGNlcHQKKwltdHItPnN0
YXJ0X2xzbiwgbXRyLT5lbmRfbHNuIGFuZCBtdHItPnN0YXRlLiAqLworCXsKKwkJbHNuX3QJc3Rh
cnRfbHNuCT0gbXRyLT5zdGFydF9sc247CisJCWxzbl90CWVuZF9sc24JCT0gbXRyLT5lbmRfbHNu
OworCQlVTklWX01FTV9JTlZBTElEKG10ciwgc2l6ZW9mICptdHIpOworCQltdHItPnN0YXJ0X2xz
biA9IHN0YXJ0X2xzbjsKKwkJbXRyLT5lbmRfbHNuID0gZW5kX2xzbjsKKwl9CisjZW5kaWYgLyog
VU5JVl9ERUJVR19WQUxHUklORCAqLworCXV0X2QobXRyLT5zdGF0ZSA9IE1UUl9DT01NSVRURUQp
OwogfQogCiAjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCgo=

--===============0537126588==
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.5/
# testament_sha1: 07535a83399fd1a003c5fdb1e95bad0cd380093d
# timestamp: 2011-05-31 10:42:20 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: davi.arnaut@stripped\
#   pi46y40nm27nrmv5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXktSXsAAoVflAAwWnf//3+n
nwC/7//6BAAIAFAFWXu27sbabu7uclEyo4SSEjU8JppTbJkmBTwTKD1NpqaNGgNBkCSoyDTTQjSe
kNBoAGgAaANNAASJI1MI0Ue1NqZTyj1N6UDQ0aGIMgAAcZMmTEYmAEyYJkANGEYAhgEkgIGpgibR
MqeaKfqn6p6hpp6jQGJ5QPU9QfCBRDj6QEQ1sP2zG+ntlBhs70q4Pj0HzJ2cfP/JbVuNe/23KGgo
Bz5OSJXs02cV3vMXtLzEbY2tvYstFkpXUPpfFUyIn3Hvbz+chsp17Tb188/dVdjkXlHMZRl9oPH+
LUJEDeRZECDg85MeWvlxCuUPmGxsQPZFfIvFOTmuZLS9rcpMN4iUODCSDLBbYGMzpGYWdgpkicXR
R+dmLes36qhRu3qdRITLWg1HZVnGKZ4x4HBg78aeyGzPmXOQuYqqqlWPM2SKxM+DhEEMnEy+UEQz
w8vlFLUKpaQNCMsorrrhCi0DDhuHEs+ZCtJJWCkKDpYbGPRqylyuAgDKPiFpSrHZRbUauMDqPHdT
eBAwGAr16Xzuk5+atsQqGhEDiqqrx22kAqkc09wsZo6+jDN+Iio18dTG3OOtWZDgMpkojE9TPJEx
0rBZVlOGJtFuLDsG9cqAU+Ry6m7lbYXUaQHV3S+Nyfapo4lF6w2iyE8DVZdFBOZXtdDUUqRKQV1a
w3pRUQLLidk4j7WtCqa+Yo6XujxSDRumPMBVPhCep4xZi4MHiyonaityIiqrA0TjaTFWyEg5YFVU
D3YIyiATqRRsFC4Ulw4mqJo3FFjCaZ9LS/fAw/oD2xRYi4TmWChoWFMoEOSLBReXFwa+knddA2W3
yWbQ4z4MkqclAPI5qpFU3pF4la2cV1LeNLTftB7ox7jLrNmZIvisJFmQTff+I4zUjDMN5rp6k/Re
5xH9oloRK7PQwET9F6k5PPVWFRQJ0MGHoUqBXHWoB9xkPopaqWptL5oZpYn1KTjGGMrIzFIRWaio
ZFxzazBve0b5NsY2Pr7JBOZc5G0uC4bBQOJvmyakHZ6pe+gFe5HH0QRwQV9qMJVFacL6dOljkQc1
Gk4ZN0kiZaKxc8GPt9Zj5D7tFoont42+QGmcQGcNWLtNOAqhYfechU2Cn/n+mmqDck4E9XgvDN8Q
YfXl3bDQxNDDVHdAtCsLh0kMKvwKFzFZhVWGYWIkxrTP8dGo3RDnNaoQBMxJns3UwznfA1lnTKw6
UlRPe7l0FrZijTRfZsDjAV1/WmJm/bjedEG9tPGQfT57VwTBsOoydw6dkzVQtLEMTQ/sI07JhNWO
LYG+LDUEBhR6Eykn8jaOMcbjYPWvABMLXYYhQLrEiK1K8xLrperG0p1G3ehrly3KyyEBQMJ5qTSi
nPuLyu+OOq7WitFEYM8sTDFkBNkMvUg/vcjMR4dOwLkXOSVqa0cCYLBX9toLoVTVXckYJu1B5Hmm
OrbmrzdDEY2lhdKClxX9HWZQTGyJM2CmaGOkuVeBnY2Fx0AQEJlhNXTBjRnSnAcNagGK5cqmKhg1
9gOGIiq2ZHcEpo744N8p4gmRYHh1vWLs9jDA96ailnhLA5gZJTerLqYkpq0gaA5qCGgr486yY88x
GRYqFZTmelOURMDjwfR9yyas3IYoTCrmJY1kuXtCplYKBeX3b8fZDQHkBfcGaRFOyoGNoDjElroF
l5AtRct6AGgKLglruXu4UUxWWrZcv5uW0imR3gamTmak8OdbQDgHtJwKH2oHQP4t7f8XckU4UJB5
LUl7


--===============0537126588==--