From: Alexander Barkov
Date: May 4 2009 8:56am
Subject: bzr commit into mysql-5.1-bugteam branch (bar:2891) Bug#44352
List-Archive: http://lists.mysql.com/commits/73279
X-Bug: 44352
Message-Id: <200905040857.n448v3SQ006914@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1796198354=="

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

I0F0IGZpbGU6Ly8vaG9tZS9iYXIvbXlzcWwtYnpyL215c3FsLTUuMS5iNDQzNTIvIGJhc2VkIG9u
IHJldmlkOnNlcmdlLmtvemxvdkBzdW4uY29tLTIwMDkwNTAyMTkyODU0LW51ZDlhemZodTJybXdl
bHMKCiAyODkxIEFsZXhhbmRlciBCYXJrb3YJMjAwOS0wNS0wNAogICAgICBCdWcjNDQzNTIgVVBQ
RVIvTE9XRVIgZnVuY3Rpb24gZG9lc24ndCB3b3JrIGNvcnJlY3RseSBvbiBjcDkzMiBhbmQgc2pp
cyBlbnZpcm9ubWVudC4KICAgICAgUHJvYmxlbTogY2FzZSBjb252ZXJzaW9uIGVycm9uZW91c2x5
IGNoYW5nZXMgdGhlIHNlY29uZCBieXRlcwogICAgICBvZiBtdWx0aS1ieXRlIHNlcXVlbmNlcyBi
ZWNhdXNlIHNpbmdsZS1ieXRlIGZ1bmN0aW9ucyB3ZXJlCiAgICAgIGNhbGxlZCBpbiBhIG1pc3Rh
a2UuCiAgICAgIEZpeDogY2FsbCBtdWx0aS1ieXRlIGF3YXJlIGZ1bmN0aW9ucyBpbnN0ZWFkLgog
ICAgIEAgbXlzcWwtdGVzdC9yL2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0ucmVzdWx0CiAgICAgICAg
QWRkaW5nIHRlc3RzCiAgICAgQCBteXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1bHQKICAgICAg
ICBBZGRpbmcgdGVzdHMKICAgICBAIG15c3FsLXRlc3QvdC9jdHlwZV9jcDkzMl9iaW5sb2dfc3Rt
LnRlc3QKICAgICAgICBBZGRpbmcgdGVzdHMKICAgICBAIG15c3FsLXRlc3QvdC9jdHlwZV9zamlz
LnRlc3QKICAgICAgICBBZGRpbmcgdGVzdHMKICAgICBAIHN0cmluZ3MvY3R5cGUtY3A5MzIuYwog
ICAgICAgIEZpeGluZyBmdW5jdGlvbiBwb2ludGVycwogICAgIEAgc3RyaW5ncy9jdHlwZS1zamlz
LmMKICAgICAgICBGaXhpbmcgZnVuY3Rpb24gcG9pbnRlcnMKCiAgICBtb2RpZmllZDoKICAgICAg
bXlzcWwtdGVzdC9yL2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0ucmVzdWx0CiAgICAgIG15c3FsLXRl
c3Qvci9jdHlwZV9zamlzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlu
bG9nX3N0bS50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9jdHlwZV9zamlzLnRlc3QKICAgICAgc3Ry
aW5ncy9jdHlwZS1jcDkzMi5jCiAgICAgIHN0cmluZ3MvY3R5cGUtc2ppcy5jCj09PSBtb2RpZmll
ZCBmaWxlICdteXNxbC10ZXN0L3IvY3R5cGVfY3A5MzJfYmlubG9nX3N0bS5yZXN1bHQnCi0tLSBh
L215c3FsLXRlc3Qvci9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnJlc3VsdAkyMDA4LTEwLTAyIDA1
OjU2OjA3ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnJl
c3VsdAkyMDA5LTA1LTA0IDA4OjU2OjUwICswMDAwCkBAIC00Niw0ICs0NiwxMiBAQCBtYXN0ZXIt
YmluLjAwMDAwMQkxMTM3CVF1ZXJ5CTEJMTIxNgl1c2UgCiBFbmQgb2YgNS4wIHRlc3RzCiBTSE9X
IEJJTkxPRyBFVkVOVFMgRlJPTSAzNjQ7CiBFUlJPUiBIWTAwMDogRXJyb3Igd2hlbiBleGVjdXRp
bmcgY29tbWFuZCBTSE9XIEJJTkxPRyBFVkVOVFM6IFdyb25nIG9mZnNldCBvciBJL08gZXJyb3IK
K0J1ZyM0NDM1MiBVUFBFUi9MT1dFUiBmdW5jdGlvbiBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IG9u
IGNwOTMyIGFuZCBzamlzIGVudmlyb25tZW50LgorQ1JFQVRFIFRBQkxFIHQxIChhIHZhcmNoYXIo
MTYpKSBjaGFyYWN0ZXIgc2V0IGNwOTMyOworSU5TRVJUIElOVE8gdDEgVkFMVUVTICgweDgzNzI4
MzVFKSwoMHg4MzUyODM1RSk7CitTRUxFQ1QgaGV4KGEpLCBoZXgobG93ZXIoYSkpLCBoZXgodXBw
ZXIoYSkpIEZST00gdDEgT1JERVIgQlkgYmluYXJ5KGEpOworaGV4KGEpCWhleChsb3dlcihhKSkJ
aGV4KHVwcGVyKGEpKQorODM1MjgzNUUJODM1MjgzNUUJODM1MjgzNUUKKzgzNzI4MzVFCTgzNzI4
MzVFCTgzNzI4MzVFCitEUk9QIFRBQkxFIHQxOwogRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlm
aWVkIGZpbGUgJ215c3FsLXRlc3Qvci9jdHlwZV9zamlzLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVz
dC9yL2N0eXBlX3NqaXMucmVzdWx0CTIwMDgtMDItMjAgMTg6NDk6MjYgKzAwMDAKKysrIGIvbXlz
cWwtdGVzdC9yL2N0eXBlX3NqaXMucmVzdWx0CTIwMDktMDUtMDQgMDg6NTY6NTAgKzAwMDAKQEAg
LTIwOSwzICsyMDksMTMgQEAgU0VUIE5BTUVTIHNqaXM7CiBTRUxFQ1QgSEVYKCfCjcKywpPCkcKB
QMKMXCcpIEZST00gRFVBTDsKIEhFWCgnwo3CssKTwpHCgUDCjFwnKQogOERCMjkzOTE4MTQwOEM1
QworIyBTdGFydCBvZiA1LjEgdGVzdHMKK0J1ZyM0NDM1MiBVUFBFUi9MT1dFUiBmdW5jdGlvbiBk
b2Vzbid0IHdvcmsgY29ycmVjdGx5IG9uIGNwOTMyIGFuZCBzamlzIGVudmlyb25tZW50LgorQ1JF
QVRFIFRBQkxFIHQxIChhIHZhcmNoYXIoMTYpKSBjaGFyYWN0ZXIgc2V0IHNqaXM7CitJTlNFUlQg
SU5UTyB0MSBWQUxVRVMgKDB4ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsKK1NFTEVDVCBoZXgoYSks
IGhleChsb3dlcihhKSksIGhleCh1cHBlcihhKSkgRlJPTSB0MSBPUkRFUiBCWSBiaW5hcnkoYSk7
CitoZXgoYSkJaGV4KGxvd2VyKGEpKQloZXgodXBwZXIoYSkpCis4MzUyODM1RQk4MzUyODM1RQk4
MzUyODM1RQorODM3MjgzNUUJODM3MjgzNUUJODM3MjgzNUUKK0RST1AgVEFCTEUgdDE7CisjIEVu
ZCBvZiA1LjEgdGVzdHMKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVfY3A5
MzJfYmlubG9nX3N0bS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlubG9n
X3N0bS50ZXN0CTIwMDctMDUtMzAgMTA6MjM6NDcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0
eXBlX2NwOTMyX2JpbmxvZ19zdG0udGVzdAkyMDA5LTA1LTA0IDA4OjU2OjUwICswMDAwCkBAIC0z
NCw0ICszNCwxMCBAQCBkZWxpbWl0ZXIgO3wKIC0tZXJyb3IgMTIyMAogU0hPVyBCSU5MT0cgRVZF
TlRTIEZST00gMzY0OwogCistLWVjaG8gQnVnIzQ0MzUyIFVQUEVSL0xPV0VSIGZ1bmN0aW9uIGRv
ZXNuJ3Qgd29yayBjb3JyZWN0bHkgb24gY3A5MzIgYW5kIHNqaXMgZW52aXJvbm1lbnQuCitDUkVB
VEUgVEFCTEUgdDEgKGEgdmFyY2hhcigxNikpIGNoYXJhY3RlciBzZXQgY3A5MzI7CitJTlNFUlQg
SU5UTyB0MSBWQUxVRVMgKDB4ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsKK1NFTEVDVCBoZXgoYSks
IGhleChsb3dlcihhKSksIGhleCh1cHBlcihhKSkgRlJPTSB0MSBPUkRFUiBCWSBiaW5hcnkoYSk7
CitEUk9QIFRBQkxFIHQxOworCiAtLWVjaG8gRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlmaWVk
IGZpbGUgJ215c3FsLXRlc3QvdC9jdHlwZV9zamlzLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9j
dHlwZV9zamlzLnRlc3QJMjAwOC0wMi0yMCAxODo0OToyNiArMDAwMAorKysgYi9teXNxbC10ZXN0
L3QvY3R5cGVfc2ppcy50ZXN0CTIwMDktMDUtMDQgMDg6NTY6NTAgKzAwMDAKQEAgLTgzLDMgKzgz
LDEzIEBAIFNFVCBOQU1FUyBzamlzOwogU0VMRUNUIEhFWCgnwo3CssKTwpHCgUDCjFwnKSBGUk9N
IERVQUw7CiAKICMgRW5kIG9mIDQuMSB0ZXN0cworCistLWVjaG8gIyBTdGFydCBvZiA1LjEgdGVz
dHMKKworLS1lY2hvIEJ1ZyM0NDM1MiBVUFBFUi9MT1dFUiBmdW5jdGlvbiBkb2Vzbid0IHdvcmsg
Y29ycmVjdGx5IG9uIGNwOTMyIGFuZCBzamlzIGVudmlyb25tZW50LgorQ1JFQVRFIFRBQkxFIHQx
IChhIHZhcmNoYXIoMTYpKSBjaGFyYWN0ZXIgc2V0IHNqaXM7CitJTlNFUlQgSU5UTyB0MSBWQUxV
RVMgKDB4ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsKK1NFTEVDVCBoZXgoYSksIGhleChsb3dlcihh
KSksIGhleCh1cHBlcihhKSkgRlJPTSB0MSBPUkRFUiBCWSBiaW5hcnkoYSk7CitEUk9QIFRBQkxF
IHQxOworCistLWVjaG8gIyBFbmQgb2YgNS4xIHRlc3RzCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Ry
aW5ncy9jdHlwZS1jcDkzMi5jJwotLS0gYS9zdHJpbmdzL2N0eXBlLWNwOTMyLmMJMjAwNy0xMS0y
OSAxMDozNToxNSArMDAwMAorKysgYi9zdHJpbmdzL2N0eXBlLWNwOTMyLmMJMjAwOS0wNS0wNCAw
ODo1Njo1MCArMDAwMApAQCAtNTQ4OSwxMCArNTQ4OSwxMCBAQCBzdGF0aWMgTVlfQ0hBUlNFVF9I
QU5ETEVSIG15X2NoYXJzZXRfaGFuCiAgIG15X21iX3djX2NwOTMyLAkvKiBtYl93YyAqLwogICBt
eV93Y19tYl9jcDkzMiwJLyogd2NfbWIgKi8KICAgbXlfbWJfY3R5cGVfbWIsCi0gIG15X2Nhc2V1
cF9zdHJfOGJpdCwKLSAgbXlfY2FzZWRuX3N0cl84Yml0LAotICBteV9jYXNldXBfOGJpdCwKLSAg
bXlfY2FzZWRuXzhiaXQsCisgIG15X2Nhc2V1cF9zdHJfbWIsCisgIG15X2Nhc2Vkbl9zdHJfbWIs
CisgIG15X2Nhc2V1cF9tYiwKKyAgbXlfY2FzZWRuX21iLAogICBteV9zbnByaW50Zl84Yml0LAog
ICBteV9sb25nMTBfdG9fc3RyXzhiaXQsCiAgIG15X2xvbmdsb25nMTBfdG9fc3RyXzhiaXQsCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RyaW5ncy9jdHlwZS1zamlzLmMnCi0tLSBhL3N0cmluZ3MvY3R5
cGUtc2ppcy5jCTIwMDctMTAtMDQgMDc6MTA6MTUgKzAwMDAKKysrIGIvc3RyaW5ncy9jdHlwZS1z
amlzLmMJMjAwOS0wNS0wNCAwODo1Njo1MCArMDAwMApAQCAtNDY1MCwxMCArNDY1MCwxMCBAQCBz
dGF0aWMgTVlfQ0hBUlNFVF9IQU5ETEVSIG15X2NoYXJzZXRfaGFuCiAgIG15X21iX3djX3NqaXMs
CS8qIG1iX3djICovCiAgIG15X3djX21iX3NqaXMsCS8qIHdjX21iICovCiAgIG15X21iX2N0eXBl
X21iLAotICBteV9jYXNldXBfc3RyXzhiaXQsCi0gIG15X2Nhc2Vkbl9zdHJfOGJpdCwKLSAgbXlf
Y2FzZXVwXzhiaXQsCi0gIG15X2Nhc2Vkbl84Yml0LAorICBteV9jYXNldXBfc3RyX21iLAorICBt
eV9jYXNlZG5fc3RyX21iLAorICBteV9jYXNldXBfbWIsCisgIG15X2Nhc2Vkbl9tYiwKICAgbXlf
c25wcmludGZfOGJpdCwKICAgbXlfbG9uZzEwX3RvX3N0cl84Yml0LAogICBteV9sb25nbG9uZzEw
X3RvX3N0cl84Yml0LAoK

--===============1796198354==
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: 6d1425eaf763584fa3b0e0855eca0d37cf1355e3
# timestamp: 2009-05-04 13:57:03 +0500
# base_revision_id: serge.kozlov@stripped\
#   nud9azfhu2rmwels
# 
# Begin bundle
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


--===============1796198354==--