From: Tor Didriksen
Date: June 30 2011 12:57pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3248 to 3249) Bug#12620084
List-Archive: http://lists.mysql.com/commits/140092
X-Bug: 12620084
Message-Id: <201106301257.p5UCvlf0005999@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMyNDkgVG9yIERpZHJpa3NlbgkyMDExLTA2LTMwCiAgICAgIEJ1ZyMxMjYyMDA4NCBBU1NFUlRJ
T04gV0hFTiBDSEVDS0lORyBGSUVMRF9UWVBFU1tGSUVMRF9QT1NdIEFORCBJVCdTIE1ZU1FMX1RZ
UEVfTlVMTAogICAgIEAgbXlzcWwtdGVzdC9yL2Z1bmNfaWYucmVzdWx0CiAgICAgICAgTmV3IHRl
c3QgY2FzZS4KICAgICBAIG15c3FsLXRlc3QvdC9mdW5jX2lmLnRlc3QKICAgICAgICBOZXcgdGVz
dCBjYXNlLgogICAgIEAgc3FsL2l0ZW1fY21wZnVuYy5jYwogICAgICAgIEluIEl0ZW1fZnVuY19p
Zjo6Zml4X2xlbmd0aF9hbmRfZGVjKCk6CiAgICAgICAgQXBwbHkgc2FtZSBsb2dpYyBhcyBpbiBh
Z2dfcmVzdWx0X3R5cGUoKSwgaS5lLgogICAgICAgICJOVUxMIGl0ZW1zIGRvbid0IGFmZmVjdCB0
aGUgcmVzdWx0IgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvZnVuY19pZi5yZXN1
bHQKICAgICAgbXlzcWwtdGVzdC90L2Z1bmNfaWYudGVzdAogICAgICBzcWwvaXRlbV9jbXBmdW5j
LmNjCiAzMjQ4IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDYtMzAgW21lcmdlXQogICAgICBNZXJnZSBt
eXNxbC01LjUgdG8gbXlzcWwtdHJ1bmsuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRl
L2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzByb3cuYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2Z1bmNfaWYucmVzdWx0Jwot
LS0gYS9teXNxbC10ZXN0L3IvZnVuY19pZi5yZXN1bHQJMjAxMC0wOS0xMyAwOTo1ODoxMSArMDAw
MAorKysgYi9teXNxbC10ZXN0L3IvZnVuY19pZi5yZXN1bHQJMjAxMS0wNi0zMCAxMjo1NzoyMCAr
MDAwMApAQCAtMTk2LDMgKzE5NiwxOSBAQCBjCiBOVUxMCiAwCiBEUk9QIFRBQkxFIHQxOworIwor
IyBCdWcjMTI2MjAwODQKKyMgQVNTRVJUSU9OIFdIRU4gQ0hFQ0tJTkcgRklFTERfVFlQRVNbRklF
TERfUE9TXSBBTkQgSVQnUyBNWVNRTF9UWVBFX05VTEwKKyMKK1NFTEVDVCBpZigwLCAoU0VMRUNU
IG1pbignaGVsbG8nKSksIE5VTEwpOworaWYoMCwgKFNFTEVDVCBtaW4oJ2hlbGxvJykpLCBOVUxM
KQorTlVMTAorU0VMRUNUIGlmKDEsIChTRUxFQ1QgbWluKCdoZWxsbycpKSwgTlVMTCk7CitpZigx
LCAoU0VMRUNUIG1pbignaGVsbG8nKSksIE5VTEwpCitoZWxsbworU0VMRUNUIGlmKDAsIE5VTEws
IChTRUxFQ1QgbWluKCdoZWxsbycpKSk7CitpZigwLCBOVUxMLCAoU0VMRUNUIG1pbignaGVsbG8n
KSkpCitoZWxsbworU0VMRUNUIGlmKDEsIE5VTEwsIChTRUxFQ1QgbWluKCdoZWxsbycpKSk7Citp
ZigxLCBOVUxMLCAoU0VMRUNUIG1pbignaGVsbG8nKSkpCitOVUxMCgo9PT0gbW9kaWZpZWQgZmls
ZSAnbXlzcWwtdGVzdC90L2Z1bmNfaWYudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2Z1bmNfaWYu
dGVzdAkyMDEwLTA5LTEzIDA5OjU4OjExICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9mdW5jX2lm
LnRlc3QJMjAxMS0wNi0zMCAxMjo1NzoyMCArMDAwMApAQCAtMTc3LDMgKzE3NywxMyBAQCBJTlNF
UlQgSU5UTyB0MSBWQUxVRVMgKE5VTEwsIDApLCAoTlVMTCwgCiBTRUxFQ1QgSUYoYiwgKFNFTEVD
VCBhIEZST00gdDEgTElNSVQgMSksIGIpIGMgRlJPTSB0MSBHUk9VUCBCWSBjOwogCiBEUk9QIFRB
QkxFIHQxOworCistLWVjaG8gIworLS1lY2hvICMgQnVnIzEyNjIwMDg0CistLWVjaG8gIyBBU1NF
UlRJT04gV0hFTiBDSEVDS0lORyBGSUVMRF9UWVBFU1tGSUVMRF9QT1NdIEFORCBJVCdTIE1ZU1FM
X1RZUEVfTlVMTAorLS1lY2hvICMKKworU0VMRUNUIGlmKDAsIChTRUxFQ1QgbWluKCdoZWxsbycp
KSwgTlVMTCk7CitTRUxFQ1QgaWYoMSwgKFNFTEVDVCBtaW4oJ2hlbGxvJykpLCBOVUxMKTsKK1NF
TEVDVCBpZigwLCBOVUxMLCAoU0VMRUNUIG1pbignaGVsbG8nKSkpOworU0VMRUNUIGlmKDEsIE5V
TEwsIChTRUxFQ1QgbWluKCdoZWxsbycpKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL2l0ZW1f
Y21wZnVuYy5jYycKLS0tIGEvc3FsL2l0ZW1fY21wZnVuYy5jYwkyMDExLTA2LTI0IDA5OjI5OjA3
ICswMDAwCisrKyBiL3NxbC9pdGVtX2NtcGZ1bmMuY2MJMjAxMS0wNi0zMCAxMjo1NzoyMCArMDAw
MApAQCAtMjczMiw3ICsyNzMyLDcgQEAgSXRlbV9mdW5jX2lmOjpmaXhfbGVuZ3RoX2FuZF9kZWMo
KQogICBib29sIG51bGwxPWFyZ3NbMV0tPmNvbnN0X2l0ZW0oKSAmJiBhcmdzWzFdLT5udWxsX3Zh
bHVlOwogICBib29sIG51bGwyPWFyZ3NbMl0tPmNvbnN0X2l0ZW0oKSAmJiBhcmdzWzJdLT5udWxs
X3ZhbHVlOwogCi0gIGlmIChudWxsMSkKKyAgaWYgKG51bGwxICYmIGFyZ3NbMl0tPnR5cGUoKSAh
PSBOVUxMX0lURU0pCiAgIHsKICAgICBjYWNoZWRfcmVzdWx0X3R5cGU9IGFyZzJfdHlwZTsKICAg
ICBjb2xsYXRpb24uc2V0KGFyZ3NbMl0tPmNvbGxhdGlvbik7CkBAIC0yNzQxLDcgKzI3NDEsNyBA
QCBJdGVtX2Z1bmNfaWY6OmZpeF9sZW5ndGhfYW5kX2RlYygpCiAgICAgcmV0dXJuOwogICB9CiAK
LSAgaWYgKG51bGwyKQorICBpZiAobnVsbDIgJiYgYXJnc1sxXS0+dHlwZSgpICE9IE5VTExfSVRF
TSkKICAgewogICAgIGNhY2hlZF9yZXN1bHRfdHlwZT0gYXJnMV90eXBlOwogICAgIGNvbGxhdGlv
bi5zZXQoYXJnc1sxXS0+Y29sbGF0aW9uKTsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZv
ciBwdXNoIGVtYWlscyku