From: Alexander Barkov
Date: February 22 2011 1:27pm
Subject: bzr commit into mysql-trunk branch (alexander.barkov:3699) WL#5624
List-Archive: http://lists.mysql.com/commits/131852
Message-Id: <201102221327.p1MDREF6018986@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8130915588840755079=="

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

I0F0IGZpbGU6Ly8vaG9tZS9iYXIvbXlzcWwtYnpyL215c3FsLXRydW5rLnc1NjI0LyBiYXNlZCBv
biByZXZpZDptYXR0aWFzLmpvbnNzb25Ab3JhY2xlLmNvbS0yMDExMDIyMjEwNTEyMS1tM2xxbXEz
dmZpc3hjM2ljCgogMzY5OSBBbGV4YW5kZXIgQmFya292CTIwMTEtMDItMjIKICAgICAgV0wjNTYy
NCBDb2xsYXRpb24gY3VzdG9taXphdGlvbiBpbXByb3ZlbWVudHMgCiAgICAgIEV4dGVuc2lvbiBm
b3IgdGhlIG9yaWdpbmFsIHBhdGNoIHRvIGhhbmRsZSAiYnVsayIgc2hpZnQuCiAgICAgIAogICAg
ICAgIEAgbXlzcWwtdGVzdC9yL2N0eXBlX2xkbWwucmVzdWx0CiAgICAgICAgQCBteXNxbC10ZXN0
L3N0ZF9kYXRhL0luZGV4LnhtbAogICAgICAgIEBteXNxbC10ZXN0L3QvY3R5cGVfbGRtbC50ZXN0
CiAgICAgICAgQWRkaW5nIHRlc3RzCiAgICAgIAogICAgICAgIEAgc3RyaW5ncy9jdHlwZS11Y2Eu
YwogICAgICAgIEAgc3RyaW5ncy9jdHlwZS5jCiAgICAgICAgc2hpZnQtYWZ0ZXItbWV0aG9kPSJl
eHBhbmQiIGNvbGxhdGlvbiBvcHRpb24uCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qv
ci9jdHlwZV9sZG1sLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N0ZF9kYXRhL0luZGV4LnhtbAog
ICAgICBteXNxbC10ZXN0L3QvY3R5cGVfbGRtbC50ZXN0CiAgICAgIHN0cmluZ3MvY3R5cGUtdWNh
LmMKICAgICAgc3RyaW5ncy9jdHlwZS5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3Iv
Y3R5cGVfbGRtbC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9jdHlwZV9sZG1sLnJlc3VsdAky
MDEwLTEyLTIwIDEwOjI4OjA2ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9jdHlwZV9sZG1sLnJl
c3VsdAkyMDExLTAyLTIyIDEzOjI1OjA1ICswMDAwCkBAIC00NjgsNiArNDY4LDcgQEAgdXRmOF81
NjI0XzQJdXRmOAkzNTcJCQk4CiB1Y3MyX3Rlc3RfY2kJdWNzMgkzNTgJCQk4CiB1Y3MyX3ZuX2Np
CXVjczIJMzU5CQkJOAogdWNzMl81NjI0XzEJdWNzMgkzNjAJCQk4Cit1dGY4XzU2MjRfNQl1dGY4
CTM2OAkJCTgKIHV0ZjMyX3Rlc3RfY2kJdXRmMzIJMzkxCQkJOAogdXRmOF9tYXh1c2VyaWRfY2kJ
dXRmOAkyMDQ3CQkJOAogc2hvdyBjb2xsYXRpb24gbGlrZSAnJXRlc3QlJzsKQEAgLTEwNTMsNSAr
MTA1NCw4MiBAQCB3YQlHUk9VUF9DT05DQVQoSEVYKENPTlZFUlQoYSBVU0lORyB1Y3MyCiAxNUQ0
CTA5QjkwOUNECiBEUk9QIFRBQkxFIHQxOwogIworIyBXTCM1NjI0LCBzaGlmdCBhZnRlciwgdXNp
bmcgZXhwYW5zaW9uCisjCitTRVQgTkFNRVMgdXRmOCBDT0xMQVRFIHV0ZjhfNTYyNF81OworQ1JF
QVRFIFRBQkxFIHQxIEFTIFNFTEVDVCBSRVBFQVQoJyAnLCAxMCkgQVMgYSBMSU1JVCAwOworSU5T
RVJUIElOVE8gdDEgVkFMVUVTICgnMCcpLCgnMScpLCgnMHonKSwoX3VjczIgMHgwMDMwRkY5RCk7
CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdhJyksKCdiJyksKCdjJyksKCdkJyksKCdlJyksKCdm
JyksKCdnJyksKCdoJyksKCdpJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdqJyksKCdrJyks
KCdsJyksKCdtJyksKCduJyksKCdvJyksKCdwJyksKCdxJyksKCdyJyk7CitJTlNFUlQgSU5UTyB0
MSBWQUxVRVMgKCdzJyksKCd0JyksKCd1JyksKCd2JyksKCd3JyksKCd4JyksKCd5JyksKCd6Jyk7
CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdhYScpLCgnYWFhJyk7CitJTlNFUlQgSU5UTyB0MSBW
QUxVRVMgKCdBJyksKCdCJyksKCdDJyksKCdEJyksKCdFJyksKCdGJyksKCdHJyksKCdIJyksKCdJ
Jyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdKJyksKCdLJyksKCdMJyksKCdNJyksKCdOJyks
KCdPJyksKCdQJyksKCdRJyksKCdSJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdTJyksKCdU
JyksKCdVJyksKCdWJyksKCdXJyksKCdYJyksKCdZJyksKCdaJyk7CitJTlNFUlQgSU5UTyB0MSBW
QUxVRVMgKCdBQScpLCgnQUFBJyk7CitTRUxFQ1QgYSwgSEVYKFdFSUdIVF9TVFJJTkcoYSkpIEZS
T00gdDEgT1JERVIgQlkgYSwgTEVOR1RIKGEpLCBCSU5BUlkoYSk7CithCUhFWChXRUlHSFRfU1RS
SU5HKGEpKQorMAkwRTI5CiswegkwRTI5MEUyOTIzNTcKKzDvvp0JMEUyOTFFODEKK2EJMEUyOTIz
M0UKK2IJMEUyOTIzM0YKK2MJMEUyOTIzNDAKK2QJMEUyOTIzNDEKK2UJMEUyOTIzNDIKK2YJMEUy
OTIzNDMKK2cJMEUyOTIzNDQKK2gJMEUyOTIzNDUKK2kJMEUyOTIzNDYKK2oJMEUyOTIzNDcKK2sJ
MEUyOTIzNDgKK2wJMEUyOTIzNDkKK20JMEUyOTIzNEEKK24JMEUyOTIzNEIKK28JMEUyOTIzNEMK
K3AJMEUyOTIzNEQKK3EJMEUyOTIzNEUKK3IJMEUyOTIzNEYKK3MJMEUyOTIzNTAKK3QJMEUyOTIz
NTEKK3UJMEUyOTIzNTIKK3YJMEUyOTIzNTMKK3cJMEUyOTIzNTQKK3gJMEUyOTIzNTUKK3kJMEUy
OTIzNTYKK3oJMEUyOTIzNTcKK2FhCTBFMjkyMzU4CithYWEJMEUyOTIzNTkKK0EJMEUyOTMzM0UK
K0IJMEUyOTMzM0YKK0MJMEUyOTMzNDAKK0QJMEUyOTMzNDEKK0UJMEUyOTMzNDIKK0YJMEUyOTMz
NDMKK0cJMEUyOTMzNDQKK0gJMEUyOTMzNDUKK0kJMEUyOTMzNDYKK0oJMEUyOTMzNDcKK0sJMEUy
OTMzNDgKK0wJMEUyOTMzNDkKK00JMEUyOTMzNEEKK04JMEUyOTMzNEIKK08JMEUyOTMzNEMKK1AJ
MEUyOTMzNEQKK1EJMEUyOTMzNEUKK1IJMEUyOTMzNEYKK1MJMEUyOTMzNTAKK1QJMEUyOTMzNTEK
K1UJMEUyOTMzNTIKK1YJMEUyOTMzNTMKK1cJMEUyOTMzNTQKK1gJMEUyOTMzNTUKK1kJMEUyOTMz
NTYKK1oJMEUyOTMzNTcKK0FBCTBFMjkzMzU4CitBQUEJMEUyOTMzNTkKKzEJMEUyQQorRFJPUCBU
QUJMRSB0MTsKKyMKICMgRW5kIG9mIFdMIzU2MjQKICMKCj09PSBtb2RpZmllZCBmaWxlICdteXNx
bC10ZXN0L3N0ZF9kYXRhL0luZGV4LnhtbCcKLS0tIGEvbXlzcWwtdGVzdC9zdGRfZGF0YS9JbmRl
eC54bWwJMjAxMC0xMi0yMCAxMDoyODowNiArMDAwMAorKysgYi9teXNxbC10ZXN0L3N0ZF9kYXRh
L0luZGV4LnhtbAkyMDExLTAyLTIyIDEzOjI1OjA1ICswMDAwCkBAIC0xMDUsNiArMTA1LDIyIEBA
CiAgICAgICA8L3J1bGVzPgogICAgIDwvY29sbGF0aW9uPgogCisgICAgPCEtLSBzaGlmdCBhZnRl
ciB1c2luZyBleHBhbnNpb24gLS0+CisgICAgPGNvbGxhdGlvbiBuYW1lPSJ1dGY4XzU2MjRfNSIg
aWQ9IjM2OCIgc2hpZnQtYWZ0ZXItbWV0aG9kPSJleHBhbmQiPgorICAgICAgPHJ1bGVzPgorICAg
ICAgICA8IS0tCisgICAgICAgICAgIFB1dCBzbWFsbCBiYXNpYyBMYXRpbiBsZXR0ZXJzIGJldHdl
ZW4gMCBhbmQgMS4KKyAgICAgICAgICAgU2ltcGxlIHNoaWZ0IG1ldGhvZCB3b3VsZCBub3Qgd29y
aywgYmVjYXVzZSB0aGVyZSBpcyBubworICAgICAgICAgICB3ZWlnaHQgc3BhY2UgYmV0d2VlbiAw
IGFuZCAxIGluIERVQ0VULgorICAgICAgICAgICBBbHNvLCB0byB0ZXN0IGl0IHdvcmtzIHdpdGgg
Y29udHJhY3Rpb25zLCBwdXQgc29tZSBhZnRlciAneicuCisgICAgICAgIC0tPgorICAgICAgICA8
cmVzZXQ+MDwvcmVzZXQ+CisgICAgICAgIDxwYz5hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejwv
cGM+PHA+YWE8L3A+PHA+YWFhPC9wPgorICAgICAgICA8cmVzZXQgYmVmb3JlPSJwcmltYXJ5Ij4x
PC9yZXNldD4KKyAgICAgICAgPHBjPkFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaPC9wYz48cD5B
QTwvcD48cD5BQUE8L3A+CisgICAgICA8L3J1bGVzPgorICAgIDwvY29sbGF0aW9uPgorCiAgICA8
Y29sbGF0aW9uIG5hbWU9InV0ZjhfaHVnZWlkX2NpIiBpZD0iMjA0NzAwMDAwMCI+CiAgICAgICA8
cnVsZXM+CiAgICAgICAgIDxyZXNldD5hPC9yZXNldD4KCj09PSBtb2RpZmllZCBmaWxlICdteXNx
bC10ZXN0L3QvY3R5cGVfbGRtbC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVfbGRtbC50
ZXN0CTIwMTAtMTItMjAgMTA6Mjg6MDYgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBlX2xk
bWwudGVzdAkyMDExLTAyLTIyIDEzOjI1OjA1ICswMDAwCkBAIC0zNDcsNSArMzQ3LDI0IEBAIEZS
T00gdDEgR1JPVVAgQlkgYSBPUkRFUiBCWSBhOwogRFJPUCBUQUJMRSB0MTsKIAogLS1lY2hvICMK
Ky0tZWNobyAjIFdMIzU2MjQsIHNoaWZ0IGFmdGVyLCB1c2luZyBleHBhbnNpb24KKy0tZWNobyAj
CitTRVQgTkFNRVMgdXRmOCBDT0xMQVRFIHV0ZjhfNTYyNF81OworQ1JFQVRFIFRBQkxFIHQxIEFT
IFNFTEVDVCBSRVBFQVQoJyAnLCAxMCkgQVMgYSBMSU1JVCAwOworSU5TRVJUIElOVE8gdDEgVkFM
VUVTICgnMCcpLCgnMScpLCgnMHonKSwoX3VjczIgMHgwMDMwRkY5RCk7CitJTlNFUlQgSU5UTyB0
MSBWQUxVRVMgKCdhJyksKCdiJyksKCdjJyksKCdkJyksKCdlJyksKCdmJyksKCdnJyksKCdoJyks
KCdpJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdqJyksKCdrJyksKCdsJyksKCdtJyksKCdu
JyksKCdvJyksKCdwJyksKCdxJyksKCdyJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdzJyks
KCd0JyksKCd1JyksKCd2JyksKCd3JyksKCd4JyksKCd5JyksKCd6Jyk7CitJTlNFUlQgSU5UTyB0
MSBWQUxVRVMgKCdhYScpLCgnYWFhJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdBJyksKCdC
JyksKCdDJyksKCdEJyksKCdFJyksKCdGJyksKCdHJyksKCdIJyksKCdJJyk7CitJTlNFUlQgSU5U
TyB0MSBWQUxVRVMgKCdKJyksKCdLJyksKCdMJyksKCdNJyksKCdOJyksKCdPJyksKCdQJyksKCdR
JyksKCdSJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdTJyksKCdUJyksKCdVJyksKCdWJyks
KCdXJyksKCdYJyksKCdZJyksKCdaJyk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCdBQScpLCgn
QUFBJyk7CisKK1NFTEVDVCBhLCBIRVgoV0VJR0hUX1NUUklORyhhKSkgRlJPTSB0MSBPUkRFUiBC
WSBhLCBMRU5HVEgoYSksIEJJTkFSWShhKTsKK0RST1AgVEFCTEUgdDE7CisKKworLS1lY2hvICMK
IC0tZWNobyAjIEVuZCBvZiBXTCM1NjI0CiAtLWVjaG8gIwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
cmluZ3MvY3R5cGUtdWNhLmMnCi0tLSBhL3N0cmluZ3MvY3R5cGUtdWNhLmMJMjAxMS0wMS0xOSAx
MzozNTo1NCArMDAwMAorKysgYi9zdHJpbmdzL2N0eXBlLXVjYS5jCTIwMTEtMDItMjIgMTM6MjU6
MDUgKzAwMDAKQEAgLTIwOTI5LDYgKzIwOTI5LDE4IEBAIG15X2NvbGxfcnVsZV9yZXNldChNWV9D
T0xMX1JVTEUgKnIpCiB9CiAKIAorLyoKKyAgU2hpZnQgbWV0aG9kczoKKyAgU2ltcGxlOiAiJkIg
PCBDIiA6IHdlaWdodCgnQycpID0gd2VpZ2h0KCdCJykgKyAxCisgIEV4cGFuZDogd2VnaHQoJ0Mn
KSA9ICB7IHdlaWdodCgnQicpLCB3ZWlnaHQobGFzdF9ub25faWdub3JhYmxlKSArIDEgfQorKi8K
K3R5cGVkZWYgZW51bQoreworICBteV9zaGlmdF9tZXRob2Rfc2ltcGxlPSAwLAorICBteV9zaGlm
dF9tZXRob2RfZXhwYW5kCit9IG15X2NvbGxfc2hpZnRfbWV0aG9kOworCisKIHR5cGVkZWYgc3Ry
dWN0IG15X2NvbGxfcnVsZXNfc3QKIHsKICAgdWludCB2ZXJzaW9uOyAgICAgICAgICAgICAgLyog
VW5pY29kZSB2ZXJzaW9uLCBlLmcuIDQwMCBvciA1MjAgICovCkBAIC0yMDkzNyw2ICsyMDk0OSw3
IEBAIHR5cGVkZWYgc3RydWN0IG15X2NvbGxfcnVsZXNfc3QKICAgc2l6ZV90IG1ydWxlczsgICAg
ICAgICAgICAgLyogTnVtYmVyIG9mIGFsbG9jYXRlZCBydWxlcyAgICAgICAgICovCiAgIE1ZX0NP
TExfUlVMRSAqcnVsZTsgICAgICAgIC8qIFJ1bGUgYXJyYXkgICAgICAgICAgICAgICAgICAgICAg
ICAqLwogICBNWV9DSEFSU0VUX0xPQURFUiAqbG9hZGVyOworICBteV9jb2xsX3NoaWZ0X21ldGhv
ZCBzaGlmdF9hZnRlcl9tZXRob2Q7CiB9IE1ZX0NPTExfUlVMRVM7CiAKIApAQCAtMjEyMDQsNiAr
MjEyMTcsMTQgQEAgbXlfY29sbF9wYXJzZXJfc2Nhbl9zZXR0aW5nKE1ZX0NPTExfUlVMRQogICAg
IHJ1bGVzLT52ZXJzaW9uPSA1MjA7CiAgICAgcnVsZXMtPnVjYT0gJm15X3VjYV92NTIwOwogICB9
CisgIGVsc2UgaWYgKCFsZXhfY21wKGxleGVtLCBDX1NUUklOR19XSVRIX0xFTigiW3NoaWZ0LWFm
dGVyLW1ldGhvZCBleHBhbmRdIikpKQorICB7CisgICAgcnVsZXMtPnNoaWZ0X2FmdGVyX21ldGhv
ZD0gbXlfc2hpZnRfbWV0aG9kX2V4cGFuZDsKKyAgfQorICBlbHNlIGlmICghbGV4X2NtcChsZXhl
bSwgQ19TVFJJTkdfV0lUSF9MRU4oIltzaGlmdC1hZnRlci1tZXRob2Qgc2ltcGxlXSIpKSkKKyAg
eworICAgIHJ1bGVzLT5zaGlmdF9hZnRlcl9tZXRob2Q9IG15X3NoaWZ0X21ldGhvZF9zaW1wbGU7
CisgIH0KICAgZWxzZQogICB7CiAgICAgcmV0dXJuIDA7CkBAIC0yMTQxNSw3ICsyMTQzNiw4IEBA
IG15X2NvbGxfcGFyc2VyX3NjYW5fcmVzZXRfc2VxdWVuY2UoTVlfQ08KICAgICAgIHJldHVybiAw
OwogICB9CiAKLSAgaWYgKHAtPnJ1bGUuYmVmb3JlX2xldmVsID09IDEpIC8qIEFwcGx5ICJiZWZv
cmUgcHJpbWFyeSIgb3B0aW9uICAqLworICBpZiAocC0+cnVsZXMtPnNoaWZ0X2FmdGVyX21ldGhv
ZCA9PSBteV9zaGlmdF9tZXRob2RfZXhwYW5kIHx8CisgICAgICBwLT5ydWxlLmJlZm9yZV9sZXZl
bCA9PSAxKSAvKiBBcHBseSAiYmVmb3JlIHByaW1hcnkiIG9wdGlvbiAgKi8KICAgewogICAgIC8q
CiAgICAgICBTdXBwb3NlIHdlIGhhdmUgdGhpcyBydWxlOiAgJkJbYmVmb3JlIHByaW1hcnldIDwg
QwpAQCAtMjE0MzUsNiArMjE0NTcsMTAgQEAgbXlfY29sbF9wYXJzZXJfc2Nhbl9yZXNldF9zZXF1
ZW5jZShNWV9DTwogCiAgICAgICBXZSdsbCBjb21wb3NlIHdlaWdodCBmb3IgQyBhczogW0JCQkIt
MV1bTU1NTSsxXQogICAgICAgd2hlcmUgW01NTU1dIGlzIHdlaWdodCBmb3IgImxhc3Rfbm9uX2ln
bm9yYWJsZSIuCisgICAgICAKKyAgICAgIFdlIGFsc28gZG8gdGhlIHNhbWUgdHJpY2sgZm9yICJy
ZXNldCBhZnRlciIgaWYgdGhlIGNvbGxhdGlvbgorICAgICAgb3B0aW9uIHNheXMgc28uIEUuZy4g
Zm9yIHRoZSBydWxlcyAiJkIgPCBDIiwgd2VpZ2h0IGZvcgorICAgICAgQyB3aWxsIGJlIGNhbGN1
bGF0ZWQgYXM6IFtCQkJCXVtNTU1NKzFdCiAKICAgICAgIEF0IHRoaXMgcG9pbnQgd2Ugb25seSBu
ZWVkIHRvIHN0b3JlIGNvZGVwb2ludHMKICAgICAgICdCJyBhbmQgJ2xhc3Rfbm9uX2lnbm9yYWJs
ZScuIEFjdHVhbCB3ZWlnaHRzIGZvciAnQycKQEAgLTIxOTI0LDcgKzIxOTUwLDI3IEBAIGNyZWF0
ZV90YWlsb3JpbmcoQ0hBUlNFVF9JTkZPICpjcywgTVlfQ0gKICAgICAgIGlmIChyLT5iZWZvcmVf
bGV2ZWwgPT0gMSkgLyogQXBwbHkgIiZbYmVmb3JlIHByaW1hcnldIiAqLwogICAgICAgewogICAg
ICAgICBpZiAobndlaWdodHMgPj0gMikKKyAgICAgICAgewogICAgICAgICAgIHRvW253ZWlnaHRz
IC0gMl0tLTsgLyogUmVzZXQgYmVmb3JlICovCisgICAgICAgICAgaWYgKHJ1bGVzLnNoaWZ0X2Fm
dGVyX21ldGhvZCA9PSBteV9zaGlmdF9tZXRob2RfZXhwYW5kKQorICAgICAgICAgIHsKKyAgICAg
ICAgICAgIC8qCisgICAgICAgICAgICAgIFNwZWNpYWwgY2FzZS4gRG9uJ3QgbGV0IGNoYXJhY3Rl
cnMgc2hpZnRlZCBhZnRlciBYCisgICAgICAgICAgICAgIGFuZCBiZWZvcmUgbmV4dChYKSBpbnRl
cm1peCB0byBlYWNoIG90aGVyLgorICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgRm9yIGV4
YW1wbGU6CisgICAgICAgICAgICAgICJbc2hpZnQtYWZ0ZXItbWV0aG9kIGV4cGFuZF0gJjAgPCBh
ICZbYmVmb3JlIHByaW1hcnldMSA8IEEiLgorICAgICAgICAgICAgICBJLmUuIHdlIHJlb3JkZXIg
J2EnIGFmdGVyICcwJywgYW5kIHRoZW4gJ0EnIGJlZm9yZSAnMScuCisgICAgICAgICAgICAgICdh
JyBtdXN0IGJlIHNvcnRlZCBiZWZvcmUgJ0EnLgorICAgICAgICAgICAgICAKKyAgICAgICAgICAg
ICAgTm90ZSwgdGhlcmUgYXJlIG5vIHJlYWwgY29sbGF0aW9ucyBpbiBDTERSIHdoaWNoIHNoaWZ0
CisgICAgICAgICAgICAgIGFmdGVyIGFuZCBiZWZvcmUgdHdvIG5laWdoYm91cmdoIGNoYXJhY3Rl
cnMuIFdlIG5lZWQgdGhpcworICAgICAgICAgICAgICBqdXN0IGluIGNhc2UuIFJlc2VydmluZyA0
MDk2ICgweDEwMDApIHdlaWdodHMgZm9yIHN1Y2gKKyAgICAgICAgICAgICAgY2FzZXMgaXMgcGVy
ZmVjdGx5IGVub3VnaC4KKyAgICAgICAgICAgICovCisgICAgICAgICAgICB0b1tud2VpZ2h0cyAt
IDFdKz0gMHgxMDAwOworICAgICAgICAgIH0KKyAgICAgICAgfQogICAgICAgICBlbHNlCiAgICAg
ICAgIHsKICAgICAgICAgICBteV9zbnByaW50Zihsb2FkZXItPmVycm9yLCBzaXplb2YobG9hZGVy
LT5lcnJvciksCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RyaW5ncy9jdHlwZS5jJwotLS0gYS9zdHJp
bmdzL2N0eXBlLmMJMjAxMS0wMi0xNSAxMTozMDo1NiArMDAwMAorKysgYi9zdHJpbmdzL2N0eXBl
LmMJMjAxMS0wMi0yMiAxMzoyNTowNSArMDAwMApAQCAtODgsNiArODgsNyBAQCBzdHJ1Y3QgbXlf
Y3NfZmlsZV9zZWN0aW9uX3N0CiAjZGVmaW5lIF9DU19VQ0FfVkVSU0lPTiAgICAgICAgICAgICAg
ICAgMTAwCiAjZGVmaW5lIF9DU19DTF9TVVBQUkVTU19DT05UUkFDVElPTlMgICAgMTAxCiAjZGVm
aW5lIF9DU19DTF9PUFRJTUlaRSAgICAgICAgICAgICAgICAgMTAyCisjZGVmaW5lIF9DU19DTF9T
SElGVF9BRlRFUl9NRVRIT0QgICAgICAgMTAzCiAKIAogLyogQ29sbGF0aW9uIFNldHRpbmdzICov
CkBAIC0xODcsNiArMTg4LDcgQEAgc3RhdGljIHN0cnVjdCBteV9jc19maWxlX3NlY3Rpb25fc3Qg
c2VjWwogICB7X0NTX1VDQV9WRVJTSU9OLCAgICAgICAgICAgICAgImNoYXJzZXRzL2NoYXJzZXQv
Y29sbGF0aW9uL3ZlcnNpb24ifSwKICAge19DU19DTF9TVVBQUkVTU19DT05UUkFDVElPTlMsICJj
aGFyc2V0cy9jaGFyc2V0L2NvbGxhdGlvbi9zdXBwcmVzc19jb250cmFjdGlvbnMifSwKICAge19D
U19DTF9PUFRJTUlaRSwgICAgICAgICAgICAgICJjaGFyc2V0cy9jaGFyc2V0L2NvbGxhdGlvbi9v
cHRpbWl6ZSJ9LAorICB7X0NTX0NMX1NISUZUX0FGVEVSX01FVEhPRCwgICAgImNoYXJzZXRzL2No
YXJzZXQvY29sbGF0aW9uL3NoaWZ0LWFmdGVyLW1ldGhvZCJ9LAogCiAgIC8qIENvbGxhdGlvbiBT
ZXR0aW5ncyAqLwogICB7X0NTX1NUX1NFVFRJTkdTLCAgICAgICAgICAgICAgImNoYXJzZXRzL2No
YXJzZXQvY29sbGF0aW9uL3NldHRpbmdzIn0sCkBAIC02NDYsNiArNjQ4LDEwIEBAIHN0YXRpYyBp
bnQgY3NfdmFsdWUoTVlfWE1MX1BBUlNFUiAqc3QsY28KICAgICByYz0gdGFpbG9yaW5nX2FwcGVu
ZChzdCwgIltvcHRpbWl6ZSAlLipzXSIsIGxlbiwgYXR0cik7CiAgICAgYnJlYWs7CiAKKyAgY2Fz
ZSBfQ1NfQ0xfU0hJRlRfQUZURVJfTUVUSE9EOgorICAgIHJjPSB0YWlsb3JpbmdfYXBwZW5kKHN0
LCAiW3NoaWZ0LWFmdGVyLW1ldGhvZCAlLipzXSIsIGxlbiwgYXR0cik7CisgICAgYnJlYWs7CisK
ICAgLyogQ29sbGF0aW9uIFNldHRpbmdzICovCiAgIGNhc2UgX0NTX1NUX1NUUkVOR1RIOgogICAg
IC8qIDEsIDIsIDMsIDQsIDUsIG9yIHByaW1hcnksIHNlY29uZGFyeSwgdGVydGlhcnksIHF1YXRl
cm5hcnksIGlkZW50aWNhbCAqLwoK

--===============8130915588840755079==
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\
#   vb6dturtjbv5qvjw
# target_branch: file:///home/bar/mysql-bzr/mysql-trunk.w5624/
# testament_sha1: 5668abc66327a0efefef54398ae680e2ee1738c0
# timestamp: 2011-02-22 16:27:14 +0300
# base_revision_id: mattias.jonsson@stripped\
#   m3lqmq3vfisxc3ic
# 
# Begin bundle
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


--===============8130915588840755079==--