From: Sergey Glukhov
Date: October 12 2011 2:06pm
Subject: bzr push into mysql-trunk branch (sergey.glukhov:3487 to 3488)
List-Archive: http://lists.mysql.com/commits/141405
Message-Id: <201110121409.p9CE9k5a022457@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0ODggU2VyZ2V5IEdsdWtob3YJMjAxMS0xMC0xMiBbbWVyZ2VdCiAgICAgIGF1dG9tZXJnZQoK
IDM0ODcgU2VyZ2V5IEdsdWtob3YJMjAxMS0xMC0xMiBbbWVyZ2VdCiAgICAgIGF1dG9tZXJnZQoK
ICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHNlYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVm
L2J1ZjBidWYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9oYS9oYTBoYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2lfcy5jYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL2J0cjBzZWEuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHR5cGVz
LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAogICAgICBzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvaGEwaGEuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
aGEwaGEuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzB1cGQuaWMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3N5bmMwc3luYy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvcGFnZS9wYWdlMHBhZ2UuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwc3luYy5jCj09PSBtb2RpZmllZCBmaWxl
ICdteXNxbC10ZXN0L3IvY3R5cGVfdXRmMTYucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvY3R5
cGVfdXRmMTYucmVzdWx0CTIwMTEtMDktMjIgMTA6NDI6MTAgKzAwMDAKKysrIGIvbXlzcWwtdGVz
dC9yL2N0eXBlX3V0ZjE2LnJlc3VsdAkyMDExLTEwLTEyIDEzOjU4OjMxICswMDAwCkBAIC0xMTMz
LDYgKzExMzMsMjAgQEAgTlVMTAogV2FybmluZ3M6CiBXYXJuaW5nCTEzMDEJUmVzdWx0IG9mIHNw
YWNlKCkgd2FzIGxhcmdlciB0aGFuIG1heF9hbGxvd2VkX3BhY2tldCAoMTA0ODU3NikgLSB0cnVu
Y2F0ZWQKICMKKyMgQnVnIzExNzUwNTE4IDQxMDkwOiBPUkRFUiBCWSBUUlVOQ0FURVMgR1JPVVBf
Q09OQ0FUIFJFU1VMVAorIworU0VUIE5BTUVTIHV0ZjgsIEBAY2hhcmFjdGVyX3NldF9jb25uZWN0
aW9uPXV0ZjE2OworU0VMRUNUIGlkLCBDSEFSX0xFTkdUSChHUk9VUF9DT05DQVQoYm9keSkpIEFT
IGwKK0ZST00gKFNFTEVDVCAnYScgQVMgaWQsIFJFUEVBVCgnZm9vIGJhcicsIDEwMCkgQVMgYm9k
eQorVU5JT04gQUxMCitTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2JsYSBibGEnLCAxMDApIEFT
IGJvZHkpIHQxCitHUk9VUCBCWSBpZAorT1JERVIgQlkgbCBERVNDOworaWQJbAorYQk1MTIKK1dh
cm5pbmdzOgorV2FybmluZwkxMjYwCVJvdyAxIHdhcyBjdXQgYnkgR1JPVVBfQ09OQ0FUKCkKKyMK
ICMgRW5kIG9mIDUuNSB0ZXN0cwogIwogIwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qv
ci9jdHlwZV91dGYzMi5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9jdHlwZV91dGYzMi5yZXN1
bHQJMjAxMS0wMy0wMSAxMjoyMDozOCArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvY3R5cGVfdXRm
MzIucmVzdWx0CTIwMTEtMTAtMTIgMTM6NTg6MzEgKzAwMDAKQEAgLTExODgsNiArMTE4OCwyMCBA
QCBDQVNFIHMxIFdIRU4gJ2EnIFRIRU4gJ2InIEVMU0UgJ2MnIEVORAogYgogRFJPUCBUQUJMRSB0
MTsKICMKKyMgQnVnIzExNzUwNTE4IDQxMDkwOiBPUkRFUiBCWSBUUlVOQ0FURVMgR1JPVVBfQ09O
Q0FUIFJFU1VMVAorIworU0VUIE5BTUVTIHV0ZjgsIEBAY2hhcmFjdGVyX3NldF9jb25uZWN0aW9u
PXV0ZjMyOworU0VMRUNUIGlkLCBDSEFSX0xFTkdUSChHUk9VUF9DT05DQVQoYm9keSkpIEFTIGwK
K0ZST00gKFNFTEVDVCAnYScgQVMgaWQsIFJFUEVBVCgnZm9vIGJhcicsIDEwMCkgQVMgYm9keQor
VU5JT04gQUxMCitTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2JsYSBibGEnLCAxMDApIEFTIGJv
ZHkpIHQxCitHUk9VUCBCWSBpZAorT1JERVIgQlkgbCBERVNDOworaWQJbAorYQkyNTYKK1dhcm5p
bmdzOgorV2FybmluZwkxMjYwCVJvdyAxIHdhcyBjdXQgYnkgR1JPVVBfQ09OQ0FUKCkKKyMKICMg
RW5kIG9mIDUuNSB0ZXN0cwogIwogIwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9j
dHlwZV91dGY4LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL2N0eXBlX3V0ZjgucmVzdWx0CTIw
MTEtMDgtMDMgMTE6Mjk6MjAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL2N0eXBlX3V0ZjgucmVz
dWx0CTIwMTEtMTAtMTIgMTM6NTg6MzEgKzAwMDAKQEAgLTI4NzksNyArMjg3OSw3IEBAIGNyZWF0
ZSB0YWJsZSB0MSBhcyBzZWxlY3QgZ3JvdXBfY29uY2F0KDEKIHNob3cgY3JlYXRlIHRhYmxlIHQx
OwogVGFibGUJQ3JlYXRlIFRhYmxlCiB0MQlDUkVBVEUgVEFCTEUgYHQxYCAoCi0gIGBjMWAgdmFy
Y2hhcigzNDIpIENIQVJBQ1RFUiBTRVQgdXRmOCBERUZBVUxUIE5VTEwKKyAgYGMxYCB0ZXh0IENI
QVJBQ1RFUiBTRVQgdXRmOAogKSBFTkdJTkU9TXlJU0FNIERFRkFVTFQgQ0hBUlNFVD1sYXRpbjEK
IGRyb3AgdGFibGUgdDE7CiBjcmVhdGUgdGFibGUgdDEgYXMgc2VsZWN0IDEgYXMgYzEgdW5pb24g
c2VsZWN0ICdhJzsKQEAgLTUxMjQsNiArNTEyNCwyMCBAQCBpZAlzZWxlY3RfdHlwZQl0YWJsZQl0
eXBlCXBvc3NpYmxlX2tleXMJCiBXYXJuaW5nczoKIE5vdGUJMTAwMwkvKiBzZWxlY3QjMSAqLyBz
ZWxlY3QgJ2FiY2TDgcOCw4PDhMOFJyBBUyBgYWJjZMOBw4LDg8OEw4VgLF9sYXRpbjEnYWJjZFx4
QzNceDgxXHhDM1x4ODJceEMzXHg4M1x4QzNceDg0XHhDM1x4ODUnIEFTIGBhYmNkw4PCgcOD4oCa
w4PGksOD4oCew4PigKZgLF91dGY4J2FiY2RceEMzXHg4MVx4QzNceDgyXHhDM1x4ODNceEMzXHg4
NFx4QzNceDg1JyBBUyBgYWJjZMOBw4LDg8OEw4VgCiAjCisjIEJ1ZyMxMTc1MDUxOCA0MTA5MDog
T1JERVIgQlkgVFJVTkNBVEVTIEdST1VQX0NPTkNBVCBSRVNVTFQKKyMKK1NFVCBOQU1FUyB1dGY4
OworU0VMRUNUIGlkLCBDSEFSX0xFTkdUSChHUk9VUF9DT05DQVQoYm9keSkpIEFTIGwKK0ZST00g
KFNFTEVDVCAnYScgQVMgaWQsIFJFUEVBVCgnZm9vIGJhcicsIDEwMCkgQVMgYm9keQorVU5JT04g
QUxMCitTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2JsYSBibGEnLCAxMDApIEFTIGJvZHkpIHQx
CitHUk9VUCBCWSBpZAorT1JERVIgQlkgbCBERVNDOworaWQJbAorYQkxMDI0CitXYXJuaW5nczoK
K1dhcm5pbmcJMTI2MAlSb3cgMiB3YXMgY3V0IGJ5IEdST1VQX0NPTkNBVCgpCisjCiAjIEVuZCBv
ZiA1LjUgdGVzdHMKICMKICMKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVf
dXRmMTYudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2N0eXBlX3V0ZjE2LnRlc3QJMjAxMS0wNS0w
MiAxMTozMToyNyArMDAwMAorKysgYi9teXNxbC10ZXN0L3QvY3R5cGVfdXRmMTYudGVzdAkyMDEx
LTEwLTEyIDEzOjU4OjMxICswMDAwCkBAIC03NjMsNiArNzYzLDIwIEBAIERST1AgVEFCTEUgdDE7
CiAKIFNFTEVDVCBzcGFjZShkYXRlX2FkZCgxMDEsIElOVEVSVkFMIENIQVIoJzEnIFVTSU5HIHV0
ZjE2KSBob3VyX3NlY29uZCkpOyAKIAorCistLWVjaG8gIworLS1lY2hvICMgQnVnIzExNzUwNTE4
IDQxMDkwOiBPUkRFUiBCWSBUUlVOQ0FURVMgR1JPVVBfQ09OQ0FUIFJFU1VMVAorLS1lY2hvICMK
KworU0VUIE5BTUVTIHV0ZjgsIEBAY2hhcmFjdGVyX3NldF9jb25uZWN0aW9uPXV0ZjE2OworU0VM
RUNUIGlkLCBDSEFSX0xFTkdUSChHUk9VUF9DT05DQVQoYm9keSkpIEFTIGwKK0ZST00gKFNFTEVD
VCAnYScgQVMgaWQsIFJFUEVBVCgnZm9vIGJhcicsIDEwMCkgQVMgYm9keQorVU5JT04gQUxMCitT
RUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2JsYSBibGEnLCAxMDApIEFTIGJvZHkpIHQxCitHUk9V
UCBCWSBpZAorT1JERVIgQlkgbCBERVNDOworCisKICMKICMjIFRPRE86IGFkZCB0ZXN0cyBmb3Ig
YWxsIGVuZ2luZXMKICMKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVfdXRm
MzIudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2N0eXBlX3V0ZjMyLnRlc3QJMjAxMS0wMy0wMSAx
MjoyMDozOCArMDAwMAorKysgYi9teXNxbC10ZXN0L3QvY3R5cGVfdXRmMzIudGVzdAkyMDExLTEw
LTEyIDEzOjU4OjMxICswMDAwCkBAIC04NTIsNiArODUyLDE5IEBAIFNFTEVDVCBDQVNFIHMxIFdI
RU4gJ2EnIFRIRU4gJ2InIEVMU0UgJ2MKIERST1AgVEFCTEUgdDE7CiAKIC0tZWNobyAjCistLWVj
aG8gIyBCdWcjMTE3NTA1MTggNDEwOTA6IE9SREVSIEJZIFRSVU5DQVRFUyBHUk9VUF9DT05DQVQg
UkVTVUxUCistLWVjaG8gIworCitTRVQgTkFNRVMgdXRmOCwgQEBjaGFyYWN0ZXJfc2V0X2Nvbm5l
Y3Rpb249dXRmMzI7CitTRUxFQ1QgaWQsIENIQVJfTEVOR1RIKEdST1VQX0NPTkNBVChib2R5KSkg
QVMgbAorRlJPTSAoU0VMRUNUICdhJyBBUyBpZCwgUkVQRUFUKCdmb28gYmFyJywgMTAwKSBBUyBi
b2R5CitVTklPTiBBTEwKK1NFTEVDVCAnYScgQVMgaWQsIFJFUEVBVCgnYmxhIGJsYScsIDEwMCkg
QVMgYm9keSkgdDEKK0dST1VQIEJZIGlkCitPUkRFUiBCWSBsIERFU0M7CisKKworLS1lY2hvICMK
IC0tZWNobyAjIEVuZCBvZiA1LjUgdGVzdHMKIC0tZWNobyAjCiAKCj09PSBtb2RpZmllZCBmaWxl
ICdteXNxbC10ZXN0L3QvY3R5cGVfdXRmOC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVf
dXRmOC50ZXN0CTIwMTEtMDMtMDQgMTU6NTU6MTggKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0
eXBlX3V0ZjgudGVzdAkyMDExLTEwLTEyIDEzOjU4OjMxICswMDAwCkBAIC0xNTgyLDYgKzE1ODIs
MTggQEAgU0VUIE5BTUVTIHV0Zjg7CiBFWFBMQUlOIEVYVEVOREVEIFNFTEVDVCAnYWJjZMOBw4LD
g8OEw4UnLCBfbGF0aW4xJ2FiY2TDgcOCw4PDhMOFJywgX3V0ZjgnYWJjZMOBw4LDg8OEw4UnOwog
CiAtLWVjaG8gIworLS1lY2hvICMgQnVnIzExNzUwNTE4IDQxMDkwOiBPUkRFUiBCWSBUUlVOQ0FU
RVMgR1JPVVBfQ09OQ0FUIFJFU1VMVAorLS1lY2hvICMKKworU0VUIE5BTUVTIHV0Zjg7CitTRUxF
Q1QgaWQsIENIQVJfTEVOR1RIKEdST1VQX0NPTkNBVChib2R5KSkgQVMgbAorRlJPTSAoU0VMRUNU
ICdhJyBBUyBpZCwgUkVQRUFUKCdmb28gYmFyJywgMTAwKSBBUyBib2R5CitVTklPTiBBTEwKK1NF
TEVDVCAnYScgQVMgaWQsIFJFUEVBVCgnYmxhIGJsYScsIDEwMCkgQVMgYm9keSkgdDEKK0dST1VQ
IEJZIGlkCitPUkRFUiBCWSBsIERFU0M7CisKKy0tZWNobyAjCiAtLWVjaG8gIyBFbmQgb2YgNS41
IHRlc3RzCiAtLWVjaG8gIwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL2l0ZW0uaCcKLS0tIGEv
c3FsL2l0ZW0uaAkyMDExLTA5LTA3IDEyOjQxOjUzICswMDAwCisrKyBiL3NxbC9pdGVtLmgJMjAx
MS0xMC0xMiAxMzo1ODozMSArMDAwMApAQCAtNTk5LDcgKzU5OSw3IEBAIHB1YmxpYzoKICAgdm9p
ZCBpbml0X21ha2VfZmllbGQoU2VuZF9maWVsZCAqdG1wX2ZpZWxkLGVudW0gZW51bV9maWVsZF90
eXBlcyB0eXBlKTsKICAgdmlydHVhbCB2b2lkIGNsZWFudXAoKTsKICAgdmlydHVhbCB2b2lkIG1h
a2VfZmllbGQoU2VuZF9maWVsZCAqZmllbGQpOwotICBGaWVsZCAqbWFrZV9zdHJpbmdfZmllbGQo
VEFCTEUgKnRhYmxlKTsKKyAgdmlydHVhbCBGaWVsZCAqbWFrZV9zdHJpbmdfZmllbGQoVEFCTEUg
KnRhYmxlKTsKICAgdmlydHVhbCBib29sIGZpeF9maWVsZHMoVEhEICosIEl0ZW0gKiopOwogICAv
KioKICAgICBGaXggYWZ0ZXIgdGFibGVzIGhhdmUgYmVlbiBtb3ZlZCBmcm9tIG9uZSBzZWxlY3Rf
bGV4IGxldmVsIHRvIHRoZSBwYXJlbnQKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvaXRlbV9zdW0u
Y2MnCi0tLSBhL3NxbC9pdGVtX3N1bS5jYwkyMDExLTA3LTI5IDA5OjI5OjExICswMDAwCisrKyBi
L3NxbC9pdGVtX3N1bS5jYwkyMDExLTEwLTEyIDEzOjU4OjMxICswMDAwCkBAIC0zMTI5LDYgKzMx
MjksMzEgQEAgdm9pZCBJdGVtX2Z1bmNfZ3JvdXBfY29uY2F0OjpjbGVhbnVwKCkKIH0KIAogCitG
aWVsZCAqSXRlbV9mdW5jX2dyb3VwX2NvbmNhdDo6bWFrZV9zdHJpbmdfZmllbGQoVEFCTEUgKnRh
YmxlKQoreworICBGaWVsZCAqZmllbGQ7CisgIERCVUdfQVNTRVJUKGNvbGxhdGlvbi5jb2xsYXRp
b24pOworICAvKgorICAgIG1heF9jaGFyYWN0ZXJzIGlzIG1heGltdW0gbnVtYmVyIG9mIGNoYXJh
Y3RlcnMKKyAgICB3aGF0IGNhbiBmaXQgaW50byBtYXhfbGVuZ3RoIHNpemUuIEl0J3MgbmVjZXNz
YXJ5CisgICAgdG8gdXNlIGZpZWxkIHNpemUgd2hhdCBhbGxvd3MgdG8gc3RvcmUgZ3JvdXBfY29u
Y2F0CisgICAgcmVzdWx0IHdpdGhvdXQgdHJ1bmNhdGlvbi4gRm9yIHRoaXMgcHVycG9zZSB3ZSB1
c2UKKyAgICBtYXhfY2hhcmFjdGVycyAqIENTLT5tYm1heGxlbi4KKyAgKi8KKyAgY29uc3QgdWlu
dDMyIG1heF9jaGFyYWN0ZXJzPSBtYXhfbGVuZ3RoIC8gY29sbGF0aW9uLmNvbGxhdGlvbi0+bWJt
aW5sZW47CisgIGlmIChtYXhfY2hhcmFjdGVycyA+IENPTlZFUlRfSUZfQklHR0VSX1RPX0JMT0Ip
CisgICAgZmllbGQ9IG5ldyBGaWVsZF9ibG9iKG1heF9jaGFyYWN0ZXJzICogY29sbGF0aW9uLmNv
bGxhdGlvbi0+bWJtYXhsZW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgIG1heWJlX251bGws
IG5hbWUsIGNvbGxhdGlvbi5jb2xsYXRpb24sIFRSVUUpOworICBlbHNlCisgICAgZmllbGQ9IG5l
dyBGaWVsZF92YXJzdHJpbmcobWF4X2NoYXJhY3RlcnMgKiBjb2xsYXRpb24uY29sbGF0aW9uLT5t
Ym1heGxlbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXliZV9udWxsLCBuYW1l
LCB0YWJsZS0+cywgY29sbGF0aW9uLmNvbGxhdGlvbik7CisKKyAgaWYgKGZpZWxkKQorICAgIGZp
ZWxkLT5pbml0KHRhYmxlKTsKKyAgcmV0dXJuIGZpZWxkOworfQorCisKIEl0ZW0gKkl0ZW1fZnVu
Y19ncm91cF9jb25jYXQ6OmNvcHlfb3Jfc2FtZShUSEQqIHRoZCkKIHsKICAgcmV0dXJuIG5ldyAo
dGhkLT5tZW1fcm9vdCkgSXRlbV9mdW5jX2dyb3VwX2NvbmNhdCh0aGQsIHRoaXMpOwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3NxbC9pdGVtX3N1bS5oJwotLS0gYS9zcWwvaXRlbV9zdW0uaAkyMDExLTA2
LTMwIDE1OjUwOjQ1ICswMDAwCisrKyBiL3NxbC9pdGVtX3N1bS5oCTIwMTEtMTAtMTIgMTM6NTg6
MzEgKzAwMDAKQEAgLTE0MDksNiArMTQwOSw3IEBAIHB1YmxpYzoKICAgZW51bSBTdW1mdW5jdHlw
ZSBzdW1fZnVuYyAoKSBjb25zdCB7cmV0dXJuIEdST1VQX0NPTkNBVF9GVU5DO30KICAgY29uc3Qg
Y2hhciAqZnVuY19uYW1lKCkgY29uc3QgeyByZXR1cm4gImdyb3VwX2NvbmNhdCI7IH0KICAgdmly
dHVhbCBJdGVtX3Jlc3VsdCByZXN1bHRfdHlwZSAoKSBjb25zdCB7IHJldHVybiBTVFJJTkdfUkVT
VUxUOyB9CisgIHZpcnR1YWwgRmllbGQgKm1ha2Vfc3RyaW5nX2ZpZWxkKFRBQkxFICp0YWJsZSk7
CiAgIGVudW1fZmllbGRfdHlwZXMgZmllbGRfdHlwZSgpIGNvbnN0CiAgIHsKICAgICBpZiAobWF4
X2xlbmd0aC9jb2xsYXRpb24uY29sbGF0aW9uLT5tYm1heGxlbiA+IENPTlZFUlRfSUZfQklHR0VS
X1RPX0JMT0IgKQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=