From: marko.makela
Date: June 21 2010 10:32am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3108) Bug#54658
List-Archive: http://lists.mysql.com/commits/111672
X-Bug: 54658
Message-Id: <201006211033.o5LATcXq015458@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2069266472=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNjE3MDk1OTUzLTB2MnBh
bjExMGpseHBlb3IKCiAzMTA4IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMjEKICAgICAgTWVyZ2Ug
QnVnICM1NDY1OCBmaXggZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAtLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2
bm86IDM1MTUKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjIxMDk0MDA4LW85ZmExNTNzM2YwOW1lcncKICAgICAgcGFyZW50OiB2YXNpbC5kaW1vdkBvcmFj
bGUuY29tLTIwMTAwNjE4MDg1MTU1LXhubTQ2OWNiaGVkcWVhOTYKICAgICAgY29tbWl0dGVyOiBN
YXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAgIGJyYW5jaCBuaWNr
OiA1LjEtaW5ub2RiCiAgICAgIHRpbWVzdGFtcDogTW9uIDIwMTAtMDYtMjEgMTI6NDA6MDggKzAz
MDAKICAgICAgbWVzc2FnZToKICAgICAgICBCdWcgIzU0NjU4OiBJbm5vREI6IFdhcm5pbmc6IGFs
bG9jYXRlZCB0YWJsZXNwYWNlICVsdSwgb2xkIG1heGltdW0gd2FzIDAKICAgICAgCiAgICAgICAg
ZGljdF9jaGVja190YWJsZXNwYWNlc19hbmRfc3RvcmVfbWF4X2lkKCk6IEluaXRpYWxpemUgbWF4
X3NwYWNlX2lkCiAgICAgICAgYW5kIGZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9pZCBmcm9tIERJ
Q1RfSERSX01BWF9TUEFDRV9JRC4KICAgICAgCiAgICAgICAgZmlsX3NwYWNlX2NyZWF0ZSgpOiBT
dXBwcmVzcyB0aGUgd2FybmluZyB1bmxlc3MgIXJlY3ZfcmVjb3Zlcnlfb24KICAgICAgICAoZG8g
bm90IGNvbXBsYWluIHdoaWxlIGFwcGx5aW5nIHRoZSByZWRvIGxvZykuCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2ZpbC9maWwwZmlsLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
ZGljdC9kaWN0MGxvYWQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5j
CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA2MTcwOTU5NTMtMHYycGFuMTEwamx4
cGVvcgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjExMDMyMzktdmpzYmZlOW95ajUxbmdldwpAQCAtNjQ0
LDcgKzY0NCw3IEBAIGRpY3RfY2hlY2tfdGFibGVzcGFjZXNfYW5kX3N0b3JlX21heF9pZCgKIAlk
aWN0X2luZGV4X3QqCXN5c19pbmRleDsKIAlidHJfcGN1cl90CXBjdXI7CiAJY29uc3QgcmVjX3Qq
CXJlYzsKLQl1bGludAkJbWF4X3NwYWNlX2lkCT0gMDsKKwl1bGludAkJbWF4X3NwYWNlX2lkOwog
CW10cl90CQltdHI7CiAKIAltdXRleF9lbnRlcigmKGRpY3Rfc3lzLT5tdXRleCkpOwpAQCAtNjU1
LDYgKzY1NSwxMSBAQCBkaWN0X2NoZWNrX3RhYmxlc3BhY2VzX2FuZF9zdG9yZV9tYXhfaWQoCiAJ
c3lzX2luZGV4ID0gVVRfTElTVF9HRVRfRklSU1Qoc3lzX3RhYmxlcy0+aW5kZXhlcyk7CiAJdXRf
YSghZGljdF90YWJsZV9pc19jb21wKHN5c190YWJsZXMpKTsKIAorCW1heF9zcGFjZV9pZCA9IG10
cl9yZWFkX3VsaW50KGRpY3RfaGRyX2dldCgmbXRyKQorCQkJCSAgICAgICsgRElDVF9IRFJfTUFY
X1NQQUNFX0lELAorCQkJCSAgICAgIE1MT0dfNEJZVEVTLCAmbXRyKTsKKwlmaWxfc2V0X21heF9z
cGFjZV9pZF9pZl9iaWdnZXIobWF4X3NwYWNlX2lkKTsKKwogCWJ0cl9wY3VyX29wZW5fYXRfaW5k
ZXhfc2lkZShUUlVFLCBzeXNfaW5kZXgsIEJUUl9TRUFSQ0hfTEVBRiwgJnBjdXIsCiAJCQkJICAg
IFRSVUUsICZtdHIpOwogbG9vcDoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L2ZpbC9maWwwZmlsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwlyZXZp
ZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNjE3MDk1OTUzLTB2MnBhbjExMGpseHBlb3IK
KysrIGIvc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNjIxMTAzMjM5LXZqc2JmZTlveWo1MW5nZXcKQEAgLTEyMTQsNyArMTIx
NCw3IEBAIHRyeV9hZ2FpbjoKIAlzcGFjZS0+dGFibGVzcGFjZV92ZXJzaW9uID0gZmlsX3N5c3Rl
bS0+dGFibGVzcGFjZV92ZXJzaW9uOwogCXNwYWNlLT5tYXJrID0gRkFMU0U7CiAKLQlpZiAoVU5J
Vl9MSUtFTFkocHVycG9zZSA9PSBGSUxfVEFCTEVTUEFDRSkKKwlpZiAoVU5JVl9MSUtFTFkocHVy
cG9zZSA9PSBGSUxfVEFCTEVTUEFDRSAmJiAhcmVjdl9yZWNvdmVyeV9vbikKIAkgICAgJiYgVU5J
Vl9VTkxJS0VMWShpZCA+IGZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9pZCkpIHsKIAkJaWYgKCFm
aWxfc3lzdGVtLT5zcGFjZV9pZF9yZXVzZV93YXJuZWQpIHsKIAkJCWZpbF9zeXN0ZW0tPnNwYWNl
X2lkX3JldXNlX3dhcm5lZCA9IFRSVUU7Cgo=

--===============2069266472==
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.5-innodb/
# testament_sha1: b70faaeb62b15d299a1be70cab1168c092d9f8fe
# timestamp: 2010-06-21 13:32:54 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   0v2pan110jlxpeor
# 
# Begin bundle
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


--===============2069266472==--