From: marko.makela
Date: June 1 2010 12:05pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3130)
List-Archive: http://lists.mysql.com/commits/109716
Message-Id: <201006011205.o51BJYYD004729@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0808316271=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTExNTYyMi05d2E0
cjMxYjJsc3UxN3RpCgogMzEzMCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAxCiAgICAgIE1lcmdl
IGEgY2hhbmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAg
ICAgcmV2bm86IDM0ODgKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MDExMDM3MzgtdXBtOGF3YWhlc21laDlkcgogICAgICAgIHBhcmVudDogdmFzaWwu
ZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUzMTE2MzU0MC05ZnUzcHJibjJhc3F3ZGk1CiAgICAgICAg
Y29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAg
ICAgYnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIKICAgICAgICB0aW1lc3RhbXA6IFR1ZSAyMDEwLTA2
LTAxIDEzOjM3OjM4ICswMzAwCiAgICAgICAgbWVzc2FnZToKICAgICAgICAgIEJ1ZyM1MzgxMjog
YXNzZXJ0IHJvdy9yb3cwdW1vZC5jIGxpbmUgNjYwIGluIHR4biByb2xsYmFjayBhZnRlciBjcmFz
aCByZWNvdmVyeQogICAgICAgICAgcm93X3VuZG9fbW9kX3VwZF9leGlzdF9zZWMoKTogVG9sZXJh
dGUgYSBmYWlsdXJlIHRvIGJ1aWxkIHRoZSBpbmRleCBlbnRyeQogICAgICAgICAgZm9yIGEgRFlO
QU1JQyBvciBDT01QUkVTU0VEIHRhYmxlIGR1cmluZyBjcmFzaCByZWNvdmVyeS4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MHVtb2QuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYw
MTExNTYyMi05d2E0cjMxYjJsc3UxN3RpCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1
bW9kLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMjA1MDEtcnc2Njdv
M3VwN2hoNzUwcApAQCAtNjgyLDI0ICs2ODIsNTUgQEAgcm93X3VuZG9fbW9kX3VwZF9leGlzdF9z
ZWMoCiAJCQkvKiBCdWlsZCB0aGUgbmV3ZXN0IHZlcnNpb24gb2YgdGhlIGluZGV4IGVudHJ5ICov
CiAJCQllbnRyeSA9IHJvd19idWlsZF9pbmRleF9lbnRyeShub2RlLT5yb3csIG5vZGUtPmV4dCwK
IAkJCQkJCSAgICAgIGluZGV4LCBoZWFwKTsKLQkJCXV0X2EoZW50cnkpOwotCQkJLyogTk9URSB0
aGF0IGlmIHdlIHVwZGF0ZWQgdGhlIGZpZWxkcyBvZiBhCi0JCQlkZWxldGUtbWFya2VkIHNlY29u
ZGFyeSBpbmRleCByZWNvcmQgc28gdGhhdAotCQkJYWxwaGFiZXRpY2FsbHkgdGhleSBzdGF5ZWQg
dGhlIHNhbWUsIGUuZy4sCi0JCQknYWJjJyAtPiAnYUJjJywgd2UgY2Fubm90IHJldHVybiB0byB0
aGUgb3JpZ2luYWwKLQkJCXZhbHVlcyBiZWNhdXNlIHdlIGRvIG5vdCBrbm93IHRoZW0uIEJ1dCB0
aGlzIHNob3VsZAotCQkJbm90IGNhdXNlIHByb2JsZW1zIGJlY2F1c2UgaW4gcm93MHNlbC5jLCBp
biBxdWVyaWVzCi0JCQl3ZSBhbHdheXMgcmV0cmlldmUgdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNv
cmQgb3IgYW4KLQkJCWVhcmxpZXIgdmVyc2lvbiBvZiBpdCwgaWYgdGhlIHNlY29uZGFyeSBpbmRl
eCByZWNvcmQKLQkJCXRocm91Z2ggd2hpY2ggd2UgZG8gdGhlIHNlYXJjaCBpcyBkZWxldGUtbWFy
a2VkLiAqLwotCi0JCQllcnIgPSByb3dfdW5kb19tb2RfZGVsX21hcmtfb3JfcmVtb3ZlX3NlYyhu
b2RlLCB0aHIsCi0JCQkJCQkJCSAgaW5kZXgsCi0JCQkJCQkJCSAgZW50cnkpOwotCQkJaWYgKGVy
ciAhPSBEQl9TVUNDRVNTKSB7Ci0JCQkJbWVtX2hlYXBfZnJlZShoZWFwKTsKKwkJCWlmIChVTklW
X1VOTElLRUxZKCFlbnRyeSkpIHsKKwkJCQkvKiBUaGUgc2VydmVyIG11c3QgaGF2ZSBjcmFzaGVk
IGluCisJCQkJcm93X3VwZF9jbHVzdF9yZWNfYnlfaW5zZXJ0KCksIGluCisJCQkJcm93X2luc19p
bmRleF9lbnRyeV9sb3coKSBiZWZvcmUKKwkJCQlidHJfc3RvcmVfYmlnX3JlY19leHRlcm5fZmll
bGRzKCkKKwkJCQloYXMgd3JpdHRlbiB0aGUgZXh0ZXJuYWxseSBzdG9yZWQgY29sdW1ucworCQkJ
CShCTE9Ccykgb2YgdGhlIG5ldyBjbHVzdGVyZWQgaW5kZXggZW50cnkuICovCiAKLQkJCQlyZXR1
cm4oZXJyKTsKKwkJCQkvKiBUaGUgdGFibGUgbXVzdCBiZSBpbiBEWU5BTUlDIG9yIENPTVBSRVNT
RUQKKwkJCQlmb3JtYXQuICBSRURVTkRBTlQgYW5kIENPTVBBQ1QgZm9ybWF0cworCQkJCXN0b3Jl
IGEgbG9jYWwgNzY4LWJ5dGUgcHJlZml4IG9mIGVhY2gKKwkJCQlleHRlcm5hbGx5IHN0b3JlZCBj
b2x1bW4uICovCisJCQkJdXRfYShkaWN0X3RhYmxlX2dldF9mb3JtYXQoaW5kZXgtPnRhYmxlKQor
CQkJCSAgICAgPj0gRElDVF9URl9GT1JNQVRfWklQKTsKKworCQkJCS8qIFRoaXMgaXMgb25seSBs
ZWdpdGltYXRlIHdoZW4KKwkJCQlyb2xsaW5nIGJhY2sgYW4gaW5jb21wbGV0ZSB0cmFuc2FjdGlv
bgorCQkJCWFmdGVyIGNyYXNoIHJlY292ZXJ5LiAqLworCQkJCXV0X2EodGhyX2dldF90cngodGhy
KS0+aXNfcmVjb3ZlcmVkKTsKKworCQkJCS8qIFRoZSBzZXJ2ZXIgbXVzdCBoYXZlIGNyYXNoZWQg
YmVmb3JlCisJCQkJY29tcGxldGluZyB0aGUgaW5zZXJ0IG9mIHRoZSBuZXcKKwkJCQljbHVzdGVy
ZWQgaW5kZXggZW50cnkgYW5kIGJlZm9yZQorCQkJCWluc2VydGluZyB0byB0aGUgc2Vjb25kYXJ5
IGluZGV4ZXMuCisJCQkJQmVjYXVzZSBub2RlLT5yb3cgd2FzIG5vdCB5ZXQgd3JpdHRlbgorCQkJ
CXRvIHRoaXMgaW5kZXgsIHdlIGNhbiBpZ25vcmUgaXQuICBCdXQKKwkJCQl3ZSBtdXN0IHJlc3Rv
cmUgbm9kZS0+dW5kb19yb3cuICovCisJCQl9IGVsc2UgeworCQkJCS8qIE5PVEUgdGhhdCBpZiB3
ZSB1cGRhdGVkIHRoZSBmaWVsZHMgb2YgYQorCQkJCWRlbGV0ZS1tYXJrZWQgc2Vjb25kYXJ5IGlu
ZGV4IHJlY29yZCBzbyB0aGF0CisJCQkJYWxwaGFiZXRpY2FsbHkgdGhleSBzdGF5ZWQgdGhlIHNh
bWUsIGUuZy4sCisJCQkJJ2FiYycgLT4gJ2FCYycsIHdlIGNhbm5vdCByZXR1cm4gdG8gdGhlCisJ
CQkJb3JpZ2luYWwgdmFsdWVzIGJlY2F1c2Ugd2UgZG8gbm90IGtub3cgdGhlbS4KKwkJCQlCdXQg
dGhpcyBzaG91bGQgbm90IGNhdXNlIHByb2JsZW1zIGJlY2F1c2UKKwkJCQlpbiByb3cwc2VsLmMs
IGluIHF1ZXJpZXMgd2UgYWx3YXlzIHJldHJpZXZlCisJCQkJdGhlIGNsdXN0ZXJlZCBpbmRleCBy
ZWNvcmQgb3IgYW4gZWFybGllcgorCQkJCXZlcnNpb24gb2YgaXQsIGlmIHRoZSBzZWNvbmRhcnkg
aW5kZXggcmVjb3JkCisJCQkJdGhyb3VnaCB3aGljaCB3ZSBkbyB0aGUgc2VhcmNoIGlzCisJCQkJ
ZGVsZXRlLW1hcmtlZC4gKi8KKworCQkJCWVyciA9IHJvd191bmRvX21vZF9kZWxfbWFya19vcl9y
ZW1vdmVfc2VjKAorCQkJCQlub2RlLCB0aHIsIGluZGV4LCBlbnRyeSk7CisJCQkJaWYgKGVyciAh
PSBEQl9TVUNDRVNTKSB7CisJCQkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CisKKwkJCQkJcmV0dXJu
KGVycik7CisJCQkJfQorCisJCQkJbWVtX2hlYXBfZW1wdHkoaGVhcCk7CiAJCQl9CiAKIAkJCS8q
IFdlIG1heSBoYXZlIHRvIHVwZGF0ZSB0aGUgZGVsZXRlIG1hcmsgaW4gdGhlCkBAIC03MDgsNyAr
NzM5LDYgQEAgcm93X3VuZG9fbW9kX3VwZF9leGlzdF9zZWMoCiAJCQl0aGUgc2Vjb25kYXJ5IGlu
ZGV4IHJlY29yZCBpZiB3ZSB1cGRhdGVkIGl0cyBmaWVsZHMKIAkJCWJ1dCBhbHBoYWJldGljYWxs
eSB0aGV5IHN0YXllZCB0aGUgc2FtZSwgZS5nLiwKIAkJCSdhYmMnIC0+ICdhQmMnLiAqLwotCQkJ
bWVtX2hlYXBfZW1wdHkoaGVhcCk7CiAJCQllbnRyeSA9IHJvd19idWlsZF9pbmRleF9lbnRyeShu
b2RlLT51bmRvX3JvdywKIAkJCQkJCSAgICAgIG5vZGUtPnVuZG9fZXh0LAogCQkJCQkJICAgICAg
aW5kZXgsIGhlYXApOwoK

--===============0808316271==
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: c0c5caff8824c473cb116985ba8e587558c8f4b6
# timestamp: 2010-06-01 15:05:09 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   9wa4r31b2lsu17ti
# 
# Begin bundle
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


--===============0808316271==--