From: Alexander Barkov
Date: March 4 2011 3:43pm
Subject: bzr commit into mysql-5.5 branch (alexander.barkov:3373) Bug#57341
 Bug#11764503
List-Archive: http://lists.mysql.com/commits/132486
X-Bug: 57341,11764503
Message-Id: <201103041543.p24Fhwca004511@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8286486853829182655=="

--===============8286486853829182655==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9iYXIvbXlzcWwtYnpyL215c3FsLTUuNS5iNTczNDEvIGJhc2VkIG9u
IHJldmlkOm5pcmJoYXkuY2hvdWJleUBzdW4uY29tLTIwMTEwMzA0MTUzMzM5LTJhcGxxNW1ic2xk
Zjl0dDQKCiAzMzczIEFsZXhhbmRlciBCYXJrb3YJMjAxMS0wMy0wNAogICAgICAgQnVnIzExNzY0
NTAzIChCdWcjNTczNDEpIFF1ZXJ5IGluIEVYUExBSU4gRVhURU5ERUQgc2hvd3Mgd3JvbmcgY2hh
cmFjdGVycwogICAgICAKICAgICAgICBAIG15c3FsLXRlc3Qvci9jdHlwZV9sYXRpbjEucmVzdWx0
CiAgICAgICAgQCBteXNxbC10ZXN0L3IvY3R5cGVfdXRmOC5yZXN1bHQKICAgICAgICBAIG15c3Fs
LXRlc3QvdC9jdHlwZV9sYXRpbjEudGVzdAogICAgICAgIEAgbXlzcWwtdGVzdC90L2N0eXBlX3V0
ZjgudGVzdAogICAgICAgIEFkZGluZyB0ZXN0cwogICAgICAKICAgICAgICBAIHNxbC9teXNxbGQu
aAogICAgICAgIEAgc3FsL2l0ZW0uY2MKICAgICAgICBAIHNxbC9zcWxfcGFyc2UuY2MKICAgICAg
ICBAIHNxbC9zcWxfdmlldy5jYwogICAgICAKICAgICAgICBSZWZhY3RvcmluZyAodGhhbmtzIHRv
IEd1aWxoZW0gZm9yIHRoZSBpZGVhKToKICAgICAgCiAgICAgICAgSXRlbV9zdHJpbmc6OnByaW50
KCkgd2FzIGhhcmQgdG8gdW5kZXJzdGFuZCBiZWNhdXNlIG9mIHRoZSBkaWZmZXJlbnQKICAgICAg
ICBRVF8gY29uc3RhbnRzOiBpbiAicXVlcnlfdHlwZT09UVRfeCIsIFFUX3ggaXMgZXhwbGljaXRl
bHkgaW5jbHVkZWQKICAgICAgICBidXQgdGhlIG90aGVyIHR3byBRVF8gYXJlIGltcGxpY2l0ZWx5
IGV4Y2x1ZGVkLiBUaGUgY29tYmluYXRpb25zCiAgICAgICAgd2l0aCAnfHwnIGFuZCAnJiYnIG1h
a2UgdGhpcyBldmVuIGhhcmRlci4KICAgICAgICAtIGxvZ2ljIGlzIG5vdyBtb3JlICJleHBsaWNp
dCIgYnkgY2hhbmdpbmcgUVRfIGNvbnN0YW50cyB0byBhIGJpdG1hcCBvZiBmbGFnczoKICAgICAg
ICAgIFFUX09SRElOQVJZOiBubyBjaGFuZ2UsCiAgICAgICAgICBRVF9JUyAtPiBRVF9UT19TWVNU
RU1fQ0hBUlNFVCB8IFFUX1dJVEhPVVRfSU5UUk9EVUNFUlMsCiAgICAgICAgICBRVF9FWFBMQUlO
IC0+IFFUX1RPX1NZU1RFTV9DSEFSU0VUCiAgICAgICAgICAoUVRfRVhQTEFJTiB3YXMgaW50cm9k
dWNlZCBpbiB0aGUgZmlyc3QgdmVyc2lvbiBvZiB0aGUgQnVnIzU3MzQxIHBhdGNoKQogICAgICAg
IC0gSXRlbV9zdHJpbmc6OnByaW50KCkgaXMgcmV3cml0dGVuIHVzaW5nIHRob3NlIGZsYWdzCiAg
ICAgIAogICAgICAgIEJ1Z2ZpeCBpdHNlbGY6CiAgICAgIAogICAgICAgIFdoZW4gUVRfVE9fU1lT
VEVNX0NIQVJTRVQgaXMgdXNlZCBhbG9uZSAod2l0aCBubyBRVF9XSVRIT1VUX0lOVFJPRFVDRVJT
KSwKICAgICAgICB3ZSBwcmludCBzdHJpbmcgbGl0ZXJhbHMgYXMgZm9sbG93czoKICAgICAgCiAg
ICAgICAgLSBkaXNwbGF5IGludHJvZHVjZXJzIGlmIHRoZXkgd2VyZSBpbiB0aGUgb3JpZ2luYWwg
cXVlcnkKICAgICAgICAtIHByaW50IEFTQ0lJIGNoYXJhY3RlcnMgYXMgaXMKICAgICAgICAtIHBy
aW50IG5vbi1BU0NJSSBjaGFyYWN0ZXJzIHVzaW5nIGhleC1lc2NhcGUKICAgICAgICBOb3RlOiBh
cyAiRVhQTEFJTiIgb3V0cHV0IGlzIG9ubHkgZm9yIGh1bWFuIHJlYWRhYmlsaXR5IHB1cnBvc2Vz
CiAgICAgICAgYW5kIGRvZXMgbm90IG5lZWQgdG8gYmUgYSBwYXNyYWJsZSBTUUwsIHNvIHVzaW5n
IGhleC1lc2NhcGUgaXMgT2suCiAgICAgICAgRXJyQ29udlN0cmluZyBjbGFzcyBwZXJmZWN0bHkg
c3VpdGVzIGZvciBoZXggZXNjYXBpbmcgcHVycG9zZXMuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15
c3FsLXRlc3Qvci9jdHlwZV9sYXRpbjEucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9jdHlwZV91
dGY4LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvY3R5cGVfbGF0aW4xLnRlc3QKICAgICAgbXlz
cWwtdGVzdC90L2N0eXBlX3V0ZjgudGVzdAogICAgICBzcWwvaXRlbS5jYwogICAgICBzcWwvbXlz
cWxkLmgKICAgICAgc3FsL3NxbF9wYXJzZS5jYwogICAgICBzcWwvc3FsX3ZpZXcuY2MKPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9jdHlwZV9sYXRpbjEucmVzdWx0JwotLS0gYS9teXNx
bC10ZXN0L3IvY3R5cGVfbGF0aW4xLnJlc3VsdAkyMDExLTAyLTEwIDA4OjE4OjA4ICswMDAwCisr
KyBiL215c3FsLXRlc3Qvci9jdHlwZV9sYXRpbjEucmVzdWx0CTIwMTEtMDMtMDQgMTU6NDM6Mjgg
KzAwMDAKQEAgLTMyNDYsNSArMzI0NiwyMCBAQCBtYWtldGltZShgYWAsYGFgLGBhYCkKIERST1Ag
VEFCTEUgdDE7CiBTRVQgc3FsX21vZGU9ZGVmYXVsdDsKICMKKyMgQnVnIzExNzY0NTAzIChCdWcj
NTczNDEpIFF1ZXJ5IGluIEVYUExBSU4gRVhURU5ERUQgc2hvd3Mgd3JvbmcgY2hhcmFjdGVycwor
IworU0VUIE5BTUVTIHV0Zjg7CitFWFBMQUlOIEVYVEVOREVEIFNFTEVDVCAnYWJjZMOzJywgX2xh
dGluMSdhYmNkw7MnLCBfdXRmOCdhYmNkw7MnOworaWQJc2VsZWN0X3R5cGUJdGFibGUJdHlwZQlw
b3NzaWJsZV9rZXlzCWtleQlrZXlfbGVuCXJlZglyb3dzCWZpbHRlcmVkCUV4dHJhCisxCVNJTVBM
RQlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTm8gdGFibGVzIHVzZWQK
K1dhcm5pbmdzOgorTm90ZQkxMDAzCXNlbGVjdCAnYWJjZMOzJyBBUyBgYWJjZMOzYCxfbGF0aW4x
J2FiY2RceEMzXHhCMycgQVMgYGFiY2TDg8KzYCxfdXRmOCdhYmNkXHhDM1x4QjMnIEFTIGBhYmNk
w7NgCitTRVQgTkFNRVMgbGF0aW4xOworRVhQTEFJTiBFWFRFTkRFRCBTRUxFQ1QgJ2FiY2TDsycs
IF9sYXRpbjEnYWJjZMOzJywgX3V0ZjgnYWJjZMOzJzsKK2lkCXNlbGVjdF90eXBlCXRhYmxlCXR5
cGUJcG9zc2libGVfa2V5cwlrZXkJa2V5X2xlbglyZWYJcm93cwlmaWx0ZXJlZAlFeHRyYQorMQlT
SU1QTEUJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5vIHRhYmxlcyB1
c2VkCitXYXJuaW5nczoKK05vdGUJMTAwMwlzZWxlY3QgJ2FiY2TDsycgQVMgYGFiY2TDs2AsX2xh
dGluMSdhYmNkXHhDM1x4QjMnIEFTIGBhYmNkw7NgLF91dGY4J2FiY2RceEMzXHhCMycgQVMgYGFi
Y2Tvv71gCisjCiAjIEVuZCBvZiA1LjUgdGVzdHMKICMKCj09PSBtb2RpZmllZCBmaWxlICdteXNx
bC10ZXN0L3IvY3R5cGVfdXRmOC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9jdHlwZV91dGY4
LnJlc3VsdAkyMDExLTAyLTEwIDA4OjE4OjA4ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9jdHlw
ZV91dGY4LnJlc3VsdAkyMDExLTAzLTA0IDE1OjQzOjI4ICswMDAwCkBAIC00OTY5LDUgKzQ5Njks
MjAgQEAgR1JPVVAgQlkgSU5TRVJUKCcnLCB0Mi5hLCB0MS5hLCAoQEBnbG9iYQogRVJST1IgMjMw
MDA6IER1cGxpY2F0ZSBlbnRyeSAnMTA3Mzc0MTgyNDEwNzM3NDE4MjQxJyBmb3Iga2V5ICdncm91
cF9rZXknCiBEUk9QIFRBQkxFIHQxOwogIworIyBCdWcjMTE3NjQ1MDMgKEJ1ZyM1NzM0MSkgUXVl
cnkgaW4gRVhQTEFJTiBFWFRFTkRFRCBzaG93cyB3cm9uZyBjaGFyYWN0ZXJzCisjCitTRVQgTkFN
RVMgbGF0aW4xOworRVhQTEFJTiBFWFRFTkRFRCBTRUxFQ1QgJ2FiY2TDgcOCw4PDhMOFJywgX2xh
dGluMSdhYmNkw4HDgsODw4TDhScsIF91dGY4J2FiY2TDgcOCw4PDhMOFJyBBUyB1OworaWQJc2Vs
ZWN0X3R5cGUJdGFibGUJdHlwZQlwb3NzaWJsZV9rZXlzCWtleQlrZXlfbGVuCXJlZglyb3dzCWZp
bHRlcmVkCUV4dHJhCisxCVNJTVBMRQlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxM
CU5VTEwJTm8gdGFibGVzIHVzZWQKK1dhcm5pbmdzOgorTm90ZQkxMDAzCXNlbGVjdCAnYWJjZMOB
w4LDg8OEw4UnIEFTIGBhYmNkw4HDgsODw4TDhWAsX2xhdGluMSdhYmNkXHhDM1x4ODFceEMzXHg4
Mlx4QzNceDgzXHhDM1x4ODRceEMzXHg4NScgQVMgYGFiY2TDgcOCw4PDhMOFYCxfdXRmOCdhYmNk
XHhDM1x4ODFceEMzXHg4Mlx4QzNceDgzXHhDM1x4ODRceEMzXHg4NScgQVMgYHVgCitTRVQgTkFN
RVMgdXRmODsKK0VYUExBSU4gRVhURU5ERUQgU0VMRUNUICdhYmNkw4HDgsODw4TDhScsIF9sYXRp
bjEnYWJjZMOBw4LDg8OEw4UnLCBfdXRmOCdhYmNkw4HDgsODw4TDhSc7CitpZAlzZWxlY3RfdHlw
ZQl0YWJsZQl0eXBlCXBvc3NpYmxlX2tleXMJa2V5CWtleV9sZW4JcmVmCXJvd3MJZmlsdGVyZWQJ
RXh0cmEKKzEJU0lNUExFCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlO
byB0YWJsZXMgdXNlZAorV2FybmluZ3M6CitOb3RlCTEwMDMJc2VsZWN0ICdhYmNkw4HDgsODw4TD
hScgQVMgYGFiY2TDgcOCw4PDhMOFYCxfbGF0aW4xJ2FiY2RceEMzXHg4MVx4QzNceDgyXHhDM1x4
ODNceEMzXHg4NFx4QzNceDg1JyBBUyBgYWJjZMODwoHDg+KAmsODxpLDg+KAnsOD4oCmYCxfdXRm
OCdhYmNkXHhDM1x4ODFceEMzXHg4Mlx4QzNceDgzXHhDM1x4ODRceEMzXHg4NScgQVMgYGFiY2TD
gcOCw4PDhMOFYAorIwogIyBFbmQgb2YgNS41IHRlc3RzCiAjCgo9PT0gbW9kaWZpZWQgZmlsZSAn
bXlzcWwtdGVzdC90L2N0eXBlX2xhdGluMS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVf
bGF0aW4xLnRlc3QJMjAxMC0xMS0xOCAwOToxNDoyNyArMDAwMAorKysgYi9teXNxbC10ZXN0L3Qv
Y3R5cGVfbGF0aW4xLnRlc3QJMjAxMS0wMy0wNCAxNTo0MzoyOCArMDAwMApAQCAtMTQ0LDUgKzE0
NCwyMCBAQCBTRUxFQ1QgJycgTElLRSAnJyBFU0NBUEUgRVhQT1JUX1NFVCgxLCAxCiAtLXNvdXJj
ZSBpbmNsdWRlL2N0eXBlX251bWNvbnYuaW5jCiAKIC0tZWNobyAjCistLWVjaG8gIyBCdWcjMTE3
NjQ1MDMgKEJ1ZyM1NzM0MSkgUXVlcnkgaW4gRVhQTEFJTiBFWFRFTkRFRCBzaG93cyB3cm9uZyBj
aGFyYWN0ZXJzCistLWVjaG8gIworIyBUZXN0IGxhdGluMSBjbGllbnQgZXJyb25lb3VzbHkgc3Rh
cnRlZCB3aXRoIC0tZGVmYXVsdC1jaGFyYWN0ZXItc2V0PXV0ZjgKKyMgRVhQTEFJTiBvdXRwdXQg
c2hvdWxkIHN0aWxsIGJlIHByZXR0eSByZWFkYWJsZS4KKyMgV2UncmUgdXNpbmcgJ8OzJyAoXHhD
M1x4QjMpIGFzIGEgbWFnaWMgc2VxdWVuY2U6CisjIC0gaXQncyAiTEFUSU4gQ0FQSVRBTCBMRVRU
RVIgQSBXSVRIIFRJTERFIEFCT1ZFICsgU1VQRVJTQ1JJUFQgMyIgaW4gbGF0aW4xCisjIC0gaXQn
cyAiTEFUSU4gU01BTEwgTEVUVEVSIE8gV0lUSCBBQ1VURSBBQk9WRSIgaW4gdXRmOC4KK1NFVCBO
QU1FUyB1dGY4OworRVhQTEFJTiBFWFRFTkRFRCBTRUxFQ1QgJ2FiY2TDsycsIF9sYXRpbjEnYWJj
ZMOzJywgX3V0ZjgnYWJjZMOzJzsKKyMgVGVzdCBub3JtYWwgbGF0aW4xCitTRVQgTkFNRVMgbGF0
aW4xOworRVhQTEFJTiBFWFRFTkRFRCBTRUxFQ1QgJ2FiY2TDsycsIF9sYXRpbjEnYWJjZMOzJywg
X3V0ZjgnYWJjZMOzJzsKKworCistLWVjaG8gIwogLS1lY2hvICMgRW5kIG9mIDUuNSB0ZXN0cwog
LS1lY2hvICMKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVfdXRmOC50ZXN0
JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVfdXRmOC50ZXN0CTIwMTAtMTItMTcgMTE6MTE6MzQg
KzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBlX3V0ZjgudGVzdAkyMDExLTAzLTA0IDE1OjQz
OjI4ICswMDAwCkBAIC0xNTUwLDYgKzE1NTAsMTYgQEAgU0VMRUNUIENPVU5UKCopIEZST00gdDEs
IHQxIHQyIAogR1JPVVAgQlkgSU5TRVJUKCcnLCB0Mi5hLCB0MS5hLCAoQEBnbG9iYWwubWF4X2Jp
bmxvZ19zaXplKSk7CiBEUk9QIFRBQkxFIHQxOwogCistLWVjaG8gIworLS1lY2hvICMgQnVnIzEx
NzY0NTAzIChCdWcjNTczNDEpIFF1ZXJ5IGluIEVYUExBSU4gRVhURU5ERUQgc2hvd3Mgd3Jvbmcg
Y2hhcmFjdGVycworLS1lY2hvICMKKyMgRW11bGF0ZSB1dGY4IGNsaWVudCBlcnJvbmVvdXNseSBz
dGFydGVkIHdpdGggLS1kZWZhdWx0LWNoYXJhY3Rlci1zZXQ9bGF0aW4xLAorIyBhcyBpbiB0aGUg
YnVnIHJlcG9ydC4gRVhQTEFJTiBvdXRwdXQgc2hvdWxkIHN0aWxsIGJlIHByZXR0eSByZWFkYWJs
ZQorU0VUIE5BTUVTIGxhdGluMTsKK0VYUExBSU4gRVhURU5ERUQgU0VMRUNUICdhYmNkw4HDgsOD
w4TDhScsIF9sYXRpbjEnYWJjZMOBw4LDg8OEw4UnLCBfdXRmOCdhYmNkw4HDgsODw4TDhScgQVMg
dTsKKyMgVGVzdCBub3JtYWwgdXRmOAorU0VUIE5BTUVTIHV0Zjg7CitFWFBMQUlOIEVYVEVOREVE
IFNFTEVDVCAnYWJjZMOBw4LDg8OEw4UnLCBfbGF0aW4xJ2FiY2TDgcOCw4PDhMOFJywgX3V0Zjgn
YWJjZMOBw4LDg8OEw4UnOwogCiAtLWVjaG8gIwogLS1lY2hvICMgRW5kIG9mIDUuNSB0ZXN0cwoK
PT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9pdGVtLmNjJwotLS0gYS9zcWwvaXRlbS5jYwkyMDExLTAz
LTAxIDE0OjQyOjM3ICswMDAwCisrKyBiL3NxbC9pdGVtLmNjCTIwMTEtMDMtMDQgMTU6NDM6Mjgg
KzAwMDAKQEAgLTI1MTQsNyArMjUxNCw5IEBAIG15X2RlY2ltYWwgKkl0ZW1fZmxvYXQ6OnZhbF9k
ZWNpbWFsKG15X2QKIAogdm9pZCBJdGVtX3N0cmluZzo6cHJpbnQoU3RyaW5nICpzdHIsIGVudW1f
cXVlcnlfdHlwZSBxdWVyeV90eXBlKQogewotICBpZiAocXVlcnlfdHlwZSA9PSBRVF9PUkRJTkFS
WSAmJiBpc19jc19zcGVjaWZpZWQoKSkKKyAgY29uc3QgYm9vbCBwcmludF9pbnRyb2R1Y2VyPQor
ICAgICEocXVlcnlfdHlwZSAmIFFUX1dJVEhPVVRfSU5UUk9EVUNFUlMpICYmIGlzX2NzX3NwZWNp
ZmllZCgpOworICBpZiAocHJpbnRfaW50cm9kdWNlcikKICAgewogICAgIHN0ci0+YXBwZW5kKCdf
Jyk7CiAgICAgc3RyLT5hcHBlbmQoY29sbGF0aW9uLmNvbGxhdGlvbi0+Y3NuYW1lKTsKQEAgLTI1
MjIsMjcgKzI1MjQsNTIgQEAgdm9pZCBJdGVtX3N0cmluZzo6cHJpbnQoU3RyaW5nICpzdHIsIGVu
dQogCiAgIHN0ci0+YXBwZW5kKCdcJycpOwogCi0gIGlmIChxdWVyeV90eXBlID09IFFUX09SRElO
QVJZIHx8Ci0gICAgICBteV9jaGFyc2V0X3NhbWUoc3RyX3ZhbHVlLmNoYXJzZXQoKSwgc3lzdGVt
X2NoYXJzZXRfaW5mbykpCisgIGlmIChxdWVyeV90eXBlICYgUVRfVE9fU1lTVEVNX0NIQVJTRVQp
CiAgIHsKLSAgICBzdHJfdmFsdWUucHJpbnQoc3RyKTsKKyAgICBpZiAocHJpbnRfaW50cm9kdWNl
cikKKyAgICB7CisgICAgICAvKgorICAgICAgICBCZWNhdXNlIHdlIHdyb3RlIGFuIGludHJvZHVj
ZXIsIHdlIG11c3QgcHJpbnQgc3RyX3ZhbHVlIGluIGl0cworICAgICAgICBjaGFyc2V0LCBhbmQg
dGhlIHJlc3VsdGluZyBieXRlcyBtdXN0IG5vdCBiZSBjaGFuZ2VkIHVudGlsIHRoZXkKKyAgICAg
ICAgcmVhY2ggdGhlIGVuZCBjbGllbnQuCisgICAgICAgIEJ1dCB0aGUgY2FsbGVyIGlzIGFza2lu
ZyBmb3Igc3lzdGVtX2NoYXJzZXRfaW5mbywgYW5kIG1heSBsYXRlcgorICAgICAgICBjb252ZXJ0
IGludG8gY2hhcmFjdGVyX3NldF9yZXN1bHRzLiBUaGF0IG1lYW5zIHR3byBjb252ZXJzaW9uczog
d2UKKyAgICAgICAgbXVzdCBlbnN1cmUgdGhhdCB0aGV5IGRvbid0IGNoYW5nZSBvdXIgcHJpbnRl
ZCBieXRlcy4KKyAgICAgICAgU28gd2UgcHJpbnQgc3RyX3ZhbHVlIGluIHRoZSBsZWFzdCBjb21t
b24gZGVub21pbmF0b3Igb2YgdGhlIHRocmVlCisgICAgICAgIGNoYXJzZXRzIGludm9sdmVkOiBB
U0NJSS4gTm9uLUFTQ0lJIGNoYXJhY3RlcnMgYXJlIHByaW50ZWQgYXMgXHhGRgorICAgICAgICBz
ZXF1ZW5jZXMgKHdoaWNoIGlzIEFTQ0lJIHRvbykuIFRoaXMgd2F5LCBvdXIgYnl0ZXMgd2lsbCBu
b3QgYmUKKyAgICAgICAgY2hhbmdlZC4KKyAgICAgICovCisgICAgICBFcnJDb252U3RyaW5nIHRt
cChzdHJfdmFsdWUucHRyKCksIHN0cl92YWx1ZS5sZW5ndGgoKSwgJm15X2NoYXJzZXRfYmluKTsK
KyAgICAgIHN0ci0+YXBwZW5kKHRtcC5wdHIoKSk7CisgICAgfQorICAgIGVsc2UKKyAgICB7Cisg
ICAgICBpZiAobXlfY2hhcnNldF9zYW1lKHN0cl92YWx1ZS5jaGFyc2V0KCksIHN5c3RlbV9jaGFy
c2V0X2luZm8pKQorICAgICAgICBzdHJfdmFsdWUucHJpbnQoc3RyKTsgLy8gYWxyZWFkeSBpbiBz
eXN0ZW1fY2hhcnNldF9pbmZvCisgICAgICBlbHNlIC8vIG5lZWQgdG8gY29udmVydAorICAgICAg
eworICAgICAgICBUSEQgKnRoZD0gY3VycmVudF90aGQ7CisgICAgICAgIExFWF9TVFJJTkcgdXRm
OF9sZXhfc3RyOworCisgICAgICAgIHRoZC0+Y29udmVydF9zdHJpbmcoJnV0ZjhfbGV4X3N0ciwK
KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeXN0ZW1fY2hhcnNldF9pbmZvLAorICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIHN0cl92YWx1ZS5jX3B0cl9zYWZlKCksCisgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgc3RyX3ZhbHVlLmxlbmd0aCgpLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIHN0cl92YWx1ZS5jaGFyc2V0KCkpOworCisgICAgICAgIFN0cmluZyB1dGY4X3N0
cih1dGY4X2xleF9zdHIuc3RyLAorICAgICAgICAgICAgICAgICAgICAgICAgdXRmOF9sZXhfc3Ry
Lmxlbmd0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbV9jaGFyc2V0X2luZm8pOwor
CisgICAgICAgIHV0Zjhfc3RyLnByaW50KHN0cik7CisgICAgICB9CisgICAgfQogICB9CiAgIGVs
c2UKICAgewotICAgIFRIRCAqdGhkPSBjdXJyZW50X3RoZDsKLSAgICBMRVhfU1RSSU5HIHV0Zjhf
bGV4X3N0cjsKLQotICAgIHRoZC0+Y29udmVydF9zdHJpbmcoJnV0ZjhfbGV4X3N0ciwKLSAgICAg
ICAgICAgICAgICAgICAgICAgIHN5c3RlbV9jaGFyc2V0X2luZm8sCi0gICAgICAgICAgICAgICAg
ICAgICAgICBzdHJfdmFsdWUuY19wdHJfc2FmZSgpLAotICAgICAgICAgICAgICAgICAgICAgICAg
c3RyX3ZhbHVlLmxlbmd0aCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgc3RyX3ZhbHVlLmNo
YXJzZXQoKSk7Ci0KLSAgICBTdHJpbmcgdXRmOF9zdHIodXRmOF9sZXhfc3RyLnN0ciwKLSAgICAg
ICAgICAgICAgICAgICAgdXRmOF9sZXhfc3RyLmxlbmd0aCwKLSAgICAgICAgICAgICAgICAgICAg
c3lzdGVtX2NoYXJzZXRfaW5mbyk7Ci0KLSAgICB1dGY4X3N0ci5wcmludChzdHIpOworICAgIC8v
IENhbGxlciB3YW50cyBhIHJlc3VsdCBpbiB0aGUgY2hhcnNldCBvZiBzdHJfdmFsdWUuCisgICAg
c3RyX3ZhbHVlLnByaW50KHN0cik7CiAgIH0KIAogICBzdHItPmFwcGVuZCgnXCcnKTsKCj09PSBt
b2RpZmllZCBmaWxlICdzcWwvbXlzcWxkLmgnCi0tLSBhL3NxbC9teXNxbGQuaAkyMDExLTAxLTE0
IDEzOjIxOjQ2ICswMDAwCisrKyBiL3NxbC9teXNxbGQuaAkyMDExLTAzLTA0IDE1OjQzOjI4ICsw
MDAwCkBAIC0zOTksMTYgKzM5OSwxNiBAQCBlbnVtIG9wdGlvbnNfbXlzcWxkCiAKIAogLyoqCi0g
IFF1ZXJ5IHR5cGUgY29uc3RhbnRzLgotCi0gIFFUX09SRElOQVJZIC0tIG9yZGluYXJ5IFNRTCBx
dWVyeS4KLSAgUVRfSVMgLS0gU1FMIHF1ZXJ5IHRvIGJlIHNob3duIGluIElORk9STUFUSU9OX1ND
SEVNQSAoaW4gdXRmOCBhbmQgd2l0aG91dAotICBjaGFyYWN0ZXIgc2V0IGludHJvZHVjZXJzKS4K
KyAgIFF1ZXJ5IHR5cGUgY29uc3RhbnRzICh1c2FibGUgYXMgYml0bWFwIGZsYWdzKS4KICovCiBl
bnVtIGVudW1fcXVlcnlfdHlwZQogewotICBRVF9PUkRJTkFSWSwKLSAgUVRfSVMKKyAgLy8vIE5v
dGhpbmcgc3BlY2lmaWMsIG9yZGluYXJ5IFNRTCBxdWVyeS4KKyAgUVRfT1JESU5BUlk9IDAsCisg
IC8vLyBJbiB1dGY4LgorICBRVF9UT19TWVNURU1fQ0hBUlNFVD0gKDEgPDwgMCksCisgIC8vLyBX
aXRob3V0IGNoYXJhY3RlciBzZXQgaW50cm9kdWNlcnMuCisgIFFUX1dJVEhPVVRfSU5UUk9EVUNF
UlM9ICgxIDw8IDEpCiB9OwogCiAvKiBxdWVyeV9pZCAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3Nx
bC9zcWxfcGFyc2UuY2MnCi0tLSBhL3NxbC9zcWxfcGFyc2UuY2MJMjAxMS0wMy0wMyAwODozMDo0
MSArMDAwMAorKysgYi9zcWwvc3FsX3BhcnNlLmNjCTIwMTEtMDMtMDQgMTU6NDM6MjggKzAwMDAK
QEAgLTQ0MzksNyArNDQzOSwxMSBAQCBzdGF0aWMgYm9vbCBleGVjdXRlX3NxbGNvbV9zZWxlY3Qo
VEhEICp0CiAgICAgICAgIGNoYXIgYnVmZlsxMDI0XTsKICAgICAgICAgU3RyaW5nIHN0cihidWZm
LCh1aW50MzIpIHNpemVvZihidWZmKSwgc3lzdGVtX2NoYXJzZXRfaW5mbyk7CiAgICAgICAgIHN0
ci5sZW5ndGgoMCk7Ci0gICAgICAgIHRoZC0+bGV4LT51bml0LnByaW50KCZzdHIsIFFUX09SRElO
QVJZKTsKKyAgICAgICAgLyoKKyAgICAgICAgICBUaGUgd2FybmluZ3Mgc3lzdGVtIHJlcXVpcmVz
IGlucHV0IGluIHV0ZjgsIEBzZWUKKyAgICAgICAgICBteXNxbGRfc2hvd193YXJuaW5ncygpLgor
ICAgICAgICAqLworICAgICAgICB0aGQtPmxleC0+dW5pdC5wcmludCgmc3RyLCBRVF9UT19TWVNU
RU1fQ0hBUlNFVCk7CiAgICAgICAgIHN0ci5hcHBlbmQoJ1wwJyk7CiAgICAgICAgIHB1c2hfd2Fy
bmluZyh0aGQsIE1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX05PVEUsCiAgICAgICAgICAgICAgICAg
ICAgICBFUl9ZRVMsIHN0ci5wdHIoKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NxbF92aWV3
LmNjJwotLS0gYS9zcWwvc3FsX3ZpZXcuY2MJMjAxMS0wMy0wMSAxNDo0MjozNyArMDAwMAorKysg
Yi9zcWwvc3FsX3ZpZXcuY2MJMjAxMS0wMy0wNCAxNTo0MzoyOCArMDAwMApAQCAtODQxLDcgKzg0
MSw4IEBAIHN0YXRpYyBpbnQgbXlzcWxfcmVnaXN0ZXJfdmlldyhUSEQgKnRoZCwKICAgICB0aGQt
PnZhcmlhYmxlcy5zcWxfbW9kZSY9IH5NT0RFX0FOU0lfUVVPVEVTOwogCiAgICAgbGV4LT51bml0
LnByaW50KCZ2aWV3X3F1ZXJ5LCBRVF9PUkRJTkFSWSk7Ci0gICAgbGV4LT51bml0LnByaW50KCZp
c19xdWVyeSwgUVRfSVMpOworICAgIGxleC0+dW5pdC5wcmludCgmaXNfcXVlcnksCisgICAgICAg
ICAgICAgICAgICAgIGVudW1fcXVlcnlfdHlwZShRVF9UT19TWVNURU1fQ0hBUlNFVCB8IFFUX1dJ
VEhPVVRfSU5UUk9EVUNFUlMpKTsKIAogICAgIHRoZC0+dmFyaWFibGVzLnNxbF9tb2RlfD0gc3Fs
X21vZGU7CiAgIH0KCg==

--===============8286486853829182655==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/alexander.barkov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.barkov@stripped\
#   95d3bhwhda84fyjc
# target_branch: file:///home/bar/mysql-bzr/mysql-5.5.b57341/
# testament_sha1: a8aaa4a5ab8c6a23da3fb1349771433fd60f73f2
# timestamp: 2011-03-04 18:43:58 +0300
# base_revision_id: nirbhay.choubey@stripped\
#   2aplq5mbsldf9tt4
# 
# Begin bundle
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


--===============8286486853829182655==--