From: marko.makela
Date: May 25 2010 12:54pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3480 to 3482) Bug#53627
List-Archive: http://lists.mysql.com/commits/109171
X-Bug: 53627
Message-Id: <201005251255.o4PC1Jlp031294@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0725266186=="

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

IDM0ODIgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yNQogICAgICByb3dfc2VhcmNoX2Zvcl9teXNx
bCgpOiBBZGQgYXNzZXJ0aW9ucyB0byB0cmFjayBkb3duIEJ1ZyAjNTM2MjcuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCiAzNDgxIE1hcmtv
IE3DpGtlbMOkCTIwMTAtMDUtMjUKICAgICAgU3VwcHJlc3MgYm9ndXMgVmFsZ3JpbmQgd2Fybmlu
Z3MgYWJvdXQgYnVmX2J1ZGR5X3JlbG9jYXRlKCkKICAgICAgYWNjZXNzaW5nIHVuaW5pdGlhbGl6
ZWQgbWVtb3J5IGluIFZhbGdyaW5kLWluc3RydW1lbnRlZCBidWlsZHMuCgogICAgbW9kaWZpZWQ6
CiAgICAgIG15c3FsLXRlc3QvdmFsZ3JpbmQuc3VwcAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vYnVmL2J1ZjBidWRkeS5jCiAzNDgwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMjQKICAgICAg
RG9jdW1lbnQgdGhlIEJ1ZyAjNTM1NzggZml4LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3Zh
bGdyaW5kLnN1cHAnCi0tLSBhL215c3FsLXRlc3QvdmFsZ3JpbmQuc3VwcAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExNDM0OS01a2F3NTJzejB5aDRzemtiCisrKyBiL215
c3FsLXRlc3QvdmFsZ3JpbmQuc3VwcAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDUyNTEyNTM1Mi1oZ2FmcG1xaHJyajdwdjVpCkBAIC03MjIsMyArNzIyLDggQEAKICAgIGZ1bjpw
dGhyZWFkX2NyZWF0ZSoKIH0KIAoreworICAgYnVmX2J1ZGR5X3JlbG9jYXRlIHBlZWtpbmcgKHNw
YWNlLHBhZ2UpIGluIHBvdGVudGlhbGx5IGZyZWUgYmxvY2tzCisgICBNZW1jaGVjazpBZGRyMQor
ICAgZnVuOmJ1Zl9idWRkeV9yZWxvY2F0ZQorfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1ZGR5LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9idWYvYnVmMGJ1ZGR5LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjQx
MTQzNDktNWthdzUyc3oweWg0c3prYgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1
ZjBidWRkeS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTI1MTI1MzUyLWhn
YWZwbXFocnJqN3B2NWkKQEAgLTQ0MiwxMSArNDQyLDE1IEBAIGJ1Zl9idWRkeV9yZWxvY2F0ZSgK
IAkJcG9vbCksIHNvIHRoZXJlIGlzIG5vdGhpbmcgd3JvbmcgYWJvdXQgdGhpcy4gIFRoZQogCQlt
YWNoX3JlYWRfZnJvbV80KCkgY2FsbHMgaGVyZSB3aWxsIG9ubHkgdHJpZ2dlciBib2d1cwogCQlW
YWxncmluZCBtZW1jaGVjayB3YXJuaW5ncyBpbiBVTklWX0RFQlVHX1ZBTEdSSU5EIGJ1aWxkcy4g
Ki8KLQkJYnBhZ2UgPSBidWZfcGFnZV9oYXNoX2dldCgKLQkJCW1hY2hfcmVhZF9mcm9tXzQoKGNv
bnN0IGJ5dGUqKSBzcmMKLQkJCQkJICsgRklMX1BBR0VfQVJDSF9MT0dfTk9fT1JfU1BBQ0VfSUQp
LAotCQkJbWFjaF9yZWFkX2Zyb21fNCgoY29uc3QgYnl0ZSopIHNyYwotCQkJCQkgKyBGSUxfUEFH
RV9PRkZTRVQpKTsKKwkJdWxpbnQJCXNwYWNlCT0gbWFjaF9yZWFkX2Zyb21fNCgKKwkJCShjb25z
dCBieXRlKikgc3JjICsgRklMX1BBR0VfQVJDSF9MT0dfTk9fT1JfU1BBQ0VfSUQpOworCQl1bGlu
dAkJcGFnZV9ubwk9IG1hY2hfcmVhZF9mcm9tXzQoCisJCQkoY29uc3QgYnl0ZSopIHNyYyArIEZJ
TF9QQUdFX09GRlNFVCk7CisJCS8qIFN1cHByZXNzIFZhbGdyaW5kIHdhcm5pbmdzIGFib3V0IGNv
bmRpdGlvbmFsIGp1bXAKKwkJb24gdW5pbml0aWFsaXplZCB2YWx1ZS4gKi8KKwkJVU5JVl9NRU1f
VkFMSUQoJnNwYWNlLCBzaXplb2Ygc3BhY2UpOworCQlVTklWX01FTV9WQUxJRCgmcGFnZV9ubywg
c2l6ZW9mIHBhZ2Vfbm8pOworCQlicGFnZSA9IGJ1Zl9wYWdlX2hhc2hfZ2V0KHNwYWNlLCBwYWdl
X25vKTsKIAogCQlpZiAoIWJwYWdlIHx8IGJwYWdlLT56aXAuZGF0YSAhPSBzcmMpIHsKIAkJCS8q
IFRoZSBibG9jayBoYXMgcHJvYmFibHkgYmVlbiBmcmVzaGx5Cgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTI0MTE0MzQ5LTVrYXc1MnN6MHloNHN6a2IKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jv
dy9yb3cwc2VsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjUxMjUzNTIt
aGdhZnBtcWhycmo3cHY1aQpAQCAtMzYxMSw2ICszNjExLDEzIEBAIHNob3J0Y3V0X2ZhaWxzX3Rv
b19iaWdfcmVjOgogCQl0cngtPmhhc19zZWFyY2hfbGF0Y2ggPSBGQUxTRTsKIAl9CiAKKwl1dF9h
ZChwcmVidWlsdC0+c3FsX3N0YXRfc3RhcnQgfHwgdHJ4LT5jb25jX3N0YXRlID09IFRSWF9BQ1RJ
VkUpOworCXV0X2FkKHRyeC0+Y29uY19zdGF0ZSA9PSBUUlhfTk9UX1NUQVJURUQKKwkgICAgICB8
fCB0cngtPmNvbmNfc3RhdGUgPT0gVFJYX0FDVElWRSk7CisJdXRfYWQocHJlYnVpbHQtPnNxbF9z
dGF0X3N0YXJ0CisJICAgICAgfHwgcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUgIT0gTE9DS19O
T05FCisJICAgICAgfHwgdHJ4LT5yZWFkX3ZpZXcpOworCiAJdHJ4X3N0YXJ0X2lmX25vdF9zdGFy
dGVkKHRyeCk7CiAKIAlpZiAodHJ4LT5pc29sYXRpb25fbGV2ZWwgPD0gVFJYX0lTT19SRUFEX0NP
TU1JVFRFRAoK

