From: Alexander Barkov
Date: November 14 2011 9:59am
Subject: bzr push into mysql-trunk branch (alexander.barkov:3556 to 3557)
 Bug#13385275 WL#946
List-Archive: http://lists.mysql.com/commits/141923
X-Bug: 13385275
Message-Id: <201111140959.pAE9xnvi005936@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1NTcgQWxleGFuZGVyIEJhcmtvdgkyMDExLTExLTE0CiAgICAgIFdMIzk0NjogQlVHIzEzMzg1
Mjc1IC0gQVNTRVJUIEZBSUxVUkUgSU4gVElNRV9GUk9NX0xPTkdMT05HX1BBQ0tFRCAKCiAgICBt
b2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25hbC5yZXN1
bHQKICAgICAgbXlzcWwtdGVzdC90L3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25hbC50ZXN0CiAgICAg
IHNxbC9pdGVtX2Z1bmMuY2MKIDM1NTYgQWxleGFuZGVyIEJhcmtvdgkyMDExLTExLTEwCiAgICAg
IFdMIzk0NiAxMzM2Nzg2OCDCoGFzc2VydCBmYWlsdXJlIGluIG15c3FsX3RpbWVfY2FjaGU6OnNl
dF90aW1lICwgd2hlbiB0aW1lIGhhcyBxdW90ZWQgZnNwCgogICAgbW9kaWZpZWQ6CiAgICAgIG15
c3FsLXRlc3Qvci90ZW1wb3JhbF9saXRlcmFsLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvdGVt
cG9yYWxfbGl0ZXJhbC50ZXN0CiAgICAgIHNxbC9pdGVtX2NyZWF0ZS5jYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnbXlzcWwtdGVzdC9yL3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25hbC5yZXN1bHQnCi0tLSBh
L215c3FsLXRlc3Qvci90eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwucmVzdWx0CTIwMTEtMTEtMTAg
MTQ6NTg6MjMgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL3R5cGVfdGVtcG9yYWxfZnJhY3Rpb25h
bC5yZXN1bHQJMjAxMS0xMS0xNCAwOTo1ODo1NSArMDAwMApAQCAtMTYzMjMsMyArMTYzMjMsMTgg
QEAgR1JFQVRFU1QoJzIwMDQtMDQtMDcnLCBDT0FMRVNDRSAocGssIGNvbAogMjAxMS0xMS0wMSAx
MjowNzo0MS4xNDgyMzkKIERST1AgVEFCTEUgdDE7CiBTRVQgdGltZXN0YW1wPURFRkFVTFQ7Cisj
CisjIEJVRyAxMzM4NTI3NSAtIEFTU0VSVCBGQUlMVVJFIElOIFRJTUVfRlJPTV9MT05HTE9OR19Q
QUNLRUQgCisjCitDUkVBVEUgVEFCTEUgdDEgKAorY29sX2RhdGVfbm90X251bGxfa2V5IGRhdGUg
Tk9UIE5VTEwsCitLRVkgY29sX2RhdGVfbm90X251bGxfa2V5IChjb2xfZGF0ZV9ub3RfbnVsbF9r
ZXkpKTsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoJzAwMDAtMDAtMDAnKSwgKCcyMDAwLTExLTIw
Jyk7CitTRUxFQ1QgQUREVElNRShHUkVBVEVTVChjb2xfZGF0ZV9ub3RfbnVsbF9rZXksICcyMDA3
LTAzLTExIDA4OjUxOjE5LjAwOTQwOCcpLAorJzEyOjIwOjQwLjAyOTk0MCcpCitGUk9NIHQxOwor
QUREVElNRShHUkVBVEVTVChjb2xfZGF0ZV9ub3RfbnVsbF9rZXksICcyMDA3LTAzLTExIDA4OjUx
OjE5LjAwOTQwOCcpLAorJzEyOjIwOjQwLjAyOTk0MCcpCisyMToxMTo1OS4wMzkzNDgKKzIxOjEx
OjU5LjAzOTM0OAorRFJPUCBUQUJMRSB0MTsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0
L3QvdHlwZV90ZW1wb3JhbF9mcmFjdGlvbmFsLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC90eXBl
X3RlbXBvcmFsX2ZyYWN0aW9uYWwudGVzdAkyMDExLTExLTEwIDE0OjU4OjIzICswMDAwCisrKyBi
L215c3FsLXRlc3QvdC90eXBlX3RlbXBvcmFsX2ZyYWN0aW9uYWwudGVzdAkyMDExLTExLTE0IDA5
OjU4OjU1ICswMDAwCkBAIC02OTY4LDYgKzY5NjgsMTkgQEAgU0VMRUNUIEdSRUFURVNUKCcyMDA0
LTA0LTA3JywgQ09BTEVTQ0UgKAogRFJPUCBUQUJMRSB0MTsKIFNFVCB0aW1lc3RhbXA9REVGQVVM
VDsKIAorLS1lY2hvICMKKy0tZWNobyAjIEJVRyAxMzM4NTI3NSAtIEFTU0VSVCBGQUlMVVJFIElO
IFRJTUVfRlJPTV9MT05HTE9OR19QQUNLRUQgCistLWVjaG8gIworQ1JFQVRFIFRBQkxFIHQxICgK
KyAgY29sX2RhdGVfbm90X251bGxfa2V5IGRhdGUgTk9UIE5VTEwsCisgIEtFWSBjb2xfZGF0ZV9u
b3RfbnVsbF9rZXkgKGNvbF9kYXRlX25vdF9udWxsX2tleSkpOworSU5TRVJUIElOVE8gdDEgVkFM
VUVTICgnMDAwMC0wMC0wMCcpLCAoJzIwMDAtMTEtMjAnKTsgCitTRUxFQ1QgQUREVElNRShHUkVB
VEVTVChjb2xfZGF0ZV9ub3RfbnVsbF9rZXksICcyMDA3LTAzLTExIDA4OjUxOjE5LjAwOTQwOCcp
LAorICAgICAgICAgICAgICAgJzEyOjIwOjQwLjAyOTk0MCcpCitGUk9NIHQxOyAKK0RST1AgVEFC
TEUgdDE7CisKKwogCiAjIyBUUy1UT0RPOiBTRUxFQ1QgQ0FTVCgnMDA6MDA6MDAnIEFTIERBVEVU
SU1FKSAtPiBzaG91bGQgaXQgdXNlIGN1cmRhdGU/CiAKCj09PSBtb2RpZmllZCBmaWxlICdzcWwv
aXRlbV9mdW5jLmNjJwotLS0gYS9zcWwvaXRlbV9mdW5jLmNjCTIwMTEtMTEtMTAgMTQ6NTg6MjMg
KzAwMDAKKysrIGIvc3FsL2l0ZW1fZnVuYy5jYwkyMDExLTExLTE0IDA5OjU4OjU1ICswMDAwCkBA
IC0yOTI1LDcgKzI5MjUsNyBAQCBib29sIEl0ZW1fZnVuY19taW5fbWF4OjpnZXRfZGF0ZShNWVNR
TF9UCiAgICAgY21wX2RhdGV0aW1lcygmcmVzdWx0KTsKICAgICBpZiAobnVsbF92YWx1ZSkKICAg
ICAgIHJldHVybiB0cnVlOwotICAgIFRJTUVfZnJvbV9sb25nbG9uZ19wYWNrZWQobHRpbWUsIGZp
ZWxkX3R5cGUoKSwgcmVzdWx0KTsKKyAgICBUSU1FX2Zyb21fbG9uZ2xvbmdfcGFja2VkKGx0aW1l
LCBkYXRldGltZV9pdGVtLT5maWVsZF90eXBlKCksIHJlc3VsdCk7CiAgICAgcmV0dXJuIGZhbHNl
OwogICB9CiAKQEAgLTI5NTIsNyArMjk1Miw3IEBAIGJvb2wgSXRlbV9mdW5jX21pbl9tYXg6Omdl
dF90aW1lKE1ZU1FMX1QKICAgICBjbXBfZGF0ZXRpbWVzKCZyZXN1bHQpOwogICAgIGlmIChudWxs
X3ZhbHVlKQogICAgICAgcmV0dXJuIHRydWU7Ci0gICAgVElNRV9mcm9tX2xvbmdsb25nX3BhY2tl
ZChsdGltZSwgZmllbGRfdHlwZSgpLCByZXN1bHQpOworICAgIFRJTUVfZnJvbV9sb25nbG9uZ19w
YWNrZWQobHRpbWUsIGRhdGV0aW1lX2l0ZW0tPmZpZWxkX3R5cGUoKSwgcmVzdWx0KTsKICAgICBk
YXRldGltZV90b190aW1lKGx0aW1lKTsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KCk5vIGJ1bmRs
ZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku