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

IDM1NzYgU2VyZ2V5IEdsdWtob3YJMjAxMS0xMC0xMiBbbWVyZ2VdCiAgICAgIGF1dG9tZXJnZQoK
ICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHNlYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVm
L2J1ZjBidWYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9oYS9oYTBoYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwc2VhLmgKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2J0cjB0eXBlcy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYw
YnVmLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2hhMGhhLmgKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL2hhMGhhLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9yb3cwdXBkLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zeW5jMHN5bmMuaAog
ICAgICBzdG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTBwYWdlLmMKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9zeW5jL3N5bmMwc3luYy5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvY3R5
cGVfdXRmMTYucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvY3R5cGVfdXRmMTYucmVzdWx0CTIw
MTEtMDQtMjggMDc6MDM6NTYgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL2N0eXBlX3V0ZjE2LnJl
c3VsdAkyMDExLTEwLTEyIDEzOjQxOjI1ICswMDAwCkBAIC0xMTI2LDUgKzExMjYsMTkgQEAgTlVM
TAogV2FybmluZ3M6CiBXYXJuaW5nCTEzMDEJUmVzdWx0IG9mIHJlcGVhdCgpIHdhcyBsYXJnZXIg
dGhhbiBtYXhfYWxsb3dlZF9wYWNrZXQgKDEwNDg1NzYpIC0gdHJ1bmNhdGVkCiAjCisjIEJ1ZyMx
MTc1MDUxOCA0MTA5MDogT1JERVIgQlkgVFJVTkNBVEVTIEdST1VQX0NPTkNBVCBSRVNVTFQKKyMK
K1NFVCBOQU1FUyB1dGY4LCBAQGNoYXJhY3Rlcl9zZXRfY29ubmVjdGlvbj11dGYxNjsKK1NFTEVD
VCBpZCwgQ0hBUl9MRU5HVEgoR1JPVVBfQ09OQ0FUKGJvZHkpKSBBUyBsCitGUk9NIChTRUxFQ1Qg
J2EnIEFTIGlkLCBSRVBFQVQoJ2ZvbyBiYXInLCAxMDApIEFTIGJvZHkKK1VOSU9OIEFMTAorU0VM
RUNUICdhJyBBUyBpZCwgUkVQRUFUKCdibGEgYmxhJywgMTAwKSBBUyBib2R5KSB0MQorR1JPVVAg
QlkgaWQKK09SREVSIEJZIGwgREVTQzsKK2lkCWwKK2EJNTEyCitXYXJuaW5nczoKK1dhcm5pbmcJ
MTI2MAlSb3cgMSB3YXMgY3V0IGJ5IEdST1VQX0NPTkNBVCgpCisjCiAjIEVuZCBvZiA1LjUgdGVz
dHMKICMKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvY3R5cGVfdXRmMzIucmVzdWx0
JwotLS0gYS9teXNxbC10ZXN0L3IvY3R5cGVfdXRmMzIucmVzdWx0CTIwMTEtMDMtMDEgMTI6MDk6
MzcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL2N0eXBlX3V0ZjMyLnJlc3VsdAkyMDExLTEwLTEy
IDEzOjQxOjI1ICswMDAwCkBAIC0xMTY3LDUgKzExNjcsMTkgQEAgQ0FTRSBzMSBXSEVOICdhJyBU
SEVOICdiJyBFTFNFICdjJyBFTkQKIGIKIERST1AgVEFCTEUgdDE7CiAjCisjIEJ1ZyMxMTc1MDUx
OCA0MTA5MDogT1JERVIgQlkgVFJVTkNBVEVTIEdST1VQX0NPTkNBVCBSRVNVTFQKKyMKK1NFVCBO
QU1FUyB1dGY4LCBAQGNoYXJhY3Rlcl9zZXRfY29ubmVjdGlvbj11dGYzMjsKK1NFTEVDVCBpZCwg
Q0hBUl9MRU5HVEgoR1JPVVBfQ09OQ0FUKGJvZHkpKSBBUyBsCitGUk9NIChTRUxFQ1QgJ2EnIEFT
IGlkLCBSRVBFQVQoJ2ZvbyBiYXInLCAxMDApIEFTIGJvZHkKK1VOSU9OIEFMTAorU0VMRUNUICdh
JyBBUyBpZCwgUkVQRUFUKCdibGEgYmxhJywgMTAwKSBBUyBib2R5KSB0MQorR1JPVVAgQlkgaWQK
K09SREVSIEJZIGwgREVTQzsKK2lkCWwKK2EJMjU2CitXYXJuaW5nczoKK1dhcm5pbmcJMTI2MAlS
b3cgMSB3YXMgY3V0IGJ5IEdST1VQX0NPTkNBVCgpCisjCiAjIEVuZCBvZiA1LjUgdGVzdHMKICMK
Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvY3R5cGVfdXRmOC5yZXN1bHQnCi0tLSBh
L215c3FsLXRlc3Qvci9jdHlwZV91dGY4LnJlc3VsdAkyMDExLTA1LTExIDExOjExOjU3ICswMDAw
CisrKyBiL215c3FsLXRlc3Qvci9jdHlwZV91dGY4LnJlc3VsdAkyMDExLTEwLTEyIDEzOjQxOjI1
ICswMDAwCkBAIC0yNzg4LDcgKzI3ODgsNyBAQCBjcmVhdGUgdGFibGUgdDEgYXMgc2VsZWN0IGdy
b3VwX2NvbmNhdCgxCiBzaG93IGNyZWF0ZSB0YWJsZSB0MTsKIFRhYmxlCUNyZWF0ZSBUYWJsZQog
dDEJQ1JFQVRFIFRBQkxFIGB0MWAgKAotICBgYzFgIHZhcmNoYXIoMzQyKSBDSEFSQUNURVIgU0VU
IHV0ZjggREVGQVVMVCBOVUxMCisgIGBjMWAgdGV4dCBDSEFSQUNURVIgU0VUIHV0ZjgKICkgRU5H
SU5FPU15SVNBTSBERUZBVUxUIENIQVJTRVQ9bGF0aW4xCiBkcm9wIHRhYmxlIHQxOwogY3JlYXRl
IHRhYmxlIHQxIGFzIHNlbGVjdCAxIGFzIGMxIHVuaW9uIHNlbGVjdCAnYSc7CkBAIC01MDEwLDUg
KzUwMTAsMTkgQEAgaWQJc2VsZWN0X3R5cGUJdGFibGUJdHlwZQlwb3NzaWJsZV9rZXlzCQogV2Fy
bmluZ3M6CiBOb3RlCTEwMDMJc2VsZWN0ICdhYmNkw4HDgsODw4TDhScgQVMgYGFiY2TDgcOCw4PD
hMOFYCxfbGF0aW4xJ2FiY2RceEMzXHg4MVx4QzNceDgyXHhDM1x4ODNceEMzXHg4NFx4QzNceDg1
JyBBUyBgYWJjZMODwoHDg+KAmsODxpLDg+KAnsOD4oCmYCxfdXRmOCdhYmNkXHhDM1x4ODFceEMz
XHg4Mlx4QzNceDgzXHhDM1x4ODRceEMzXHg4NScgQVMgYGFiY2TDgcOCw4PDhMOFYAogIworIyBC
dWcjMTE3NTA1MTggNDEwOTA6IE9SREVSIEJZIFRSVU5DQVRFUyBHUk9VUF9DT05DQVQgUkVTVUxU
CisjCitTRVQgTkFNRVMgdXRmODsKK1NFTEVDVCBpZCwgQ0hBUl9MRU5HVEgoR1JPVVBfQ09OQ0FU
KGJvZHkpKSBBUyBsCitGUk9NIChTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2ZvbyBiYXInLCAx
MDApIEFTIGJvZHkKK1VOSU9OIEFMTAorU0VMRUNUICdhJyBBUyBpZCwgUkVQRUFUKCdibGEgYmxh
JywgMTAwKSBBUyBib2R5KSB0MQorR1JPVVAgQlkgaWQKK09SREVSIEJZIGwgREVTQzsKK2lkCWwK
K2EJMTAyNAorV2FybmluZ3M6CitXYXJuaW5nCTEyNjAJUm93IDIgd2FzIGN1dCBieSBHUk9VUF9D
T05DQVQoKQorIwogIyBFbmQgb2YgNS41IHRlc3RzCiAjCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC90L2N0eXBlX3V0ZjE2LnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9jdHlwZV91dGYx
Ni50ZXN0CTIwMTEtMDQtMjggMDc6MDM6NTYgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBl
X3V0ZjE2LnRlc3QJMjAxMS0xMC0xMiAxMzo0MToyNSArMDAwMApAQCAtNzYyLDYgKzc2MiwyMCBA
QCBEUk9QIFRBQkxFIHQxOwogCiBTRUxFQ1Qgc3BhY2UoZGF0ZV9hZGQoMTAxLCBJTlRFUlZBTCBD
SEFSKCcxJyBVU0lORyB1dGYxNikgaG91cl9zZWNvbmQpKTsgCiAKKworLS1lY2hvICMKKy0tZWNo
byAjIEJ1ZyMxMTc1MDUxOCA0MTA5MDogT1JERVIgQlkgVFJVTkNBVEVTIEdST1VQX0NPTkNBVCBS
RVNVTFQKKy0tZWNobyAjCisKK1NFVCBOQU1FUyB1dGY4LCBAQGNoYXJhY3Rlcl9zZXRfY29ubmVj
dGlvbj11dGYxNjsKK1NFTEVDVCBpZCwgQ0hBUl9MRU5HVEgoR1JPVVBfQ09OQ0FUKGJvZHkpKSBB
UyBsCitGUk9NIChTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2ZvbyBiYXInLCAxMDApIEFTIGJv
ZHkKK1VOSU9OIEFMTAorU0VMRUNUICdhJyBBUyBpZCwgUkVQRUFUKCdibGEgYmxhJywgMTAwKSBB
UyBib2R5KSB0MQorR1JPVVAgQlkgaWQKK09SREVSIEJZIGwgREVTQzsKKworCiAjCiAjIyBUT0RP
OiBhZGQgdGVzdHMgZm9yIGFsbCBlbmdpbmVzCiAjCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwt
dGVzdC90L2N0eXBlX3V0ZjMyLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9jdHlwZV91dGYzMi50
ZXN0CTIwMTEtMDMtMDEgMTI6MDk6MzcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBlX3V0
ZjMyLnRlc3QJMjAxMS0xMC0xMiAxMzo0MToyNSArMDAwMApAQCAtODQxLDUgKzg0MSwxOCBAQCBT
RUxFQ1QgQ0FTRSBzMSBXSEVOICdhJyBUSEVOICdiJyBFTFNFICdjCiBEUk9QIFRBQkxFIHQxOwog
CiAtLWVjaG8gIworLS1lY2hvICMgQnVnIzExNzUwNTE4IDQxMDkwOiBPUkRFUiBCWSBUUlVOQ0FU
RVMgR1JPVVBfQ09OQ0FUIFJFU1VMVAorLS1lY2hvICMKKworU0VUIE5BTUVTIHV0ZjgsIEBAY2hh
cmFjdGVyX3NldF9jb25uZWN0aW9uPXV0ZjMyOworU0VMRUNUIGlkLCBDSEFSX0xFTkdUSChHUk9V
UF9DT05DQVQoYm9keSkpIEFTIGwKK0ZST00gKFNFTEVDVCAnYScgQVMgaWQsIFJFUEVBVCgnZm9v
IGJhcicsIDEwMCkgQVMgYm9keQorVU5JT04gQUxMCitTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQo
J2JsYSBibGEnLCAxMDApIEFTIGJvZHkpIHQxCitHUk9VUCBCWSBpZAorT1JERVIgQlkgbCBERVND
OworCisKKy0tZWNobyAjCiAtLWVjaG8gIyBFbmQgb2YgNS41IHRlc3RzCiAtLWVjaG8gIwoKPT09
IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9jdHlwZV91dGY4LnRlc3QnCi0tLSBhL215c3Fs
LXRlc3QvdC9jdHlwZV91dGY4LnRlc3QJMjAxMS0wMy0wNCAxNTo0MzoyOCArMDAwMAorKysgYi9t
eXNxbC10ZXN0L3QvY3R5cGVfdXRmOC50ZXN0CTIwMTEtMTAtMTIgMTM6NDE6MjUgKzAwMDAKQEAg
LTE1NjIsNSArMTU2MiwxNyBAQCBTRVQgTkFNRVMgdXRmODsKIEVYUExBSU4gRVhURU5ERUQgU0VM
RUNUICdhYmNkw4HDgsODw4TDhScsIF9sYXRpbjEnYWJjZMOBw4LDg8OEw4UnLCBfdXRmOCdhYmNk
w4HDgsODw4TDhSc7CiAKIC0tZWNobyAjCistLWVjaG8gIyBCdWcjMTE3NTA1MTggNDEwOTA6IE9S
REVSIEJZIFRSVU5DQVRFUyBHUk9VUF9DT05DQVQgUkVTVUxUCistLWVjaG8gIworCitTRVQgTkFN
RVMgdXRmODsKK1NFTEVDVCBpZCwgQ0hBUl9MRU5HVEgoR1JPVVBfQ09OQ0FUKGJvZHkpKSBBUyBs
CitGUk9NIChTRUxFQ1QgJ2EnIEFTIGlkLCBSRVBFQVQoJ2ZvbyBiYXInLCAxMDApIEFTIGJvZHkK
K1VOSU9OIEFMTAorU0VMRUNUICdhJyBBUyBpZCwgUkVQRUFUKCdibGEgYmxhJywgMTAwKSBBUyBi
b2R5KSB0MQorR1JPVVAgQlkgaWQKK09SREVSIEJZIGwgREVTQzsKKworLS1lY2hvICMKIC0tZWNo
byAjIEVuZCBvZiA1LjUgdGVzdHMKIC0tZWNobyAjCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL2l0
ZW0uaCcKLS0tIGEvc3FsL2l0ZW0uaAkyMDExLTA3LTAzIDIzOjQ4OjE5ICswMDAwCisrKyBiL3Nx
bC9pdGVtLmgJMjAxMS0xMC0xMiAxMzo0MToyNSArMDAwMApAQCAtNTkyLDcgKzU5Miw3IEBAIHB1
YmxpYzoKICAgdm9pZCBpbml0X21ha2VfZmllbGQoU2VuZF9maWVsZCAqdG1wX2ZpZWxkLGVudW0g
ZW51bV9maWVsZF90eXBlcyB0eXBlKTsKICAgdmlydHVhbCB2b2lkIGNsZWFudXAoKTsKICAgdmly
dHVhbCB2b2lkIG1ha2VfZmllbGQoU2VuZF9maWVsZCAqZmllbGQpOwotICBGaWVsZCAqbWFrZV9z
dHJpbmdfZmllbGQoVEFCTEUgKnRhYmxlKTsKKyAgdmlydHVhbCBGaWVsZCAqbWFrZV9zdHJpbmdf
ZmllbGQoVEFCTEUgKnRhYmxlKTsKICAgdmlydHVhbCBib29sIGZpeF9maWVsZHMoVEhEICosIEl0
ZW0gKiopOwogICAvKgogICAgIHNob3VsZCBiZSB1c2VkIGluIGNhc2Ugd2hlcmUgd2UgYXJlIHN1
cmUgdGhhdCB3ZSBkbyBub3QgbmVlZAoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9pdGVtX3N1bS5j
YycKLS0tIGEvc3FsL2l0ZW1fc3VtLmNjCTIwMTEtMDctMDcgMDk6NDI6MTQgKzAwMDAKKysrIGIv
c3FsL2l0ZW1fc3VtLmNjCTIwMTEtMTAtMTIgMTM6NDE6MjUgKzAwMDAKQEAgLTMxMjgsNiArMzEy
OCwzMSBAQCB2b2lkIEl0ZW1fZnVuY19ncm91cF9jb25jYXQ6OmNsZWFudXAoKQogfQogCiAKK0Zp
ZWxkICpJdGVtX2Z1bmNfZ3JvdXBfY29uY2F0OjptYWtlX3N0cmluZ19maWVsZChUQUJMRSAqdGFi
bGUpCit7CisgIEZpZWxkICpmaWVsZDsKKyAgREJVR19BU1NFUlQoY29sbGF0aW9uLmNvbGxhdGlv
bik7CisgIC8qCisgICAgbWF4X2NoYXJhY3RlcnMgaXMgbWF4aW11bSBudW1iZXIgb2YgY2hhcmFj
dGVycworICAgIHdoYXQgY2FuIGZpdCBpbnRvIG1heF9sZW5ndGggc2l6ZS4gSXQncyBuZWNlc3Nh
cnkKKyAgICB0byB1c2UgZmllbGQgc2l6ZSB3aGF0IGFsbG93cyB0byBzdG9yZSBncm91cF9jb25j
YXQKKyAgICByZXN1bHQgd2l0aG91dCB0cnVuY2F0aW9uLiBGb3IgdGhpcyBwdXJwb3NlIHdlIHVz
ZQorICAgIG1heF9jaGFyYWN0ZXJzICogQ1MtPm1ibWF4bGVuLgorICAqLworICBjb25zdCB1aW50
MzIgbWF4X2NoYXJhY3RlcnM9IG1heF9sZW5ndGggLyBjb2xsYXRpb24uY29sbGF0aW9uLT5tYm1p
bmxlbjsKKyAgaWYgKG1heF9jaGFyYWN0ZXJzID4gQ09OVkVSVF9JRl9CSUdHRVJfVE9fQkxPQikK
KyAgICBmaWVsZD0gbmV3IEZpZWxkX2Jsb2IobWF4X2NoYXJhY3RlcnMgKiBjb2xsYXRpb24uY29s
bGF0aW9uLT5tYm1heGxlbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgbWF5YmVfbnVsbCwg
bmFtZSwgY29sbGF0aW9uLmNvbGxhdGlvbiwgVFJVRSk7CisgIGVsc2UKKyAgICBmaWVsZD0gbmV3
IEZpZWxkX3ZhcnN0cmluZyhtYXhfY2hhcmFjdGVycyAqIGNvbGxhdGlvbi5jb2xsYXRpb24tPm1i
bWF4bGVuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heWJlX251bGwsIG5hbWUs
IHRhYmxlLT5zLCBjb2xsYXRpb24uY29sbGF0aW9uKTsKKworICBpZiAoZmllbGQpCisgICAgZmll
bGQtPmluaXQodGFibGUpOworICByZXR1cm4gZmllbGQ7Cit9CisKKwogSXRlbSAqSXRlbV9mdW5j
X2dyb3VwX2NvbmNhdDo6Y29weV9vcl9zYW1lKFRIRCogdGhkKQogewogICByZXR1cm4gbmV3ICh0
aGQtPm1lbV9yb290KSBJdGVtX2Z1bmNfZ3JvdXBfY29uY2F0KHRoZCwgdGhpcyk7Cgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3FsL2l0ZW1fc3VtLmgnCi0tLSBhL3NxbC9pdGVtX3N1bS5oCTIwMTEtMDYt
MzAgMTU6NDY6NTMgKzAwMDAKKysrIGIvc3FsL2l0ZW1fc3VtLmgJMjAxMS0xMC0xMiAxMzo0MToy
NSArMDAwMApAQCAtMTQxMSw2ICsxNDExLDcgQEAgcHVibGljOgogICBlbnVtIFN1bWZ1bmN0eXBl
IHN1bV9mdW5jICgpIGNvbnN0IHtyZXR1cm4gR1JPVVBfQ09OQ0FUX0ZVTkM7fQogICBjb25zdCBj
aGFyICpmdW5jX25hbWUoKSBjb25zdCB7IHJldHVybiAiZ3JvdXBfY29uY2F0IjsgfQogICB2aXJ0
dWFsIEl0ZW1fcmVzdWx0IHJlc3VsdF90eXBlICgpIGNvbnN0IHsgcmV0dXJuIFNUUklOR19SRVNV
TFQ7IH0KKyAgdmlydHVhbCBGaWVsZCAqbWFrZV9zdHJpbmdfZmllbGQoVEFCTEUgKnRhYmxlKTsK
ICAgZW51bV9maWVsZF90eXBlcyBmaWVsZF90eXBlKCkgY29uc3QKICAgewogICAgIGlmIChtYXhf
bGVuZ3RoL2NvbGxhdGlvbi5jb2xsYXRpb24tPm1ibWF4bGVuID4gQ09OVkVSVF9JRl9CSUdHRVJf
VE9fQkxPQiApCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==