--===============0725266186==
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.1-innodb/
# testament_sha1: 9e051b2a1c2d1ec96a9e332baa440140b37989f1
# timestamp: 2010-05-25 15:54:53 +0300
# base_revision_id: marko.makela@stripped\
#   5kaw52sz0yh4szkb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYVWxpEAA9rflBAwe3///3/v
30C////+BAAIAGAIHUvqAAOhoANAAA0AyQSnqbKPTEgHlNppqMj0g0ADQDQGanqaAZUjQGmh6R6h
oA00TACMAABMmhgBxkaZMTQZMmE0yBkNAaA0yaGAE0BhiKZUZGhoyGmamTQMmQyaDIADQ0A00HGR
pkxNBkyYTTIGQ0BoDTJoYATQGEkgIARkAENGgU8QmU2o9TNNRpoA2pmUOXDhEYgiGPThYAOc0VRQ
XmqsyxZkrIftd9jcE6LGCvuGQYxdsbYZmYDFtaC5oEWCBevJfcjaH2o1QWFB2SUgSmBYv5TVZoCu
UdAoJJBIe2mRryDLCGfqJgkKMYOGUE8GkyCcBbm7w4J8otOZRFDDMbKnxgxxRKrFxqrfy6Gahq+M
Ky9o/qyGBtgLBghcMrrxhs3KJ7YtIKbNH7cTjnKumWxIhFyRdurKxyrJnoUnmbuHcV6TS53fTOYK
9Fyvb4gXwNDxRaCIGMfRJGUGk0oD+ARnYjBkK5ECBpPmPkkdRcdZh1nKVnCgZmtmAujNoAV64cY8
tiprqHOdG+IFt7gZgyGeDkkNgMJHWJnvcmkZ5g5kI84C2HIfRpnJ5toagrKSIyTJUvPm8qWikeVW
/AXSvqoeedF2dyK3+w8i3JkI9ejaeJ0hViZERx213SuVr3lJaKwn1Pmkb2FeRsjqdZTlSYn4m0xt
2pRIhUu4zFz7hviK+2k127LtMaQvTCdndfms14RiYyQuGfVck+xcEC1Y32FFI68zRMoAqpzsC0mb
KXQQFAobK6yvjIoNA4tcws+30SNcgMTe33gqQyNxoyhlresitjF73Sal+2rroUKBd8tifoPAnYKg
rSIj6HP1CvNhPNHHbbAt+k4Tuyv/UwJo1jE0R24QJMk+nE5YuhhTwNCFwc4tKsE4zWhDbqRDoE8l
uK8J7VXVmjsKckMIMXX0CZyEc1TIXxZ2a+qnSBqI5UarALyUhGonysckx9Ra1KNGsYuxIweWGw0u
e4i6JjrzFOrBY0ERVvMchhPk4oFXXXcd2e0wodQV2lRKyQnDGaI5CovpFtmmz357aikLhgMEqhIS
t4BbDAfwQViRDXMZIMFJdwmV2UL0HSBUQxKsDRruCATIlA2q+IaxV40x5tW/QaSTERTk6g89pohJ
xQZwmVPNBcQGYoSPuZ5FLxYtrGO28gVmQ1CyEZx6IjkmKSLmRWBOgYqCwD4I0Hy96d6z7TbuTK8c
2I9mew0lwPNdK9owZGISAA7NWAIMwV0P0acAQoQiInOzHXWoMyGt8OvVj7qypXafpoBXEJfqYyKy
4jMpleMYGJBV/sRVjNU5i9xUWKdsCmqujG4iqOooLwgpLcfQqP21H0hpjZkU59R2L2L8OwbeQG5j
nIG+LglE/Nfm75TA957177PumIgePuGGd6hXPGYnPyKgF/E+Pq6jz/FHWanMAuazXh/A/etvxFQb
RqQGCoBb+1fiv6Az1wJhpupBdJUAugmcdEE84smHHQqvjAWk9x+H4HXyOs3SJCrUS9I0rAuHnq+0
Ll0L2o+EKA2L8nHP5HA5iHBrFkZHYadhikeBtf4EsNhIUfAXyJFQdi8CH3qIqRWcOi0tej8sSw0w
O/sgXQIFNw8BakC3n6Lf/gnnYKyhNnZNu3t5Eb8/asxu41iiVJM43EgKVXMyKT0F95sFO4XXqsKT
zRdq09WYk8Wf7KPU5bKE4fFwywgkCrIopqxQgNu4Uh6h/GZaplo0kqFIUcB7EKgBQ5bNNDgtRITp
12E58yG3WV5OGLNZFI4F8w0uKxjLRzHh2gKeCcemt6Gy8hPS0HS0CjAbWYEyk0zcbIINkogTJHA6
VaLQZ3rgcujoKqCjjvHjdxUE1GsYTkTOrgZkfRd65rq8nLOdYnPHjronYkewyFQgKILRA2ima+B4
1J3QyYRVqSNpFIwkvI7qRfU9nWOFDZz6jYAyuOtHYzZFhnAYvnI7cUbupAygHBVi7wLm13Batp6d
JtKDyKEFhoMyCszd5JWDDXi22ZrNBUDBoVq18gF8zYBtiWiFRLfFIwQYDgHjAJjsCQCYT80xbhlq
HDoKzs3lCqrJtM5JC0HmAtSPyPUmHAw4Z3EyRRUqMJFobiwnGZJHmgL+OPVOvsYrT2TMK1MqwgJO
TIkXEh4wMd1IdB4lDIGIrBCZkmFBhues7HpwCvs2IgWD+NRu4oFAY+20PBhPDqHOIrsw/yAswDkf
33vOLA7RcUMUpd/qSKJ2jDjOt3FyONX6cNMD68hyZKpGt7kjOWJGgV0ekTeQ8pPWLDoKxOXiNZ1d
mvpCG9gA1BMlpPdesXqAJ5gfYYosleLgKgQrUMNdWSrPuR9lvMVJYqqkQYHJdp3bccBoBQaHFECA
8vb2ptF0rt72YJqHJA5aStB9AlEeBJ3Jp0puwhGi0BEkYQwExABd/eK8J4y0XM/drGfX2qRGRJPX
l7RQIoGFgPI9O4pziYmQ3krTAHunWBETmdEHmloxSkZd/DuFawj3sG87ir0L32kAeH9DnnKFHwFV
y5lXuKMhY8BDnocy1ppDnfu02hMt4+hUB65GtnMbEwywPFWpHl0XGg2KGeHACPmSV4enzD6mtn/+
DI+B/8XckU4UJCFVsaRA


--===============0725266186==--