From: marko.makela
Date: August 18 2010 11:01am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3545) Bug#55626
List-Archive: http://lists.mysql.com/commits/116076
X-Bug: 55626
Message-Id: <201008181101.o7IAOlU8002082@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0032191424=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwODE3MTkzOTM0LTF5bDd6
ejJvZGlreGF1ZjgKCiAzNTQ1IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDgtMTgKICAgICAgQnVnIzU1
NjI2OiBNSU4gYW5kIE1BWCByZWFkaW5nIGEgZGVsZXRlLW1hcmtlZCByZWNvcmQgZnJvbSBzZWNv
bmRhcnkgaW5kZXgKICAgICAgCiAgICAgIFJlbW92ZSBhIGJvZ3VzIGRlYnVnIGFzc2VydGlvbiB0
aGF0IHRyaWdnZXJlZCB0aGUgYnVnLgogICAgICBBZGQgYXNzZXJ0aW9ucyBwcmVjaXNlbHkgd2hl
cmUgcmVjb3JkcyBtdXN0IG5vdCBiZSBkZWxldGUtbWFya2VkLgogICAgICBBbmQgYSBjb21tZW50
IHRvIGNsYXJpZnkgd2hlbiB0aGUgcmVjb3JkIGlzIGFsbG93ZWQgdG8gYmUgZGVsZXRlLW1hcmtl
ZC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2Vs
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5j
JwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTAwODE3MTkzOTM0LTF5bDd6ejJvZGlreGF1ZjgKKysrIGIvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA4MTgxMTAxMTAtemZzMGkxdmZyY2NmYjR5dwpAQCAtMjY5MCw3ICsyNjkwLDYg
QEAgcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAJdXRfYWQocHJlYnVpbHQtPm15c3FsX3RlbXBs
YXRlKTsKIAl1dF9hZChwcmVidWlsdC0+ZGVmYXVsdF9yZWMpOwogCXV0X2FkKHJlY19vZmZzX3Zh
bGlkYXRlKHJlYywgTlVMTCwgb2Zmc2V0cykpOwotCXV0X2FkKCFyZWNfZ2V0X2RlbGV0ZWRfZmxh
ZyhyZWMsIHJlY19vZmZzX2NvbXAob2Zmc2V0cykpKTsKIAogCWlmIChVTklWX0xJS0VMWV9OVUxM
KHByZWJ1aWx0LT5ibG9iX2hlYXApKSB7CiAJCW1lbV9oZWFwX2ZyZWUocHJlYnVpbHQtPmJsb2Jf
aGVhcCk7CkBAIC0zNjExLDYgKzM2MTAsNyBAQCByb3dfc2VhcmNoX2Zvcl9teXNxbCgKIAkJCQly
b3dfc2VsX3RyeV9zZWFyY2hfc2hvcnRjdXRfZm9yX215c3FsKCkuCiAJCQkJVGhlIGxhdGNoIHdp
bGwgbm90IGJlIHJlbGVhc2VkIHVudGlsCiAJCQkJbXRyX2NvbW1pdCgmbXRyKS4gKi8KKwkJCQl1
dF9hZCghcmVjX2dldF9kZWxldGVkX2ZsYWcocmVjLCBjb21wKSk7CiAKIAkJCQlpZiAoIXJvd19z
ZWxfc3RvcmVfbXlzcWxfcmVjKGJ1ZiwgcHJlYnVpbHQsCiAJCQkJCQkJICAgICByZWMsIG9mZnNl
dHMpKSB7CkBAIC00MjM4LDcgKzQyMzgsNyBAQCBub19nYXBfbG9jazoKIAogCQkJCXJlYyA9IG9s
ZF92ZXJzOwogCQkJfQotCQl9IGVsc2UgaWYgKCFsb2NrX3NlY19yZWNfY29uc19yZWFkX3NlZXMo
cmVjLCB0cngtPnJlYWRfdmlldykpIHsKKwkJfSBlbHNlIHsKIAkJCS8qIFdlIGFyZSBsb29raW5n
IGludG8gYSBub24tY2x1c3RlcmVkIGluZGV4LAogCQkJYW5kIHRvIGdldCB0aGUgcmlnaHQgdmVy
c2lvbiBvZiB0aGUgcmVjb3JkIHdlCiAJCQloYXZlIHRvIGxvb2sgYWxzbyBpbnRvIHRoZSBjbHVz
dGVyZWQgaW5kZXg6IHRoaXMKQEAgLTQyNDYsOCArNDI0NiwxMiBAQCBub19nYXBfbG9jazoKIAkJ
CWluZm9ybWF0aW9uIHZpYSB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4gKi8KIAogCQkJdXRf
YWQoaW5kZXggIT0gY2x1c3RfaW5kZXgpOworCQkJdXRfYWQoIWRpY3RfaW5kZXhfaXNfY2x1c3Qo
aW5kZXgpKTsKIAotCQkJZ290byByZXF1aXJlc19jbHVzdF9yZWM7CisJCQlpZiAoIWxvY2tfc2Vj
X3JlY19jb25zX3JlYWRfc2VlcygKKwkJCQkgICAgcmVjLCB0cngtPnJlYWRfdmlldykpIHsKKwkJ
CQlnb3RvIHJlcXVpcmVzX2NsdXN0X3JlYzsKKwkJCX0KIAkJfQogCX0KIApAQCAtNDM3MCw4ICs0
Mzc0LDEzIEBAIHJlcXVpcmVzX2NsdXN0X3JlYzoKIAkJCQkJCSAgVUxJTlRfVU5ERUZJTkVELCAm
aGVhcCk7CiAJCQlyZXN1bHRfcmVjID0gcmVjOwogCQl9CisKKwkJLyogcmVzdWx0X3JlYyBjYW4g
bGVnaXRpbWF0ZWx5IGJlIGRlbGV0ZS1tYXJrZWQKKwkJbm93IHRoYXQgaXQgaGFzIGJlZW4gZXN0
YWJsaXNoZWQgdGhhdCBpdCBwb2ludHMgdG8gYQorCQljbHVzdGVyZWQgaW5kZXggcmVjb3JkIHRo
YXQgZXhpc3RzIGluIHRoZSByZWFkIHZpZXcuICovCiAJfSBlbHNlIHsKIAkJcmVzdWx0X3JlYyA9
IHJlYzsKKwkJdXRfYWQoIXJlY19nZXRfZGVsZXRlZF9mbGFnKHJlYywgY29tcCkpOwogCX0KIAog
CS8qIFdlIGZvdW5kIGEgcXVhbGlmeWluZyByZWNvcmQgJ3Jlc3VsdF9yZWMnLiBBdCB0aGlzIHBv
aW50LAoK

