From: marko.makela
Date: June 21 2010 10:33am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3107 to 3108) Bug#54658
List-Archive: http://lists.mysql.com/commits/111693
X-Bug: 54658
Message-Id: <201006211033.o5LA5c6x032646@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0476227245=="

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

IDMxMDggTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMQogICAgICBNZXJnZSBCdWcgIzU0NjU4IGZp
eCBmcm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICByZXZubzogMzUxNQogICAg
ICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjEwOTQwMDgtbzlm
YTE1M3MzZjA5bWVydwogICAgICBwYXJlbnQ6IHZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA2
MTgwODUxNTUteG5tNDY5Y2JoZWRxZWE5NgogICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtlbMOk
IDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIK
ICAgICAgdGltZXN0YW1wOiBNb24gMjAxMC0wNi0yMSAxMjo0MDowOCArMDMwMAogICAgICBtZXNz
YWdlOgogICAgICAgIEJ1ZyAjNTQ2NTg6IElubm9EQjogV2FybmluZzogYWxsb2NhdGVkIHRhYmxl
c3BhY2UgJWx1LCBvbGQgbWF4aW11bSB3YXMgMAogICAgICAKICAgICAgICBkaWN0X2NoZWNrX3Rh
Ymxlc3BhY2VzX2FuZF9zdG9yZV9tYXhfaWQoKTogSW5pdGlhbGl6ZSBtYXhfc3BhY2VfaWQKICAg
ICAgICBhbmQgZmlsX3N5c3RlbS0+bWF4X2Fzc2lnbmVkX2lkIGZyb20gRElDVF9IRFJfTUFYX1NQ
QUNFX0lELgogICAgICAKICAgICAgICBmaWxfc3BhY2VfY3JlYXRlKCk6IFN1cHByZXNzIHRoZSB3
YXJuaW5nIHVubGVzcyAhcmVjdl9yZWNvdmVyeV9vbgogICAgICAgIChkbyBub3QgY29tcGxhaW4g
d2hpbGUgYXBwbHlpbmcgdGhlIHJlZG8gbG9nKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2Zp
bDBmaWwuYwogMzEwNyBWYXNpbCBEaW1vdgkyMDEwLTA2LTE3CiAgICAgIEFkanVzdCBpbm5vZGJf
bXlzcWwucmVzdWx0IGFmdGVyIHRoZSByZXNvbHZlZCBjb25mbGljdCBmcm9tIHRoZSBtZXJnZQoK
ICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYl9teXNx
bC5yZXN1bHQKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxv
YWQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOnZhc2ls
LmRpbW92QG9yYWNsZS5jb20tMjAxMDA2MTcwOTU5NTMtMHYycGFuMTEwamx4cGVvcgorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA2MjExMDMyMzktdmpzYmZlOW95ajUxbmdldwpAQCAtNjQ0LDcgKzY0NCw3IEBA
IGRpY3RfY2hlY2tfdGFibGVzcGFjZXNfYW5kX3N0b3JlX21heF9pZCgKIAlkaWN0X2luZGV4X3Qq
CXN5c19pbmRleDsKIAlidHJfcGN1cl90CXBjdXI7CiAJY29uc3QgcmVjX3QqCXJlYzsKLQl1bGlu
dAkJbWF4X3NwYWNlX2lkCT0gMDsKKwl1bGludAkJbWF4X3NwYWNlX2lkOwogCW10cl90CQltdHI7
CiAKIAltdXRleF9lbnRlcigmKGRpY3Rfc3lzLT5tdXRleCkpOwpAQCAtNjU1LDYgKzY1NSwxMSBA
QCBkaWN0X2NoZWNrX3RhYmxlc3BhY2VzX2FuZF9zdG9yZV9tYXhfaWQoCiAJc3lzX2luZGV4ID0g
VVRfTElTVF9HRVRfRklSU1Qoc3lzX3RhYmxlcy0+aW5kZXhlcyk7CiAJdXRfYSghZGljdF90YWJs
ZV9pc19jb21wKHN5c190YWJsZXMpKTsKIAorCW1heF9zcGFjZV9pZCA9IG10cl9yZWFkX3VsaW50
KGRpY3RfaGRyX2dldCgmbXRyKQorCQkJCSAgICAgICsgRElDVF9IRFJfTUFYX1NQQUNFX0lELAor
CQkJCSAgICAgIE1MT0dfNEJZVEVTLCAmbXRyKTsKKwlmaWxfc2V0X21heF9zcGFjZV9pZF9pZl9i
aWdnZXIobWF4X3NwYWNlX2lkKTsKKwogCWJ0cl9wY3VyX29wZW5fYXRfaW5kZXhfc2lkZShUUlVF
LCBzeXNfaW5kZXgsIEJUUl9TRUFSQ0hfTEVBRiwgJnBjdXIsCiAJCQkJICAgIFRSVUUsICZtdHIp
OwogbG9vcDoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmls
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwlyZXZpZDp2YXNpbC5kaW1v
dkBvcmFjbGUuY29tLTIwMTAwNjE3MDk1OTUzLTB2MnBhbjExMGpseHBlb3IKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNjIxMTAzMjM5LXZqc2JmZTlveWo1MW5nZXcKQEAgLTEyMTQsNyArMTIxNCw3IEBAIHRyeV9h
Z2FpbjoKIAlzcGFjZS0+dGFibGVzcGFjZV92ZXJzaW9uID0gZmlsX3N5c3RlbS0+dGFibGVzcGFj
ZV92ZXJzaW9uOwogCXNwYWNlLT5tYXJrID0gRkFMU0U7CiAKLQlpZiAoVU5JVl9MSUtFTFkocHVy
cG9zZSA9PSBGSUxfVEFCTEVTUEFDRSkKKwlpZiAoVU5JVl9MSUtFTFkocHVycG9zZSA9PSBGSUxf
VEFCTEVTUEFDRSAmJiAhcmVjdl9yZWNvdmVyeV9vbikKIAkgICAgJiYgVU5JVl9VTkxJS0VMWShp
ZCA+IGZpbF9zeXN0ZW0tPm1heF9hc3NpZ25lZF9pZCkpIHsKIAkJaWYgKCFmaWxfc3lzdGVtLT5z
cGFjZV9pZF9yZXVzZV93YXJuZWQpIHsKIAkJCWZpbF9zeXN0ZW0tPnNwYWNlX2lkX3JldXNlX3dh
cm5lZCA9IFRSVUU7Cgo=

--===============0476227245==
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:33:07 +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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


--===============0476227245==--