From: Alexander Barkov
Date: March 1 2011 10:24am
Subject: bzr commit into mysql-5.5 branch (alexander.barkov:3357) Bug#57341
 Bug#11764503
List-Archive: http://lists.mysql.com/commits/132174
X-Bug: 57341,11764503
Message-Id: <201103011024.p21AOPWE003618@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7551246445002190283=="

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

I0F0IGZpbGU6Ly8vaG9tZS9iYXIvbXlzcWwtYnpyL215c3FsLTUuNS5iNTczNDEvIGJhc2VkIG9u
IHJldmlkOnRvci5kaWRyaWtzZW5Ab3JhY2xlLmNvbS0yMDExMDIyNDA3MDAxMi1xbWhjYnM3b3l6
ZGdpeXl5CgogMzM1NyBBbGV4YW5kZXIgQmFya292CTIwMTEtMDMtMDEKICAgICAgQnVnIzExNzY0
NTAzIChCdWcjNTczNDEpIFF1ZXJ5IGluIEVYUExBSU4gRVhURU5ERUQgc2hvd3Mgd3JvbmcgY2hh
cmFjdGVycwogICAgICAKICAgICAgICBAIG15c3FsLXRlc3Qvci9jdHlwZV9sYXRpbjEucmVzdWx0
CiAgICAgICAgQCBteXNxbC10ZXN0L3IvY3R5cGVfdXRmOC5yZXN1bHQKICAgICAgICBAIG15c3Fs
LXRlc3QvdC9jdHlwZV9sYXRpbjEudGVzdAogICAgICAgIEAgbXlzcWwtdGVzdC90L2N0eXBlX3V0
ZjgudGVzdAogICAgICAgIEFkZGluZyB0ZXN0cwogICAgICAKICAgICAgICBAIHNxbC9teXNxbGQu
aAogICAgICAgIEFkZGluZyBhIG5ldyBJdGVtOjpwcmludCgpIG1vZGUgLSBRVF9FWFBMQUlOLCB3
aGljaAogICAgICAgIC0gZGlzcGxheXMgaW50cm9kdWNlcnMKICAgICAgICAtIHByaW50cyBBU0NJ
SSBjaGFyYWN0ZXJzIGFzIGlzCiAgICAgICAgLSBwcmludHMgbm9uLUFTQ0lJIGNoYXJhY3RlcnMg
dXNpbmcgaGV4LWVzY2FwZQogICAgICAgIE5vdGU6IGFzICJFWFBMQUlOIiBvdXRwdXQgaXMgb25s
eSBmb3IgaHVtYW4gcmVhZGFiaWxpdHkgcHVycG9zZXMKICAgICAgICBhbmQgZG9lcyBub3QgbmVl
ZCB0byBiZSBhIHBhc3JhYmxlIFNRTCwgdXNpbmcgaGV4LWVzY2FwZSBpcyBPay4KICAgICAgCiAg
ICAgICAgQCBzcWwvaXRlbS5jYwogICAgICAgIEltcGxlbWVudGluZyBRVF9FWFBMQUlOIG1vZGUg
Zm9yIEl0ZW1fc3RyaW5nOjpwcmludCgpLgogICAgICAgIE5vdGU6IEVyckNvbnZTdHJpbmcgY2xh
c3MgcGVyZmVjdGx5IHN1aXRlcyBmb3IgRVhQTEFJTiBwdXJwb3Nlcy4KICAgICAgCiAgICAgICAg
QCBzcWwvc3FsX3BhcnNlLmNjCiAgICAgICAgVXNpbmcgbmV3IFFUX0VYUExBSU4gbW9kZSBmb3Ig
IkVYUExBSU4gRVhURU5ERUQgU0VMRUNUIi4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVz
dC9yL2N0eXBlX2xhdGluMS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX3V0ZjgucmVz
dWx0CiAgICAgIG15c3FsLXRlc3QvdC9jdHlwZV9sYXRpbjEudGVzdAogICAgICBteXNxbC10ZXN0
L3QvY3R5cGVfdXRmOC50ZXN0CiAgICAgIHNxbC9pdGVtLmNjCiAgICAgIHNxbC9teXNxbGQuaAog
ICAgICBzcWwvc3FsX3BhcnNlLmNjCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvY3R5
cGVfbGF0aW4xLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL2N0eXBlX2xhdGluMS5yZXN1bHQJ
MjAxMS0wMi0xMCAwODoxODowOCArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvY3R5cGVfbGF0aW4x
LnJlc3VsdAkyMDExLTAzLTAxIDEwOjE3OjEwICswMDAwCkBAIC0zMjQ2LDUgKzMyNDYsMjAgQEAg
bWFrZXRpbWUoYGFgLGBhYCxgYWApCiBEUk9QIFRBQkxFIHQxOwogU0VUIHNxbF9tb2RlPWRlZmF1
bHQ7CiAjCisjIEJ1ZyMxMTc2NDUwMyAoQnVnIzU3MzQxKSBRdWVyeSBpbiBFWFBMQUlOIEVYVEVO
REVEIHNob3dzIHdyb25nIGNoYXJhY3RlcnMKKyMKK1NFVCBOQU1FUyB1dGY4OworRVhQTEFJTiBF
WFRFTkRFRCBTRUxFQ1QgJ2FiY2TDsycsIF9sYXRpbjEnYWJjZMOzJywgX3V0ZjgnYWJjZMOzJzsK
K2lkCXNlbGVjdF90eXBlCXRhYmxlCXR5cGUJcG9zc2libGVfa2V5cwlrZXkJa2V5X2xlbglyZWYJ
cm93cwlmaWx0ZXJlZAlFeHRyYQorMQlTSU1QTEUJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5V
TEwJTlVMTAlOVUxMCU5vIHRhYmxlcyB1c2VkCitXYXJuaW5nczoKK05vdGUJMTAwMwlzZWxlY3Qg
J2FiY2TDsycgQVMgYGFiY2TDs2AsX2xhdGluMSdhYmNkXHhDM1x4QjMnIEFTIGBhYmNkw4PCs2As
X3V0ZjgnYWJjZFx4QzNceEIzJyBBUyBgYWJjZMOzYAorU0VUIE5BTUVTIGxhdGluMTsKK0VYUExB
SU4gRVhURU5ERUQgU0VMRUNUICdhYmNkw7MnLCBfbGF0aW4xJ2FiY2TDsycsIF91dGY4J2FiY2TD
syc7CitpZAlzZWxlY3RfdHlwZQl0YWJsZQl0eXBlCXBvc3NpYmxlX2tleXMJa2V5CWtleV9sZW4J
cmVmCXJvd3MJZmlsdGVyZWQJRXh0cmEKKzEJU0lNUExFCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVM
TAlOVUxMCU5VTEwJTlVMTAlObyB0YWJsZXMgdXNlZAorV2FybmluZ3M6CitOb3RlCTEwMDMJc2Vs
ZWN0ICdhYmNkw7MnIEFTIGBhYmNkw7NgLF9sYXRpbjEnYWJjZFx4QzNceEIzJyBBUyBgYWJjZMOz
YCxfdXRmOCdhYmNkXHhDM1x4QjMnIEFTIGBhYmNk77+9YAorIwogIyBFbmQgb2YgNS41IHRlc3Rz
CiAjCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2N0eXBlX3V0ZjgucmVzdWx0Jwot
LS0gYS9teXNxbC10ZXN0L3IvY3R5cGVfdXRmOC5yZXN1bHQJMjAxMS0wMi0xMCAwODoxODowOCAr
MDAwMAorKysgYi9teXNxbC10ZXN0L3IvY3R5cGVfdXRmOC5yZXN1bHQJMjAxMS0wMy0wMSAxMDox
NzoxMCArMDAwMApAQCAtNDk2OSw1ICs0OTY5LDIwIEBAIEdST1VQIEJZIElOU0VSVCgnJywgdDIu
YSwgdDEuYSwgKEBAZ2xvYmEKIEVSUk9SIDIzMDAwOiBEdXBsaWNhdGUgZW50cnkgJzEwNzM3NDE4
MjQxMDczNzQxODI0MScgZm9yIGtleSAnZ3JvdXBfa2V5JwogRFJPUCBUQUJMRSB0MTsKICMKKyMg
QnVnIzExNzY0NTAzIChCdWcjNTczNDEpIFF1ZXJ5IGluIEVYUExBSU4gRVhURU5ERUQgc2hvd3Mg
d3JvbmcgY2hhcmFjdGVycworIworU0VUIE5BTUVTIGxhdGluMTsKK0VYUExBSU4gRVhURU5ERUQg
U0VMRUNUICdhYmNkw4HDgsODw4TDhScsIF9sYXRpbjEnYWJjZMOBw4LDg8OEw4UnLCBfdXRmOCdh
YmNkw4HDgsODw4TDhScgQVMgdTsKK2lkCXNlbGVjdF90eXBlCXRhYmxlCXR5cGUJcG9zc2libGVf
a2V5cwlrZXkJa2V5X2xlbglyZWYJcm93cwlmaWx0ZXJlZAlFeHRyYQorMQlTSU1QTEUJTlVMTAlO
VUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5vIHRhYmxlcyB1c2VkCitXYXJuaW5n
czoKK05vdGUJMTAwMwlzZWxlY3QgJ2FiY2TDgcOCw4PDhMOFJyBBUyBgYWJjZMOBw4LDg8OEw4Vg
LF9sYXRpbjEnYWJjZFx4QzNceDgxXHhDM1x4ODJceEMzXHg4M1x4QzNceDg0XHhDM1x4ODUnIEFT
IGBhYmNkw4HDgsODw4TDhWAsX3V0ZjgnYWJjZFx4QzNceDgxXHhDM1x4ODJceEMzXHg4M1x4QzNc
eDg0XHhDM1x4ODUnIEFTIGB1YAorU0VUIE5BTUVTIHV0Zjg7CitFWFBMQUlOIEVYVEVOREVEIFNF
TEVDVCAnYWJjZMOBw4LDg8OEw4UnLCBfbGF0aW4xJ2FiY2TDgcOCw4PDhMOFJywgX3V0ZjgnYWJj
ZMOBw4LDg8OEw4UnOworaWQJc2VsZWN0X3R5cGUJdGFibGUJdHlwZQlwb3NzaWJsZV9rZXlzCWtl
eQlrZXlfbGVuCXJlZglyb3dzCWZpbHRlcmVkCUV4dHJhCisxCVNJTVBMRQlOVUxMCU5VTEwJTlVM
TAlOVUxMCU5VTEwJTlVMTAlOVUxMCU5VTEwJTm8gdGFibGVzIHVzZWQKK1dhcm5pbmdzOgorTm90
ZQkxMDAzCXNlbGVjdCAnYWJjZMOBw4LDg8OEw4UnIEFTIGBhYmNkw4HDgsODw4TDhWAsX2xhdGlu
MSdhYmNkXHhDM1x4ODFceEMzXHg4Mlx4QzNceDgzXHhDM1x4ODRceEMzXHg4NScgQVMgYGFiY2TD
g8KBw4PigJrDg8aSw4PigJ7Dg+KApmAsX3V0ZjgnYWJjZFx4QzNceDgxXHhDM1x4ODJceEMzXHg4
M1x4QzNceDg0XHhDM1x4ODUnIEFTIGBhYmNkw4HDgsODw4TDhWAKKyMKICMgRW5kIG9mIDUuNSB0
ZXN0cwogIwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9jdHlwZV9sYXRpbjEudGVz
dCcKLS0tIGEvbXlzcWwtdGVzdC90L2N0eXBlX2xhdGluMS50ZXN0CTIwMTAtMTEtMTggMDk6MTQ6
MjcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBlX2xhdGluMS50ZXN0CTIwMTEtMDMtMDEg
MTA6MTc6MTAgKzAwMDAKQEAgLTE0NCw1ICsxNDQsMjAgQEAgU0VMRUNUICcnIExJS0UgJycgRVND
QVBFIEVYUE9SVF9TRVQoMSwgMQogLS1zb3VyY2UgaW5jbHVkZS9jdHlwZV9udW1jb252LmluYwog
CiAtLWVjaG8gIworLS1lY2hvICMgQnVnIzExNzY0NTAzIChCdWcjNTczNDEpIFF1ZXJ5IGluIEVY
UExBSU4gRVhURU5ERUQgc2hvd3Mgd3JvbmcgY2hhcmFjdGVycworLS1lY2hvICMKKyMgVGVzdCBs
YXRpbjEgY2xpZW50IGVycm9uZW91c2x5IHN0YXJ0ZWQgd2l0aCAtLWRlZmF1bHQtY2hhcmFjdGVy
LXNldD11dGY4CisjIEVYUExBSU4gb3V0cHV0IHNob3VsZCBzdGlsbCBiZSBwcmV0dHkgcmVhZGFi
bGUuCisjIFdlJ3JlIHVzaW5nICfDsycgKFx4QzNceEIzKSBhcyBhIG1hZ2ljIHNlcXVlbmNlOgor
IyAtIGl0J3MgIkxBVElOIENBUElUQUwgTEVUVEVSIEEgV0lUSCBUSUxERSBBQk9WRSArIFNVUEVS
U0NSSVBUIDMiIGluIGxhdGluMQorIyAtIGl0J3MgIkxBVElOIFNNQUxMIExFVFRFUiBPIFdJVEgg
QUNVVEUgQUJPVkUiIGluIHV0ZjguCitTRVQgTkFNRVMgdXRmODsKK0VYUExBSU4gRVhURU5ERUQg
U0VMRUNUICdhYmNkw7MnLCBfbGF0aW4xJ2FiY2TDsycsIF91dGY4J2FiY2TDsyc7CisjIFRlc3Qg
bm9ybWFsIGxhdGluMQorU0VUIE5BTUVTIGxhdGluMTsKK0VYUExBSU4gRVhURU5ERUQgU0VMRUNU
ICdhYmNkw7MnLCBfbGF0aW4xJ2FiY2TDsycsIF91dGY4J2FiY2TDsyc7CisKKworLS1lY2hvICMK
IC0tZWNobyAjIEVuZCBvZiA1LjUgdGVzdHMKIC0tZWNobyAjCgo9PT0gbW9kaWZpZWQgZmlsZSAn
bXlzcWwtdGVzdC90L2N0eXBlX3V0ZjgudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2N0eXBlX3V0
ZjgudGVzdAkyMDEwLTEyLTE3IDExOjExOjM0ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9jdHlw
ZV91dGY4LnRlc3QJMjAxMS0wMy0wMSAxMDoxNzoxMCArMDAwMApAQCAtMTU1MCw2ICsxNTUwLDE2
IEBAIFNFTEVDVCBDT1VOVCgqKSBGUk9NIHQxLCB0MSB0MiAKIEdST1VQIEJZIElOU0VSVCgnJywg
dDIuYSwgdDEuYSwgKEBAZ2xvYmFsLm1heF9iaW5sb2dfc2l6ZSkpOwogRFJPUCBUQUJMRSB0MTsK
IAorLS1lY2hvICMKKy0tZWNobyAjIEJ1ZyMxMTc2NDUwMyAoQnVnIzU3MzQxKSBRdWVyeSBpbiBF
WFBMQUlOIEVYVEVOREVEIHNob3dzIHdyb25nIGNoYXJhY3RlcnMKKy0tZWNobyAjCisjIEVtdWxh
dGUgdXRmOCBjbGllbnQgZXJyb25lb3VzbHkgc3RhcnRlZCB3aXRoIC0tZGVmYXVsdC1jaGFyYWN0
ZXItc2V0PWxhdGluMSwKKyMgYXMgaW4gdGhlIGJ1ZyByZXBvcnQuIEVYUExBSU4gb3V0cHV0IHNo
b3VsZCBzdGlsbCBiZSBwcmV0dHkgcmVhZGFibGUKK1NFVCBOQU1FUyBsYXRpbjE7CitFWFBMQUlO
IEVYVEVOREVEIFNFTEVDVCAnYWJjZMOBw4LDg8OEw4UnLCBfbGF0aW4xJ2FiY2TDgcOCw4PDhMOF
JywgX3V0ZjgnYWJjZMOBw4LDg8OEw4UnIEFTIHU7CisjIFRlc3Qgbm9ybWFsIHV0ZjgKK1NFVCBO
QU1FUyB1dGY4OworRVhQTEFJTiBFWFRFTkRFRCBTRUxFQ1QgJ2FiY2TDgcOCw4PDhMOFJywgX2xh
dGluMSdhYmNkw4HDgsODw4TDhScsIF91dGY4J2FiY2TDgcOCw4PDhMOFJzsKIAogLS1lY2hvICMK
IC0tZWNobyAjIEVuZCBvZiA1LjUgdGVzdHMKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvaXRlbS5j
YycKLS0tIGEvc3FsL2l0ZW0uY2MJMjAxMS0wMS0xMiAxMjo1ODo0NyArMDAwMAorKysgYi9zcWwv
aXRlbS5jYwkyMDExLTAzLTAxIDEwOjE3OjEwICswMDAwCkBAIC0yNTE0LDcgKzI1MTQsOCBAQCBt
eV9kZWNpbWFsICpJdGVtX2Zsb2F0Ojp2YWxfZGVjaW1hbChteV9kCiAKIHZvaWQgSXRlbV9zdHJp
bmc6OnByaW50KFN0cmluZyAqc3RyLCBlbnVtX3F1ZXJ5X3R5cGUgcXVlcnlfdHlwZSkKIHsKLSAg
aWYgKHF1ZXJ5X3R5cGUgPT0gUVRfT1JESU5BUlkgJiYgaXNfY3Nfc3BlY2lmaWVkKCkpCisgIGlm
ICgocXVlcnlfdHlwZSA9PSBRVF9PUkRJTkFSWSB8fCBxdWVyeV90eXBlID09IFFUX0VYUExBSU4p
ICYmCisgICAgICBpc19jc19zcGVjaWZpZWQoKSkKICAgewogICAgIHN0ci0+YXBwZW5kKCdfJyk7
CiAgICAgc3RyLT5hcHBlbmQoY29sbGF0aW9uLmNvbGxhdGlvbi0+Y3NuYW1lKTsKQEAgLTI1MjIs
OCArMjUyMywxNCBAQCB2b2lkIEl0ZW1fc3RyaW5nOjpwcmludChTdHJpbmcgKnN0ciwgZW51CiAK
ICAgc3RyLT5hcHBlbmQoJ1wnJyk7CiAKLSAgaWYgKHF1ZXJ5X3R5cGUgPT0gUVRfT1JESU5BUlkg
fHwKLSAgICAgIG15X2NoYXJzZXRfc2FtZShzdHJfdmFsdWUuY2hhcnNldCgpLCBzeXN0ZW1fY2hh
cnNldF9pbmZvKSkKKyAgaWYgKHF1ZXJ5X3R5cGUgPT0gUVRfRVhQTEFJTiAmJiBpc19jc19zcGVj
aWZpZWQoKSkKKyAgeworICAgIC8qIFByaW50IEFTQ0lJIGFzIGlzLCBwcmludCBleHRlbmRlZCBj
aGFyYWN0ZXJzIHVzaW5nIFx4RkYgc2VxdWVuY2VzICovCisgICAgRXJyQ29udlN0cmluZyB0bXAo
c3RyX3ZhbHVlLnB0cigpLCBzdHJfdmFsdWUubGVuZ3RoKCksICZteV9jaGFyc2V0X2Jpbik7Cisg
ICAgc3RyLT5hcHBlbmQodG1wLnB0cigpKTsKKyAgfQorICBlbHNlIGlmIChxdWVyeV90eXBlID09
IFFUX09SRElOQVJZIHx8CisgICAgICAgICAgIG15X2NoYXJzZXRfc2FtZShzdHJfdmFsdWUuY2hh
cnNldCgpLCBzeXN0ZW1fY2hhcnNldF9pbmZvKSkKICAgewogICAgIHN0cl92YWx1ZS5wcmludChz
dHIpOwogICB9Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL215c3FsZC5oJwotLS0gYS9zcWwvbXlz
cWxkLmgJMjAxMS0wMS0xNCAxMzoyMTo0NiArMDAwMAorKysgYi9zcWwvbXlzcWxkLmgJMjAxMS0w
My0wMSAxMDoxNzoxMCArMDAwMApAQCAtNDA0LDExICs0MDQsMTQgQEAgZW51bSBvcHRpb25zX215
c3FsZAogICBRVF9PUkRJTkFSWSAtLSBvcmRpbmFyeSBTUUwgcXVlcnkuCiAgIFFUX0lTIC0tIFNR
TCBxdWVyeSB0byBiZSBzaG93biBpbiBJTkZPUk1BVElPTl9TQ0hFTUEgKGluIHV0ZjggYW5kIHdp
dGhvdXQKICAgY2hhcmFjdGVyIHNldCBpbnRyb2R1Y2VycykuCisgIFFUX0VYUExBSU4gLS0gU1FM
IHF1ZXJ5IHRvIGJlIHNob3duIGluIEVYUExBSU4gU0VMRUNUIEVYVEVOREVEICh3aXRoCisgIGlu
dHJvZHVjZXJzIGFuZCBceEZGIGVzY2FwZSBzZXF1ZW5jZXMgZm9yIGV4dGVuZGVkIGNoYXJhY3Rl
cnMpCiAqLwogZW51bSBlbnVtX3F1ZXJ5X3R5cGUKIHsKICAgUVRfT1JESU5BUlksCi0gIFFUX0lT
CisgIFFUX0lTLAorICBRVF9FWFBMQUlOCiB9OwogCiAvKiBxdWVyeV9pZCAqLwoKPT09IG1vZGlm
aWVkIGZpbGUgJ3NxbC9zcWxfcGFyc2UuY2MnCi0tLSBhL3NxbC9zcWxfcGFyc2UuY2MJMjAxMS0w
Mi0xOCAxMzoyNDowMyArMDAwMAorKysgYi9zcWwvc3FsX3BhcnNlLmNjCTIwMTEtMDMtMDEgMTA6
MTc6MTAgKzAwMDAKQEAgLTQ0MzksNyArNDQzOSw3IEBAIHN0YXRpYyBib29sIGV4ZWN1dGVfc3Fs
Y29tX3NlbGVjdChUSEQgKnQKICAgICAgICAgY2hhciBidWZmWzEwMjRdOwogICAgICAgICBTdHJp
bmcgc3RyKGJ1ZmYsKHVpbnQzMikgc2l6ZW9mKGJ1ZmYpLCBzeXN0ZW1fY2hhcnNldF9pbmZvKTsK
ICAgICAgICAgc3RyLmxlbmd0aCgwKTsKLSAgICAgICAgdGhkLT5sZXgtPnVuaXQucHJpbnQoJnN0
ciwgUVRfT1JESU5BUlkpOworICAgICAgICB0aGQtPmxleC0+dW5pdC5wcmludCgmc3RyLCBRVF9F
WFBMQUlOKTsKICAgICAgICAgc3RyLmFwcGVuZCgnXDAnKTsKICAgICAgICAgcHVzaF93YXJuaW5n
KHRoZCwgTVlTUUxfRVJST1I6OldBUk5fTEVWRUxfTk9URSwKICAgICAgICAgICAgICAgICAgICAg
IEVSX1lFUywgc3RyLnB0cigpKTsKCg==

--===============7551246445002190283==
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\
#   mj73b9f3sj96kvhu
# target_branch: file:///home/bar/mysql-bzr/mysql-5.5.b57341/
# testament_sha1: 7c794b61d3c147263e8ed8a38774488a491ad2bc
# timestamp: 2011-03-01 13:24:25 +0300
# base_revision_id: tor.didriksen@stripped\
#   qmhcbs7oyzdgiyyy
# 
# Begin bundle
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


--===============7551246445002190283==--