From: Alexander Barkov
Date: March 3 2011 3:52pm
Subject: bzr push into mysql-5.5 branch (alexander.barkov:3368 to 3369)
List-Archive: http://lists.mysql.com/commits/132391
Message-Id: <201103031552.p23FqdbD001653@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMzNjkgQWxleGFuZGVyIEJhcmtvdgkyMDExLTAzLTAzIFttZXJnZV0KICAgICAgTWVyZ2luZyBm
cm9tIG15c3FsLTUuMQoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvY3R5cGVfc2pp
cy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX3Vjcy5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC90L2N0eXBlX3NqaXMudGVzdAogICAgICBteXNxbC10ZXN0L3QvY3R5cGVfdWNzLnRlc3QK
ICAgICAgc3FsL2l0ZW1fc3RyZnVuYy5jYwogICAgICBzcWwvaXRlbV9zdHJmdW5jLmgKIDMzNjgg
QWxleGFuZGVyIEJhcmtvdgkyMDExLTAzLTAzIFttZXJnZV0KICAgICAgTWVyZ2luZyBmcm9tIDUu
MQoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3IvZnVuY19lbmNyeXB0X3VjczIucmVzdWx0
CiAgICAgIG15c3FsLXRlc3QvdC9mdW5jX2VuY3J5cHRfdWNzMi50ZXN0CiAgICBtb2RpZmllZDoK
ICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX3Vjcy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L2N0
eXBlX3Vjcy50ZXN0CiAgICAgIHNxbC9pdGVtX2Z1bmMuY2MKICAgICAgc3FsL2l0ZW1fc3RyZnVu
Yy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2N0eXBlX3NqaXMucmVzdWx0Jwot
LS0gYS9teXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1bHQJMjAxMC0wMi0xNSAwNTo1NzoyNCAr
MDAwMAorKysgYi9teXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1bHQJMjAxMS0wMy0wMyAxNTo0
NjozMCArMDAwMApAQCAtMjE4LDYgKzIxOCwxMiBAQCBoZXgoYSkJaGV4KGxvd2VyKGEpKQloZXgo
dXBwZXIoYSkpCiA4MzUyODM1RQk4MzUyODM1RQk4MzUyODM1RQogODM3MjgzNUUJODM3MjgzNUUJ
ODM3MjgzNUUKIERST1AgVEFCTEUgdDE7CisjCisjIEJ1ZyMxMTc2NjUxOSAtIEJ1ZyM1OTY0ODog
TVlfU1RSVE9MTDEwX01CMjogQVNTRVJUSU9OIGAoKkVORFBUUiAtIFMpICUgMiA9PSAwJyBGQUlM
RUQuCisjCitTRUxFQ1QgUVVPVEUoJ++/vVwnKTsKK1FVT1RFKCfvv71cJykKKyfvv71cJwogIyBF
bmQgb2YgNS4xIHRlc3RzCiAjCiAjIFN0YXJ0IG9mIDUuNSB0ZXN0cwoKPT09IG1vZGlmaWVkIGZp
bGUgJ215c3FsLXRlc3Qvci9jdHlwZV91Y3MucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvY3R5
cGVfdWNzLnJlc3VsdAkyMDExLTAzLTAzIDEyOjI3OjM2ICswMDAwCisrKyBiL215c3FsLXRlc3Qv
ci9jdHlwZV91Y3MucmVzdWx0CTIwMTEtMDMtMDMgMTU6NDY6MzAgKzAwMDAKQEAgLTk5MCw4ICs5
OTAsOCBAQCBvbGRfcGFzc3dvcmQobmFtZSkKIDE0ZTUwMGIxMzE3NzM5OTEKIHNlbGVjdCBxdW90
ZShuYW1lKSBmcm9tIGJ1ZzIwNTM2OwogcXVvdGUobmFtZSkKLT8/Pz8/Pz8/Ci0/Pz8/Pz8/Pz8/
Pz8/Pz8/CisndGVzdDEnCisnXCd0ZXN0XFxfMlwnJwogZHJvcCB0YWJsZSBidWcyMDUzNjsKIHNl
dCBuYW1lcyB1Y3MyOwogRVJST1IgNDIwMDA6IFZhcmlhYmxlICdjaGFyYWN0ZXJfc2V0X2NsaWVu
dCcgY2FuJ3QgYmUgc2V0IHRvIHRoZSB2YWx1ZSBvZiAndWNzMicKQEAgLTEyNDQsNiArMTI0NCwx
MSBAQCBEUk9QIFRBQkxFIHQxOwogU0VMRUNUIEhFWChDSEFSKENPQUxFU0NFKE5VTEwsIENIQVIo
Q09VTlQoJyVzJykgVVNJTkcgdWNzMiksIDEsIEBAZ2xvYmFsLmxpY2Vuc2UsIE5VTEwpIFVTSU5H
IGNwODUwKSk7CiBIRVgoQ0hBUihDT0FMRVNDRShOVUxMLCBDSEFSKENPVU5UKCclcycpIFVTSU5H
IHVjczIpLCAxLCBAQGdsb2JhbC5saWNlbnNlLCBOVUxMKSBVU0lORyBjcDg1MCkpCiAwMAorU0VM
RUNUIENPTlZFUlQoUVVPVEUoQ0hBUigweGY1IHVzaW5nIHVjczIpKSwgU0lHTkVEKTsKK0NPTlZF
UlQoUVVPVEUoQ0hBUigweGY1IHVzaW5nIHVjczIpKSwgU0lHTkVEKQorMAorV2FybmluZ3M6CitX
YXJuaW5nCTEyOTIJVHJ1bmNhdGVkIGluY29ycmVjdCBJTlRFR0VSIHZhbHVlOiAnJwogRW5kIG9m
IDUuMCB0ZXN0cwogIwogIyBTdGFydCBvZiA1LjUgdGVzdHMKCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L3QvY3R5cGVfc2ppcy50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVfc2pp
cy50ZXN0CTIwMTAtMDItMTUgMDU6NTc6MjQgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBl
X3NqaXMudGVzdAkyMDExLTAzLTAzIDE1OjQ2OjMwICswMDAwCkBAIC05Miw2ICs5MiwxNCBAQCBJ
TlNFUlQgSU5UTyB0MSBWQUxVRVMgKDB4ODM3MjgzNUUpLCgweDgzCiBTRUxFQ1QgaGV4KGEpLCBo
ZXgobG93ZXIoYSkpLCBoZXgodXBwZXIoYSkpIEZST00gdDEgT1JERVIgQlkgYmluYXJ5KGEpOwog
RFJPUCBUQUJMRSB0MTsKIAorLS1lY2hvICMKKy0tZWNobyAjIEJ1ZyMxMTc2NjUxOSAtIEJ1ZyM1
OTY0ODogTVlfU1RSVE9MTDEwX01CMjogQVNTRVJUSU9OIGAoKkVORFBUUiAtIFMpICUgMiA9PSAw
JyBGQUlMRUQuCistLWVjaG8gIworIyBJbiB0aGUgYmVsb3cgc3RyaW5nIGJhY2tzbGFzaCAoMHg1
QykgaXMgYSBwYXJ0IG9mIGEgbXVsdGktYnl0ZQorIyBjaGFyYWN0ZXIsIHNvIGl0IHNob3VsZCBu
b3QgYmUgcXVvdGVkLgorU0VMRUNUIFFVT1RFKCfvv71cJyk7CisKKwogLS1lY2hvICMgRW5kIG9m
IDUuMSB0ZXN0cwogCiAKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVfdWNz
LnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9jdHlwZV91Y3MudGVzdAkyMDExLTAzLTAzIDEyOjI3
OjM2ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9jdHlwZV91Y3MudGVzdAkyMDExLTAzLTAzIDE1
OjQ2OjMwICswMDAwCkBAIC03NDUsNiArNzQ1LDcgQEAgRFJPUCBUQUJMRSB0MTsKIC0tZWNobyAj
IEJ1ZyM1OTY0OCBteV9zdHJ0b2xsMTBfbWIyOiBBc3NlcnRpb24gYCgqZW5kcHRyIC0gcykgJSAy
ID09IDAnIGZhaWxlZC4KIC0tZWNobyAjCiBTRUxFQ1QgSEVYKENIQVIoQ09BTEVTQ0UoTlVMTCwg
Q0hBUihDT1VOVCgnJXMnKSBVU0lORyB1Y3MyKSwgMSwgQEBnbG9iYWwubGljZW5zZSwgTlVMTCkg
VVNJTkcgY3A4NTApKTsKK1NFTEVDVCBDT05WRVJUKFFVT1RFKENIQVIoMHhmNSB1c2luZyB1Y3My
KSksIFNJR05FRCk7CiAKIC0tZWNobyBFbmQgb2YgNS4wIHRlc3RzCiAKCj09PSBtb2RpZmllZCBm
aWxlICdzcWwvaXRlbV9zdHJmdW5jLmNjJwotLS0gYS9zcWwvaXRlbV9zdHJmdW5jLmNjCTIwMTEt
MDMtMDMgMTI6Mjc6MzYgKzAwMDAKKysrIGIvc3FsL2l0ZW1fc3RyZnVuYy5jYwkyMDExLTAzLTAz
IDE1OjQ2OjMwICswMDAwCkBAIC0zNDUwLDE0ICszNDUwLDY4IEBAIFN0cmluZyAqSXRlbV9mdW5j
X3F1b3RlOjp2YWxfc3RyKFN0cmluZyAKICAgfQogCiAgIGFyZ19sZW5ndGg9IGFyZy0+bGVuZ3Ro
KCk7Ci0gIG5ld19sZW5ndGg9IGFyZ19sZW5ndGgrMjsgLyogZm9yIGJlZ2lubmluZyBhbmQgZW5k
aW5nICcgc2lnbnMgKi8KIAotICBmb3IgKGZyb209IChjaGFyKikgYXJnLT5wdHIoKSwgZW5kPSBm
cm9tICsgYXJnX2xlbmd0aDsgZnJvbSA8IGVuZDsgZnJvbSsrKQotICAgIG5ld19sZW5ndGgrPSBn
ZXRfZXNjX2JpdChlc2NtYXNrLCAodWNoYXIpICpmcm9tKTsKKyAgaWYgKGNvbGxhdGlvbi5jb2xs
YXRpb24tPm1ibWF4bGVuID09IDEpCisgIHsKKyAgICBuZXdfbGVuZ3RoPSBhcmdfbGVuZ3RoICsg
MjsgLyogZm9yIGJlZ2lubmluZyBhbmQgZW5kaW5nICcgc2lnbnMgKi8KKyAgICBmb3IgKGZyb209
IChjaGFyKikgYXJnLT5wdHIoKSwgZW5kPSBmcm9tICsgYXJnX2xlbmd0aDsgZnJvbSA8IGVuZDsg
ZnJvbSsrKQorICAgICAgbmV3X2xlbmd0aCs9IGdldF9lc2NfYml0KGVzY21hc2ssICh1Y2hhcikg
KmZyb20pOworICB9CisgIGVsc2UKKyAgeworICAgIG5ld19sZW5ndGg9IChhcmdfbGVuZ3RoICog
MikgKyAgLyogRm9yIHN0cmluZyBjaGFyYWN0ZXJzICovCisgICAgICAgICAgICAgICAgKDIgKiBj
b2xsYXRpb24uY29sbGF0aW9uLT5tYm1heGxlbik7IC8qIEZvciBxdW90ZXMgKi8KKyAgfQogCiAg
IGlmICh0bXBfdmFsdWUuYWxsb2MobmV3X2xlbmd0aCkpCiAgICAgZ290byBudWxsOwogCisgIGlm
IChjb2xsYXRpb24uY29sbGF0aW9uLT5tYm1heGxlbiA+IDEpCisgIHsKKyAgICBDSEFSU0VUX0lO
Rk8gKmNzPSBjb2xsYXRpb24uY29sbGF0aW9uOworICAgIGludCBtYmxlbjsKKyAgICB1Y2hhciAq
dG9fZW5kOworICAgIHRvPSAoY2hhciopIHRtcF92YWx1ZS5wdHIoKTsKKyAgICB0b19lbmQ9ICh1
Y2hhciopIHRvICsgbmV3X2xlbmd0aDsKKworICAgIC8qIFB1dCBsZWFkaW5nIHF1b3RlICovCisg
ICAgaWYgKChtYmxlbj0gY3MtPmNzZXQtPndjX21iKGNzLCAnXCcnLCAodWNoYXIgKikgdG8sIHRv
X2VuZCkpIDw9IDApCisgICAgICBnb3RvIG51bGw7CisgICAgdG8rPSBtYmxlbjsKKworICAgIGZv
ciAoc3RhcnQ9IChjaGFyKikgYXJnLT5wdHIoKSwgZW5kPSBzdGFydCArIGFyZ19sZW5ndGg7IHN0
YXJ0IDwgZW5kOyApCisgICAgeworICAgICAgbXlfd2NfdCB3YzsKKyAgICAgIGJvb2wgZXNjYXBl
OworICAgICAgaWYgKChtYmxlbj0gY3MtPmNzZXQtPm1iX3djKGNzLCAmd2MsICh1Y2hhciopIHN0
YXJ0LCAodWNoYXIqKSBlbmQpKSA8PSAwKQorICAgICAgICBnb3RvIG51bGw7CisgICAgICBzdGFy
dCs9IG1ibGVuOworICAgICAgc3dpdGNoICh3YykgeworICAgICAgICBjYXNlIDA6ICAgICAgZXNj
YXBlPSAxOyB3Yz0gJzAnOyBicmVhazsKKyAgICAgICAgY2FzZSAnXDAzMic6IGVzY2FwZT0gMTsg
d2M9ICdaJzsgYnJlYWs7CisgICAgICAgIGNhc2UgJ1wnJzogICBlc2NhcGU9IDE7IGJyZWFrOwor
ICAgICAgICBjYXNlICdcXCc6ICAgZXNjYXBlPSAxOyBicmVhazsKKyAgICAgICAgZGVmYXVsdDog
ICAgIGVzY2FwZT0gMDsgYnJlYWs7CisgICAgICB9CisgICAgICBpZiAoZXNjYXBlKQorICAgICAg
eworICAgICAgICBpZiAoKG1ibGVuPSBjcy0+Y3NldC0+d2NfbWIoY3MsICdcXCcsICh1Y2hhciop
IHRvLCB0b19lbmQpKSA8PSAwKQorICAgICAgICAgIGdvdG8gbnVsbDsKKyAgICAgICAgdG8rPSBt
YmxlbjsKKyAgICAgIH0KKyAgICAgIGlmICgobWJsZW49IGNzLT5jc2V0LT53Y19tYihjcywgd2Ms
ICh1Y2hhciopIHRvLCB0b19lbmQpKSA8PSAwKQorICAgICAgICBnb3RvIG51bGw7CisgICAgICB0
bys9IG1ibGVuOworICAgIH0KKworICAgIC8qIFB1dCB0cmFpbGluZyBxdW90ZSAqLworICAgIGlm
ICgobWJsZW49IGNzLT5jc2V0LT53Y19tYihjcywgJ1wnJywgKHVjaGFyICopIHRvLCB0b19lbmQp
KSA8PSAwKQorICAgICAgZ290byBudWxsOworICAgIHRvKz0gbWJsZW47CisgICAgbmV3X2xlbmd0
aD0gdG8gLSB0bXBfdmFsdWUucHRyKCk7CisgICAgZ290byByZXQ7CisgIH0KKwogICAvKgogICAg
IFdlIHJlcGxhY2UgY2hhcmFjdGVycyBmcm9tIHRoZSBlbmQgdG8gdGhlIGJlZ2lubmluZwogICAq
LwpAQCAtMzQ4OSw2ICszNTQzLDggQEAgU3RyaW5nICpJdGVtX2Z1bmNfcXVvdGU6OnZhbF9zdHIo
U3RyaW5nIAogICAgIH0KICAgfQogICAqdG89ICdcJyc7CisKK3JldDoKICAgdG1wX3ZhbHVlLmxl
bmd0aChuZXdfbGVuZ3RoKTsKICAgdG1wX3ZhbHVlLnNldF9jaGFyc2V0KGNvbGxhdGlvbi5jb2xs
YXRpb24pOwogICBudWxsX3ZhbHVlPSAwOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9pdGVtX3N0
cmZ1bmMuaCcKLS0tIGEvc3FsL2l0ZW1fc3RyZnVuYy5oCTIwMTEtMDItMTAgMDg6MTg6MDggKzAw
MDAKKysrIGIvc3FsL2l0ZW1fc3RyZnVuYy5oCTIwMTEtMDMtMDMgMTU6NDY6MzAgKzAwMDAKQEAg
LTc4Nyw5ICs3ODcsMTAgQEAgcHVibGljOgogICBTdHJpbmcgKnZhbF9zdHIoU3RyaW5nICopOwog
ICB2b2lkIGZpeF9sZW5ndGhfYW5kX2RlYygpCiAgIHsKLSAgICB1bG9uZ2xvbmcgbWF4X3Jlc3Vs
dF9sZW5ndGg9ICh1bG9uZ2xvbmcpIGFyZ3NbMF0tPm1heF9sZW5ndGggKiAyICsgMjsKLSAgICBt
YXhfbGVuZ3RoPSAodWludDMyKSBtaW4obWF4X3Jlc3VsdF9sZW5ndGgsIE1BWF9CTE9CX1dJRFRI
KTsKICAgICBjb2xsYXRpb24uc2V0KGFyZ3NbMF0tPmNvbGxhdGlvbik7CisgICAgdWxvbmdsb25n
IG1heF9yZXN1bHRfbGVuZ3RoPSAodWxvbmdsb25nKSBhcmdzWzBdLT5tYXhfbGVuZ3RoICogMiAr
CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMiAqIGNvbGxhdGlvbi5jb2xsYXRp
b24tPm1ibWF4bGVuOworICAgIG1heF9sZW5ndGg9ICh1aW50MzIpIG1pbihtYXhfcmVzdWx0X2xl
bmd0aCwgTUFYX0JMT0JfV0lEVEgpOwogICB9CiB9OwogCgpObyBidW5kbGUgKHJlYXNvbjogdXNl
bGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==