From: Alexander Barkov
Date: May 5 2009 6:55am
Subject: bzr commit into mysql-5.1-bugteam branch (bar:2894) Bug#44352
List-Archive: http://lists.mysql.com/commits/73352
X-Bug: 44352
Message-Id: <200905050655.n456ti3o006361@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1671346894=="

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

I0F0IGZpbGU6Ly8vaG9tZS9iYXIvbXlzcWwtYnpyL215c3FsLTUuMS5iNDQzNTIvIGJhc2VkIG9u
IHJldmlkOnNlcmdAbXlzcWwuY29tLTIwMDkwNTA0MjAzMzIzLTRocmg2aWVjejMxaTJtZWEKCiAy
ODk0IEFsZXhhbmRlciBCYXJrb3YJMjAwOS0wNS0wNQogICAgICBCdWcjNDQzNTIgVVBQRVIvTE9X
RVIgZnVuY3Rpb24gZG9lc24ndCB3b3JrIGNvcnJlY3RseQogICAgICBvbiBjcDkzMiBhbmQgc2pp
cyBlbnZpcm9ubWVudC4KICAgICAgUHJvYmxlbTogY2FzZSBjb252ZXJzaW9uIGVycm9uZW91c2x5
IGNoYW5nZXMgdGhlIHNlY29uZCBieXRlcwogICAgICBvZiBtdWx0aS1ieXRlIHNlcXVlbmNlcyBi
ZWNhdXNlIHNpbmdsZS1ieXRlIGZ1bmN0aW9ucyB3ZXJlCiAgICAgIGNhbGxlZCBpbiBhIG1pc3Rh
a2UuCiAgICAgIEZpeDogY2FsbCBtdWx0aS1ieXRlIGF3YXJlIGZ1bmN0aW9ucyBpbnN0ZWFkLgoK
ICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvY3R5cGVfY3A5MzJfYmlubG9nX3N0bS5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX3NqaXMucmVzdWx0CiAgICAgIG15c3FsLXRl
c3QvdC9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2N0eXBl
X3NqaXMudGVzdAogICAgICBzdHJpbmdzL2N0eXBlLWNwOTMyLmMKICAgICAgc3RyaW5ncy9jdHlw
ZS1zamlzLmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9jdHlwZV9jcDkzMl9iaW5s
b2dfc3RtLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0u
cmVzdWx0CTIwMDgtMTAtMDIgMDU6NTY6MDcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL2N0eXBl
X2NwOTMyX2JpbmxvZ19zdG0ucmVzdWx0CTIwMDktMDUtMDUgMDY6NTU6MjIgKzAwMDAKQEAgLTQ2
LDQgKzQ2LDEyIEBAIG1hc3Rlci1iaW4uMDAwMDAxCTExMzcJUXVlcnkJMQkxMjE2CXVzZSAKIEVu
ZCBvZiA1LjAgdGVzdHMKIFNIT1cgQklOTE9HIEVWRU5UUyBGUk9NIDM2NDsKIEVSUk9SIEhZMDAw
OiBFcnJvciB3aGVuIGV4ZWN1dGluZyBjb21tYW5kIFNIT1cgQklOTE9HIEVWRU5UUzogV3Jvbmcg
b2Zmc2V0IG9yIEkvTyBlcnJvcgorQnVnIzQ0MzUyIFVQUEVSL0xPV0VSIGZ1bmN0aW9uIGRvZXNu
J3Qgd29yayBjb3JyZWN0bHkgb24gY3A5MzIgYW5kIHNqaXMgZW52aXJvbm1lbnQuCitDUkVBVEUg
VEFCTEUgdDEgKGEgdmFyY2hhcigxNikpIGNoYXJhY3RlciBzZXQgY3A5MzI7CitJTlNFUlQgSU5U
TyB0MSBWQUxVRVMgKDB4ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsKK1NFTEVDVCBoZXgoYSksIGhl
eChsb3dlcihhKSksIGhleCh1cHBlcihhKSkgRlJPTSB0MSBPUkRFUiBCWSBiaW5hcnkoYSk7Cito
ZXgoYSkJaGV4KGxvd2VyKGEpKQloZXgodXBwZXIoYSkpCis4MzUyODM1RQk4MzUyODM1RQk4MzUy
ODM1RQorODM3MjgzNUUJODM3MjgzNUUJODM3MjgzNUUKK0RST1AgVEFCTEUgdDE7CiBFbmQgb2Yg
NS4xIHRlc3RzCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2N0eXBlX3NqaXMucmVz
dWx0JwotLS0gYS9teXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1bHQJMjAwOC0wMi0yMCAxODo0
OToyNiArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1bHQJMjAwOS0wNS0w
NSAwNjo1NToyMiArMDAwMApAQCAtMjA5LDMgKzIwOSwxMyBAQCBTRVQgTkFNRVMgc2ppczsKIFNF
TEVDVCBIRVgoJ8KNwrLCk8KRwoFAwoxcJykgRlJPTSBEVUFMOwogSEVYKCfCjcKywpPCkcKBQMKM
XCcpCiA4REIyOTM5MTgxNDA4QzVDCisjIFN0YXJ0IG9mIDUuMSB0ZXN0cworQnVnIzQ0MzUyIFVQ
UEVSL0xPV0VSIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgb24gY3A5MzIgYW5kIHNq
aXMgZW52aXJvbm1lbnQuCitDUkVBVEUgVEFCTEUgdDEgKGEgdmFyY2hhcigxNikpIGNoYXJhY3Rl
ciBzZXQgc2ppczsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMHg4MzcyODM1RSksKDB4ODM1Mjgz
NUUpOworU0VMRUNUIGhleChhKSwgaGV4KGxvd2VyKGEpKSwgaGV4KHVwcGVyKGEpKSBGUk9NIHQx
IE9SREVSIEJZIGJpbmFyeShhKTsKK2hleChhKQloZXgobG93ZXIoYSkpCWhleCh1cHBlcihhKSkK
KzgzNTI4MzVFCTgzNTI4MzVFCTgzNTI4MzVFCis4MzcyODM1RQk4MzcyODM1RQk4MzcyODM1RQor
RFJPUCBUQUJMRSB0MTsKKyMgRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlmaWVkIGZpbGUgJ215
c3FsLXRlc3QvdC9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qv
dC9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnRlc3QJMjAwNy0wNS0zMCAxMDoyMzo0NyArMDAwMAor
KysgYi9teXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlubG9nX3N0bS50ZXN0CTIwMDktMDUtMDUg
MDY6NTU6MjIgKzAwMDAKQEAgLTM0LDQgKzM0LDEwIEBAIGRlbGltaXRlciA7fAogLS1lcnJvciAx
MjIwCiBTSE9XIEJJTkxPRyBFVkVOVFMgRlJPTSAzNjQ7CiAKKy0tZWNobyBCdWcjNDQzNTIgVVBQ
RVIvTE9XRVIgZnVuY3Rpb24gZG9lc24ndCB3b3JrIGNvcnJlY3RseSBvbiBjcDkzMiBhbmQgc2pp
cyBlbnZpcm9ubWVudC4KK0NSRUFURSBUQUJMRSB0MSAoYSB2YXJjaGFyKDE2KSkgY2hhcmFjdGVy
IHNldCBjcDkzMjsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMHg4MzcyODM1RSksKDB4ODM1Mjgz
NUUpOworU0VMRUNUIGhleChhKSwgaGV4KGxvd2VyKGEpKSwgaGV4KHVwcGVyKGEpKSBGUk9NIHQx
IE9SREVSIEJZIGJpbmFyeShhKTsKK0RST1AgVEFCTEUgdDE7CisKIC0tZWNobyBFbmQgb2YgNS4x
IHRlc3RzCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC90L2N0eXBlX3NqaXMudGVzdCcK
LS0tIGEvbXlzcWwtdGVzdC90L2N0eXBlX3NqaXMudGVzdAkyMDA4LTAyLTIwIDE4OjQ5OjI2ICsw
MDAwCisrKyBiL215c3FsLXRlc3QvdC9jdHlwZV9zamlzLnRlc3QJMjAwOS0wNS0wNSAwNjo1NToy
MiArMDAwMApAQCAtODMsMyArODMsMTMgQEAgU0VUIE5BTUVTIHNqaXM7CiBTRUxFQ1QgSEVYKCfC
jcKywpPCkcKBQMKMXCcpIEZST00gRFVBTDsKIAogIyBFbmQgb2YgNC4xIHRlc3RzCisKKy0tZWNo
byAjIFN0YXJ0IG9mIDUuMSB0ZXN0cworCistLWVjaG8gQnVnIzQ0MzUyIFVQUEVSL0xPV0VSIGZ1
bmN0aW9uIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgb24gY3A5MzIgYW5kIHNqaXMgZW52aXJvbm1l
bnQuCitDUkVBVEUgVEFCTEUgdDEgKGEgdmFyY2hhcigxNikpIGNoYXJhY3RlciBzZXQgc2ppczsK
K0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMHg4MzcyODM1RSksKDB4ODM1MjgzNUUpOworU0VMRUNU
IGhleChhKSwgaGV4KGxvd2VyKGEpKSwgaGV4KHVwcGVyKGEpKSBGUk9NIHQxIE9SREVSIEJZIGJp
bmFyeShhKTsKK0RST1AgVEFCTEUgdDE7CisKKy0tZWNobyAjIEVuZCBvZiA1LjEgdGVzdHMKCj09
PSBtb2RpZmllZCBmaWxlICdzdHJpbmdzL2N0eXBlLWNwOTMyLmMnCi0tLSBhL3N0cmluZ3MvY3R5
cGUtY3A5MzIuYwkyMDA3LTExLTI5IDEwOjM1OjE1ICswMDAwCisrKyBiL3N0cmluZ3MvY3R5cGUt
Y3A5MzIuYwkyMDA5LTA1LTA1IDA2OjU1OjIyICswMDAwCkBAIC01NDg5LDEwICs1NDg5LDEwIEBA
IHN0YXRpYyBNWV9DSEFSU0VUX0hBTkRMRVIgbXlfY2hhcnNldF9oYW4KICAgbXlfbWJfd2NfY3A5
MzIsCS8qIG1iX3djICovCiAgIG15X3djX21iX2NwOTMyLAkvKiB3Y19tYiAqLwogICBteV9tYl9j
dHlwZV9tYiwKLSAgbXlfY2FzZXVwX3N0cl84Yml0LAotICBteV9jYXNlZG5fc3RyXzhiaXQsCi0g
IG15X2Nhc2V1cF84Yml0LAotICBteV9jYXNlZG5fOGJpdCwKKyAgbXlfY2FzZXVwX3N0cl9tYiwK
KyAgbXlfY2FzZWRuX3N0cl9tYiwKKyAgbXlfY2FzZXVwX21iLAorICBteV9jYXNlZG5fbWIsCiAg
IG15X3NucHJpbnRmXzhiaXQsCiAgIG15X2xvbmcxMF90b19zdHJfOGJpdCwKICAgbXlfbG9uZ2xv
bmcxMF90b19zdHJfOGJpdCwKCj09PSBtb2RpZmllZCBmaWxlICdzdHJpbmdzL2N0eXBlLXNqaXMu
YycKLS0tIGEvc3RyaW5ncy9jdHlwZS1zamlzLmMJMjAwNy0xMC0wNCAwNzoxMDoxNSArMDAwMAor
KysgYi9zdHJpbmdzL2N0eXBlLXNqaXMuYwkyMDA5LTA1LTA1IDA2OjU1OjIyICswMDAwCkBAIC00
NjUwLDEwICs0NjUwLDEwIEBAIHN0YXRpYyBNWV9DSEFSU0VUX0hBTkRMRVIgbXlfY2hhcnNldF9o
YW4KICAgbXlfbWJfd2Nfc2ppcywJLyogbWJfd2MgKi8KICAgbXlfd2NfbWJfc2ppcywJLyogd2Nf
bWIgKi8KICAgbXlfbWJfY3R5cGVfbWIsCi0gIG15X2Nhc2V1cF9zdHJfOGJpdCwKLSAgbXlfY2Fz
ZWRuX3N0cl84Yml0LAotICBteV9jYXNldXBfOGJpdCwKLSAgbXlfY2FzZWRuXzhiaXQsCisgIG15
X2Nhc2V1cF9zdHJfbWIsCisgIG15X2Nhc2Vkbl9zdHJfbWIsCisgIG15X2Nhc2V1cF9tYiwKKyAg
bXlfY2FzZWRuX21iLAogICBteV9zbnByaW50Zl84Yml0LAogICBteV9sb25nMTBfdG9fc3RyXzhi
aXQsCiAgIG15X2xvbmdsb25nMTBfdG9fc3RyXzhiaXQsCgo=

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bar@stripped
# target_branch: file:///home/bar/mysql-bzr/mysql-5.1.b44352/
# testament_sha1: 36b7ad4dad58692b98fd6d0e30ee2dabb1c74827
# timestamp: 2009-05-05 11:55:44 +0500
# base_revision_id: serg@stripped
# 
# Begin bundle
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


--===============1671346894==--