--===============0032191424==
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: 290ccb27bbfcdd8ffba9fc9f5e11a5c651d20713
# timestamp: 2010-08-18 14:01:33 +0300
# base_revision_id: vasil.dimov@stripped\
#   1yl7zz2odikxauf8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYRmypYAAgTflEAwenf//3Mj
EEC/7//6BAAIAFAE5kdcB5nLdlt62PYJJCAmTTSbRpkNNJNiaCADIGgBkjQT0RoCJHiIB6gADIAA
DQE0qeanqNTQxDQ0BkAAAAAYqZJsVNPNJqDaEZNMh6mnqDRiAAyCSJTTU9MKZk01MRkNGRiA0ABo
Bh7CHgMzMzMBL+69DXx9PCBF6bMZZm/lroeX6PbjwpNphfjoT2SMcZoM+EsODPkuV/vko3VUszAe
fzFX+Ypdl5RcYOAjnsGBdEg4h3/drPkHgvj89yL+XRLgnqsvKHdTG/imvrZaxzVAok2RfpEWfnCa
Dr0THwYlxHQzFiWit2U5Ud4a7DJc273g5g16k8qp4sZnRmNUnpaz14SVLkqlaI/C7+ayUq7Nx1h+
b9YrNOnlA9FKkMosQMfdLbVRNhBVsKllmS0OpeI6RyCHiuTVwTOZBdbkGHtwAIwkna2s0azjBqNJ
AeFbneDAEIHRbmxCLLgOgT4PU9kumFmXP7Cp3evM5Uv6vJVpzC2Xlx4blZrJ2Ugzz6HzcDxNaNun
VXJEERooRAJHTYygJmjgNvGnxI7g/p5350usl6YCGD4nR4hiLhqUMXIDSKwEnsxbJBdoIcFwYF3B
wF04TCpEWFTsd4Atcw43UD+mS8T8kWlsTk8b7hqcIGojnpdYU3BOoyrPI4IMcS5TtQYYQ1SJUDMq
7IxLMdajZTGbWLaSKguIEL4KiDEWDhelJ0qJo59aZGCgQFr3TKsVOTs4iovayzvYaoWdDFIYjR4k
4pJICYEppYqcvOfgNPNrmL+bn9PV0Ybyx/qZLbQpAY+MkI0RXS022P5pWsrcpHHlqftgFuBE/Lr3
IhpgtKdrFJxGYDRUZpeQ18yRJ9pgz3CmINwHdn1UaY4baUTzBsYDVp3KUg8GVy7aFbwvvMhaLnIP
rHXDuxVKJuMHT3u7+Ah7hlOugZk9EeVTCy6cAMm2APJywdJ47zCRlGmJIbeQdKgHJ4nnYEkjABC2
9VzxhAtKmYUHBlRp0GyJERNMBWfvOHnhMfVlh19d67HEdnEIAt+6742nCEWt3TlHAndPME1CpbBg
KGZg1ZXeJ9kDBMai5vVVNWT3d91NTG0fw5QBSLLa5f5HTfqO2UAbtNFOinJA0+VMEfIaguAgKgRY
yVVhnXNxzTsO0wFGuRuuxKD986+Jvcdu0TtonyxZzsGZF0xFf2enKzjg7eGbBLM/iaAKIi4WJo39
OpNHad0RIIangYl5sOYCD6UtCq7ctItUBONKbbswPVAcfE0ZYExWGQDbMEEEkuVY0yYJQlf0TJGI
mtskMVQF14VWNo8aJHunT1rBeIGwLvke0Z23UZ2y3xQHThCtQO4wu7OqoAzDqcBjAMxTASbMbshp
AnBka1cN4MBZN8FXr9brUlOhu1znnmkZAeFCkep8uOoISCogqbGZORwkvvFVY19iNJVbonCEfHsd
85pc3BVwIFCCYjrmQPOWsZArxJVrPwhmmUQAczFEwtoxpFAUIzcK463z4ynpwMyB2qRgJYLx2uKk
gOAIVMj4Dcxal9VRJlMLlwSzgw4CGIo1wkZE1uWlQglLZgLpYpTIxkqNyhxxalt4nvKyZKDmxqk0
lRNgNdVYaS2MMOO4NAgqGxJs7Ke0XncvSrsFoVmEyCudSoL5/E/l/i7kinChIQjNlSw=


--===============0032191424==--