From: marko.makela
Date: June 30 2010 7:59am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3129) Bug#54583
List-Archive: http://lists.mysql.com/commits/112525
X-Bug: 54583
Message-Id: <201006300800.o5U7PF2m028607@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1584956215=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMjEwNS16emRx
eHYwMHc4cjhocTZyCgogMzEyOSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTMwCiAgICAgIEJ1ZyM1
NDU4MyBJbm5vREI6IEFzc2VydGlvbiBmYWlsdXJlIHN5bmMvc3luYzBzeW5jLmM6MTIyNgogICAg
ICAKICAgICAgU2lsZW5jZSB0aGUgVU5JVl9TWU5DX0RFQlVHIGFzc2VydGlvbiBmYWlsdXJlIHdo
aWxlIHVwZ3JhZGluZyBvbGQgZGF0YSBmaWxlcwogICAgICB0byBtdWx0aXBsZSByb2xsYmFjayBz
ZWdtZW50cyBkdXJpbmcgc2VydmVyIHN0YXJ0dXAuIEJlY2F1c2UgdGhlIHVwZ3JhZGUKICAgICAg
dGFrZXMgcGxhY2Ugd2hpbGUgSW5ub0RCIGlzIHJ1bm5pbmcgYSBzaW5nbGUgdGhyZWFkLCB3ZSBj
YW4gc2FmZWx5IGlnbm9yZSB0aGUKICAgICAgbGF0Y2hpbmcgb3JkZXIgY2hlY2tzIHdpdGhvdXQg
ZmVhcmluZyBkZWFkbG9ja3MuCiAgICAgIAogICAgICBpbm5vYmFzZV9zdGFydF9vcl9jcmVhdGVf
Zm9yX215c3FsKCk6IFNldCBzcnZfaXNfYmVpbmdfc3RhcnRlZCA9IEZBTFNFCiAgICAgIG9ubHkg
YWZ0ZXIgdHJ4X3N5c19jcmVhdGVfcnNlZ3MoKSBoYXMgY29tcGxldGVkLgogICAgICAKICAgICAg
c3luY190aHJlYWRfYWRkX2xldmVsKCk6IElmIHNydl9pc19iZWluZ19zdGFydGVkLCBpZ25vcmUg
bGF0Y2hpbmcgb3JkZXIKICAgICAgdmlvbGF0aW9ucyBmb3IgU1lOQ19UUlhfU1lTX0hFQURFUiBh
bmQgU1lOQ19JQlVGX0JJVE1BUC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9zcnYvc3J2MHN0YXJ0LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwc3luYy5j
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MjkxMzIxMDUtenpkcXh2MDB3OHI4aHE2cgorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL3Nydi9zcnYwc3RhcnQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw
MDYzMDA3NTk0OS1kZW95dWF4YmxtdmNlb2lkCkBAIC0xNzE1LDggKzE3MTUsNiBAQCBpbm5vYmFz
ZV9zdGFydF9vcl9jcmVhdGVfZm9yX215c3FsKHZvaWQpCiAJb3NfdGhyZWFkX2NyZWF0ZSgmc3J2
X21vbml0b3JfdGhyZWFkLCBOVUxMLAogCQkJIHRocmVhZF9pZHMgKyA0ICsgU1JWX01BWF9OX0lP
X1RIUkVBRFMpOwogCi0Jc3J2X2lzX2JlaW5nX3N0YXJ0ZWQgPSBGQUxTRTsKLQogCWlmICh0cnhf
ZG91Ymxld3JpdGUgPT0gTlVMTCkgewogCQkvKiBDcmVhdGUgdGhlIGRvdWJsZXdyaXRlIGJ1ZmZl
ciB0byBhIG5ldyB0YWJsZXNwYWNlICovCiAKQEAgLTE3MzEsNiArMTcyOSw4IEBAIGlubm9iYXNl
X3N0YXJ0X29yX2NyZWF0ZV9mb3JfbXlzcWwodm9pZCkKIAogCXRyeF9zeXNfY3JlYXRlX3JzZWdz
KFRSWF9TWVNfTl9SU0VHUyAtIDEpOwogCisJc3J2X2lzX2JlaW5nX3N0YXJ0ZWQgPSBGQUxTRTsK
KwogCWVyciA9IGRpY3RfY3JlYXRlX29yX2NoZWNrX2ZvcmVpZ25fY29uc3RyYWludF90YWJsZXMo
KTsKIAogCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHN5bmMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zeW5j
L3N5bmMwc3luYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI5MTMyMTA1
LXp6ZHF4djAwdzhyOGhxNnIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwc3luYy5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjMwMDc1OTQ5LWRlb3l1YXhibG12
Y2VvaWQKQEAgLTQwLDYgKzQwLDkgQEAgQ3JlYXRlZCA5LzUvMTk5NSBIZWlra2kgVHV1cmkKICNp
bmNsdWRlICJzcnYwc3J2LmgiCiAjaW5jbHVkZSAiYnVmMHR5cGVzLmgiCiAjaW5jbHVkZSAib3Mw
c3luYy5oIiAvKiBmb3IgSEFWRV9BVE9NSUNfQlVJTFRJTlMgKi8KKyNpZmRlZiBVTklWX1NZTkNf
REVCVUcKKyMgaW5jbHVkZSAic3J2MHN0YXJ0LmgiIC8qIHNydl9pc19iZWluZ19zdGFydGVkICov
CisjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiAKIC8qCiAJUkVBU09OUyBGT1IgSU1QTEVN
RU5USU5HIFRIRSBTUElOIExPQ0sgTVVURVgKQEAgLTExNTIsNiArMTE1NSwxMyBAQCBzeW5jX3Ro
cmVhZF9hZGRfbGV2ZWwoCiAJY2FzZSBTWU5DX1RSRUVfTk9ERV9GUk9NX0hBU0g6CiAJCS8qIERv
IG5vIG9yZGVyIGNoZWNraW5nICovCiAJCWJyZWFrOworCWNhc2UgU1lOQ19UUlhfU1lTX0hFQURF
UjoKKwkJaWYgKHNydl9pc19iZWluZ19zdGFydGVkKSB7CisJCQkvKiBUaGlzIGlzIHZpb2xhdGVk
IGR1cmluZyB0cnhfc3lzX2NyZWF0ZV9yc2VncygpCisJCQl3aGVuIGNyZWF0aW5nIGFkZGl0aW9u
YWwgcm9sbGJhY2sgc2VnbWVudHMgd2hlbgorCQkJdXBncmFkaW5nIGluIGlubm9iYXNlX3N0YXJ0
X29yX2NyZWF0ZV9mb3JfbXlzcWwoKS4gKi8KKwkJCWJyZWFrOworCQl9CiAJY2FzZSBTWU5DX01F
TV9QT09MOgogCWNhc2UgU1lOQ19NRU1fSEFTSDoKIAljYXNlIFNZTkNfUkVDVjoKQEAgLTExNjAs
NyArMTE3MCw2IEBAIHN5bmNfdGhyZWFkX2FkZF9sZXZlbCgKIAljYXNlIFNZTkNfTE9HX0ZMVVNI
X09SREVSOgogCWNhc2UgU1lOQ19USFJfTE9DQUw6CiAJY2FzZSBTWU5DX0FOWV9MQVRDSDoKLQlj
YXNlIFNZTkNfVFJYX1NZU19IRUFERVI6CiAJY2FzZSBTWU5DX0ZJTEVfRk9STUFUX1RBRzoKIAlj
YXNlIFNZTkNfRE9VQkxFV1JJVEU6CiAJY2FzZSBTWU5DX1NFQVJDSF9TWVM6CkBAIC0xMjIyLDgg
KzEyMzEsMTIgQEAgc3luY190aHJlYWRfYWRkX2xldmVsKAogCQkJdXRfYShzeW5jX3RocmVhZF9s
ZXZlbHNfZyhhcnJheSwgU1lOQ19JQlVGX0JJVE1BUCAtIDEsCiAJCQkJCQkgIFRSVUUpKTsKIAkJ
fSBlbHNlIHsKLQkJCXV0X2Eoc3luY190aHJlYWRfbGV2ZWxzX2coYXJyYXksIFNZTkNfSUJVRl9C
SVRNQVAsCi0JCQkJCQkgIFRSVUUpKTsKKwkJCS8qIFRoaXMgaXMgdmlvbGF0ZWQgZHVyaW5nIHRy
eF9zeXNfY3JlYXRlX3JzZWdzKCkKKwkJCXdoZW4gY3JlYXRpbmcgYWRkaXRpb25hbCByb2xsYmFj
ayBzZWdtZW50cyB3aGVuCisJCQl1cGdyYWRpbmcgaW4gaW5ub2Jhc2Vfc3RhcnRfb3JfY3JlYXRl
X2Zvcl9teXNxbCgpLiAqLworCQkJdXRfYShzcnZfaXNfYmVpbmdfc3RhcnRlZAorCQkJICAgICB8
fCBzeW5jX3RocmVhZF9sZXZlbHNfZyhhcnJheSwgU1lOQ19JQlVGX0JJVE1BUCwKKwkJCQkJCSAg
ICAgVFJVRSkpOwogCQl9CiAJCWJyZWFrOwogCWNhc2UgU1lOQ19GU1BfUEFHRToKCg==

--===============1584956215==
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: 05a70130a917106b0d203aff5a216652f1bb1330
# timestamp: 2010-06-30 11:00:01 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   zzdqxv00w8r8hq6r
# 
# Begin bundle
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


--===============1584956215==--