From: Alexander Barkov
Date: February 2 2012 10:59am
Subject: bzr push into mysql-trunk branch (alexander.barkov:3825 to 3826) Bug#13616434
List-Archive: http://lists.mysql.com/commits/142718
X-Bug: 13616434
Message-Id: <201202021102.q12B2Uen012710@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MjYgQWxleGFuZGVyIEJhcmtvdgkyMDEyLTAyLTAyCiAgICAgICBCdWcjMTM2MTY0MzQgQVNT
RVJUSU9OIEZBSUxFRDogTkFOT1NFQ09ORFM8ICAxMDAwMDAwMDAwCiAgICAgIAogICAgICAgUHJv
YmxlbToKICAgICAgCiAgICAgICBuZWdhdGl2ZSBsbGRpdl90IHZhbHVlcyB3aXRoIHplcm8gaW50
ZWdlciBwYXJ0IGFuZCBub24temVybyBmcmFjdGlvbmFsIHBhcnQKICAgICAgIChlLmcuIC0wLjEx
MTEpICB3ZXJlIG5vdCBkZXRlY3RlZCwgc28gbmVnYXRpdmUgZnJhY3Rpb25hbCBwYXJ0IHdhcwog
ICAgICAgbGF0ZXIgY2FzdGVkIHRvIGEgYmlnIHVuc2lnbmVkIG51bWJlciwgd2hpY2ggbWFkZSB0
aGUgYXNzZXJ0aW9uIGNyYXNoLgogICAgICAKICAgICAgIEZpeDoKICAgICAgCiAgICAgICBSZXR1
cm4gZXJyb3IgaWYgbGxkLnJlbSBpcyBuZWdhdGl2ZS4KICAgICAgCiAgICAgICBtb2RpZmllZDoK
ICAgICAgICBteXNxbC10ZXN0L3IvdHlwZV90ZW1wb3JhbF9mcmFjdGlvbmFsLnJlc3VsdAogICAg
ICAgIG15c3FsLXRlc3QvdC90eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwudGVzdAogICAgICAgIHNx
bC9zcWxfdGltZS5jYyAKCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL3R5cGVfdGVt
cG9yYWxfZnJhY3Rpb25hbC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L3R5cGVfdGVtcG9yYWxf
ZnJhY3Rpb25hbC50ZXN0CiAgICAgIHNxbC9zcWxfdGltZS5jYwogMzgyNSBNYXJrbyBNw6RrZWzD
pAkyMDEyLTAyLTAyCiAgICAgIEZpeCByZXN1bHRzIGFmdGVyIGZpeGluZyB0eXBvIGluIHRyeF9y
c2VnX2N1cnJlbnRfc2l6ZS4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGJfbW9uaXRvci5yZXN1bHQKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRl
c3Qvci90eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Iv
dHlwZV90ZW1wb3JhbF9mcmFjdGlvbmFsLnJlc3VsdAkyMDEyLTAxLTMxIDE1OjE2OjE2ICswMDAw
CisrKyBiL215c3FsLXRlc3Qvci90eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwucmVzdWx0CTIwMTIt
MDItMDIgMTA6NTg6MTggKzAwMDAKQEAgLTE3MTMwLDQgKzE3MTMwLDQ5IEBAIFNFTEVDVCAxIEZS
T00gdDEgV0hFUkUgQ0FTRSBXSEVOIDAgdGhlbgogU0VMRUNUIDEgRlJPTSB0MSBXSEVSRSAoU0VM
RUNUIGEgRlJPTSB0MSkgLyBhOwogMQogRFJPUCBUQUJMRSB0MTsKKyMKKyMgQlVHIzEzNjE2NDM0
IEFTU0VSVElPTiBGQUlMRUQ6IE5BTk9TRUNPTkRTIDwgMTAwMDAwMDAwMAorIworU0VMRUNUCitF
WFRSQUNUKERBWSBGUk9NICgtMC4xMTExMTExMTExKSksCitFWFRSQUNUKFlFQVIgRlJPTSAoLTAu
MTExMTExMSkpLAorRVhUUkFDVChZRUFSX01PTlRIIEZST00gKC0wLjExMTExMTExMTEpKSwKK0VY
VFJBQ1QoREFZIEZST00gKC0wLjExMTExMTEpKSwKK0VYVFJBQ1QoUVVBUlRFUiBGUk9NICgtMC4x
MTExMTExMTExKSksCitFWFRSQUNUKE1PTlRIIEZST00gKC0wLjExMTExMTEpKSwKK0VYVFJBQ1Qo
V0VFSyBGUk9NICgtMC4xMTExMTExKSksCitEQVRFKC0wLjExMTExMTEpLAorUVVBUlRFUigtMC4x
MTExMTExMTExKSwKK1RJTUVTVEFNUCgtMC4xMTExMTExMTExKSwKK0xBU1RfREFZKC0wLjExMTEx
MTExMTEpLAorREFZKC0wLjExMTExMTExMTEpLAorTU9OVEgoLTAuMTExMTExMTExMSksCitZRUFS
KC0wLjExMTExMTEpLAorREFZT0ZNT05USCgtMC4xMTExMTExMTExKSwKK1RJTUVTVEFNUCgoLTAu
MTExMTExMTExMSksJ3skeCcpLAorREFURV9GT1JNQVQoLTAuMTExMTExMTExMSwnKycpLAorQ09O
VkVSVCgtMC4xMTExMTExLERBVEUpLAorQ0FTVCgtMC4xMTExMTExMTExIEFTIERBVEUpOworRVhU
UkFDVChEQVkgRlJPTSAoLTAuMTExMTExMTExMSkpCUVYVFJBQ1QoWUVBUiBGUk9NICgtMC4xMTEx
MTExKSkJRVhUUkFDVChZRUFSX01PTlRIIEZST00gKC0wLjExMTExMTExMTEpKQlFWFRSQUNUKERB
WSBGUk9NICgtMC4xMTExMTExKSkJRVhUUkFDVChRVUFSVEVSIEZST00gKC0wLjExMTExMTExMTEp
KQlFWFRSQUNUKE1PTlRIIEZST00gKC0wLjExMTExMTEpKQlFWFRSQUNUKFdFRUsgRlJPTSAoLTAu
MTExMTExMSkpCURBVEUoLTAuMTExMTExMSkJUVVBUlRFUigtMC4xMTExMTExMTExKQlUSU1FU1RB
TVAoLTAuMTExMTExMTExMSkJTEFTVF9EQVkoLTAuMTExMTExMTExMSkJREFZKC0wLjExMTExMTEx
MTEpCU1PTlRIKC0wLjExMTExMTExMTEpCVlFQVIoLTAuMTExMTExMSkJREFZT0ZNT05USCgtMC4x
MTExMTExMTExKQlUSU1FU1RBTVAoKC0wLjExMTExMTExMTEpLCd7JHgnKQlEQVRFX0ZPUk1BVCgt
MC4xMTExMTExMTExLCcrJykJQ09OVkVSVCgtMC4xMTExMTExLERBVEUpCUNBU1QoLTAuMTExMTEx
MTExMSBBUyBEQVRFKQorTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5V
TEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAorV2Fy
bmluZ3M6CitXYXJuaW5nCTEyOTIJSW5jb3JyZWN0IGRhdGV0aW1lIHZhbHVlOiAnLTAuMTExMTEx
MTExMScKK1dhcm5pbmcJMTI5MglJbmNvcnJlY3QgZGF0ZXRpbWUgdmFsdWU6ICctMC4xMTExMTEx
JworV2FybmluZwkxMjkyCUluY29ycmVjdCBkYXRldGltZSB2YWx1ZTogJy0wLjExMTExMTExMTEn
CitXYXJuaW5nCTEyOTIJSW5jb3JyZWN0IGRhdGV0aW1lIHZhbHVlOiAnLTAuMTExMTExMScKK1dh
cm5pbmcJMTI5MglJbmNvcnJlY3QgZGF0ZXRpbWUgdmFsdWU6ICctMC4xMTExMTExMTExJworV2Fy
bmluZwkxMjkyCUluY29ycmVjdCBkYXRldGltZSB2YWx1ZTogJy0wLjExMTExMTEnCitXYXJuaW5n
CTEyOTIJSW5jb3JyZWN0IGRhdGV0aW1lIHZhbHVlOiAnLTAuMTExMTExMScKK1dhcm5pbmcJMTI5
MglJbmNvcnJlY3QgZGF0ZXRpbWUgdmFsdWU6ICctMC4xMTExMTExJworV2FybmluZwkxMjkyCUlu
Y29ycmVjdCBkYXRldGltZSB2YWx1ZTogJy0wLjExMTExMTExMTEnCitXYXJuaW5nCTEyOTIJSW5j
b3JyZWN0IGRhdGV0aW1lIHZhbHVlOiAnLTAuMTExMTExMTExMScKK1dhcm5pbmcJMTI5MglJbmNv
cnJlY3QgZGF0ZXRpbWUgdmFsdWU6ICctMC4xMTExMTExMTExJworV2FybmluZwkxMjkyCUluY29y
cmVjdCBkYXRldGltZSB2YWx1ZTogJy0wLjExMTExMTExMTEnCitXYXJuaW5nCTEyOTIJSW5jb3Jy
ZWN0IGRhdGV0aW1lIHZhbHVlOiAnLTAuMTExMTExMTExMScKK1dhcm5pbmcJMTI5MglJbmNvcnJl
Y3QgZGF0ZXRpbWUgdmFsdWU6ICctMC4xMTExMTExJworV2FybmluZwkxMjkyCUluY29ycmVjdCBk
YXRldGltZSB2YWx1ZTogJy0wLjExMTExMTExMTEnCitXYXJuaW5nCTEyOTIJSW5jb3JyZWN0IGRh
dGV0aW1lIHZhbHVlOiAnLTAuMTExMTExMTExMScKK1dhcm5pbmcJMTI5MglJbmNvcnJlY3QgZGF0
ZXRpbWUgdmFsdWU6ICctMC4xMTExMTExMTExJworV2FybmluZwkxMjkyCUluY29ycmVjdCBkYXRl
dGltZSB2YWx1ZTogJy0wLjExMTExMTEnCitXYXJuaW5nCTEyOTIJSW5jb3JyZWN0IGRhdGV0aW1l
IHZhbHVlOiAnLTAuMTExMTExMTExMScKICMgRW5kIG9mIDUuNiB0ZXN0cwoKPT09IG1vZGlmaWVk
IGZpbGUgJ215c3FsLXRlc3QvdC90eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwudGVzdCcKLS0tIGEv
bXlzcWwtdGVzdC90L3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25hbC50ZXN0CTIwMTItMDEtMzEgMTU6
MTY6MTYgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25hbC50
ZXN0CTIwMTItMDItMDIgMTA6NTg6MTggKzAwMDAKQEAgLTc2MTAsNSArNzYxMCwyOSBAQCBTRUxF
Q1QgMSBGUk9NIHQxIFdIRVJFIChTRUxFQ1QgYSBGUk9NIHQxCiBEUk9QIFRBQkxFIHQxOwogCiAK
Ky0tZWNobyAjCistLWVjaG8gIyBCVUcjMTM2MTY0MzQgQVNTRVJUSU9OIEZBSUxFRDogTkFOT1NF
Q09ORFMgPCAxMDAwMDAwMDAwCistLWVjaG8gIworU0VMRUNUCisgIEVYVFJBQ1QoREFZIEZST00g
KC0wLjExMTExMTExMTEpKSwKKyAgRVhUUkFDVChZRUFSIEZST00gKC0wLjExMTExMTEpKSwKKyAg
RVhUUkFDVChZRUFSX01PTlRIIEZST00gKC0wLjExMTExMTExMTEpKSwKKyAgRVhUUkFDVChEQVkg
RlJPTSAoLTAuMTExMTExMSkpLAorICBFWFRSQUNUKFFVQVJURVIgRlJPTSAoLTAuMTExMTExMTEx
MSkpLAorICBFWFRSQUNUKE1PTlRIIEZST00gKC0wLjExMTExMTEpKSwKKyAgRVhUUkFDVChXRUVL
IEZST00gKC0wLjExMTExMTEpKSwKKyAgREFURSgtMC4xMTExMTExKSwKKyAgUVVBUlRFUigtMC4x
MTExMTExMTExKSwKKyAgVElNRVNUQU1QKC0wLjExMTExMTExMTEpLAorICBMQVNUX0RBWSgtMC4x
MTExMTExMTExKSwKKyAgREFZKC0wLjExMTExMTExMTEpLAorICBNT05USCgtMC4xMTExMTExMTEx
KSwKKyAgWUVBUigtMC4xMTExMTExKSwKKyAgREFZT0ZNT05USCgtMC4xMTExMTExMTExKSwKKyAg
VElNRVNUQU1QKCgtMC4xMTExMTExMTExKSwneyR4JyksCisgIERBVEVfRk9STUFUKC0wLjExMTEx
MTExMTEsJysnKSwKKyAgQ09OVkVSVCgtMC4xMTExMTExLERBVEUpLAorICBDQVNUKC0wLjExMTEx
MTExMTEgQVMgREFURSk7CisKIAogLS1lY2hvICMgRW5kIG9mIDUuNiB0ZXN0cwoKPT09IG1vZGlm
aWVkIGZpbGUgJ3NxbC9zcWxfdGltZS5jYycKLS0tIGEvc3FsL3NxbF90aW1lLmNjCTIwMTEtMTEt
MjQgMTI6MzE6NDQgKzAwMDAKKysrIGIvc3FsL3NxbF90aW1lLmNjCTIwMTItMDItMDIgMTA6NTg6
MTggKzAwMDAKQEAgLTQwOSwxMyArNDA5LDE0IEBAIHN0cl90b19kYXRldGltZV93aXRoX3dhcm4o
U3RyaW5nICpzdHIsIE0KIHN0YXRpYyBib29sCiBsbGRpdl90X3RvX2RhdGV0aW1lKGxsZGl2X3Qg
bGxkLCBNWVNRTF9USU1FICpsdGltZSwgdWludCBmbGFncywgaW50ICp3YXJuaW5ncykKIHsKLSAg
Ym9vbCByYz0gbnVtYmVyX3RvX2RhdGV0aW1lKGxsZC5xdW90LCBsdGltZSwgZmxhZ3MsIHdhcm5p
bmdzKSA9PSBMTCgtMSk7Ci0gIGlmIChyYykKKyAgaWYgKGxsZC5yZW0gPCAwIHx8IC8vIENhdGNo
IG5lZ2F0aXZlIG51bWJlcnMgd2l0aCB6ZXJvIGludCBwYXJ0LCBlLmc6IC0wLjEKKyAgICAgIG51
bWJlcl90b19kYXRldGltZShsbGQucXVvdCwgbHRpbWUsIGZsYWdzLCB3YXJuaW5ncykgPT0gTEwo
LTEpKQogICB7CiAgICAgLyogbnVtYmVyX3RvX2RhdGV0aW1lIGRvZXMgbm90IGNsZWFyIGx0aW1l
IGluIGNhc2Ugb2YgWkVSTyBEQVRFICovCiAgICAgc2V0X3plcm9fdGltZShsdGltZSwgTVlTUUxf
VElNRVNUQU1QX0VSUk9SKTsKICAgICBpZiAoISp3YXJuaW5ncykgLyogTmVpdGhlciBzZXRzIHdh
cm5pbmdzIGluIGNhc2Ugb2YgWkVSTyBEQVRFICovCiAgICAgICAqd2FybmluZ3N8PSBNWVNRTF9U
SU1FX1dBUk5fVFJVTkNBVEVEOworICAgIHJldHVybiB0cnVlOwogICB9CiAgIGVsc2UgaWYgKGx0
aW1lLT50aW1lX3R5cGUgPT0gTVlTUUxfVElNRVNUQU1QX0RBVEUpCiAgIHsKQEAgLTQzMCw5ICs0
MzEsOSBAQCBsbGRpdl90X3RvX2RhdGV0aW1lKGxsZGl2X3QgbGxkLCBNWVNRTF9UCiAgIGVsc2Ug
aWYgKCEoZmxhZ3MgJiBUSU1FX05PX05TRUNfUk9VTkRJTkcpKQogICB7CiAgICAgbHRpbWUtPnNl
Y29uZF9wYXJ0PSBsbGQucmVtIC8gMTAwMDsKLSAgICByYz0gZGF0ZXRpbWVfYWRkX25hbm9zZWNv
bmRzX3dpdGhfcm91bmQobHRpbWUsIGxsZC5yZW0gJSAxMDAwLCB3YXJuaW5ncyk7CisgICAgcmV0
dXJuIGRhdGV0aW1lX2FkZF9uYW5vc2Vjb25kc193aXRoX3JvdW5kKGx0aW1lLCBsbGQucmVtICUg
MTAwMCwgd2FybmluZ3MpOwogICB9Ci0gIHJldHVybiByYzsKKyAgcmV0dXJuIGZhbHNlOwogfQog
CiAKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku