From: Alexander Barkov Date: May 4 2009 8:43am Subject: bzr commit into mysql-5.1-bugteam branch (bar:2891) Bug#44352 List-Archive: http://lists.mysql.com/commits/73277 X-Bug: 44352 Message-Id: <200905040843.n448hTPt005989@bar.myoffice.izhnet.ru> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1978704413==" --===============1978704413== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9iYXIvbXlzcWwtYnpyL215c3FsLTUuMS5iNDQzNTIvIGJhc2VkIG9u IHJldmlkOnNlcmdlLmtvemxvdkBzdW4uY29tLTIwMDkwNTAyMTkyODU0LW51ZDlhemZodTJybXdl bHMKCiAyODkxIEFsZXhhbmRlciBCYXJrb3YJMjAwOS0wNS0wNAogICAgICBCdWcjNDQzNTIgVVBQ RVIvTE9XRVIgZnVuY3Rpb24gZG9lc24ndCB3b3JrIGNvcnJlY3RseSBvbiBjcDkzMiBhbmQgc2pp cyBlbnZpcm9ubWVudC4KICAgICAgUHJvYmxlbTogY2FzZSBjb252ZXJzaW9uIGVycm9uZW91c2x5 IGNoYW5nZXMgdGhlIHNlY29uZCBieXRlcwogICAgICBvZiBtdWx0aS1ieXRlIHNlcXVlbmNlcyBi ZWNhdXNlIHNpbmdsZS1ieXRlIGZ1bmN0aW9ucyB3ZXJlIAogICAgICBjYWxsZWQgaW4gYSBtaXN0 YWtlLgogICAgICBGaXg6IGNhbGwgbXVsdGktYnl0ZSBhd2FyZSBmdW5jdGlvbnMgaW5zdGVhZC4K ICAgICBAIG15c3FsLXRlc3Qvci9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnJlc3VsdAogICAgICAg IEFkZGluZyB0ZXN0CiAgICAgQCBteXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1bHQKICAgICAg ICBBZGRpbmcgdGVzdAogICAgIEAgbXlzcWwtdGVzdC90L2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0u dGVzdAogICAgICAgIEFkZGluZyB0ZXN0CiAgICAgQCBteXNxbC10ZXN0L3QvY3R5cGVfc2ppcy50 ZXN0CiAgICAgICAgQWRkaW5nIHRlc3QKICAgICBAIHN0cmluZ3MvY3R5cGUtY3A5MzIuYwogICAg ICAgIEZpeGluZyBmdW5jdGlvbnMKICAgICBAIHN0cmluZ3MvY3R5cGUtc2ppcy5jCiAgICAgICAg Rml4aW5nIGZ1bmN0aW9ucwoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvY3R5cGVf Y3A5MzJfYmlubG9nX3N0bS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX3NqaXMucmVz dWx0CiAgICAgIG15c3FsLXRlc3QvdC9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnRlc3QKICAgICAg bXlzcWwtdGVzdC90L2N0eXBlX3NqaXMudGVzdAogICAgICBzdHJpbmdzL2N0eXBlLWNwOTMyLmMK ICAgICAgc3RyaW5ncy9jdHlwZS1zamlzLmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qv ci9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL2N0eXBl X2NwOTMyX2JpbmxvZ19zdG0ucmVzdWx0CTIwMDgtMTAtMDIgMDU6NTY6MDcgKzAwMDAKKysrIGIv bXlzcWwtdGVzdC9yL2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0ucmVzdWx0CTIwMDktMDUtMDQgMDg6 NDM6MTYgKzAwMDAKQEAgLTQ2LDQgKzQ2LDEyIEBAIG1hc3Rlci1iaW4uMDAwMDAxCTExMzcJUXVl cnkJMQkxMjE2CXVzZSAKIEVuZCBvZiA1LjAgdGVzdHMKIFNIT1cgQklOTE9HIEVWRU5UUyBGUk9N IDM2NDsKIEVSUk9SIEhZMDAwOiBFcnJvciB3aGVuIGV4ZWN1dGluZyBjb21tYW5kIFNIT1cgQklO TE9HIEVWRU5UUzogV3Jvbmcgb2Zmc2V0IG9yIEkvTyBlcnJvcgorQnVnIzQ0MzUyIFVQUEVSL0xP V0VSIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgb24gY3A5MzIgYW5kIHNqaXMgZW52 aXJvbm1lbnQuCitDUkVBVEUgVEFCTEUgdDEgKGEgdmFyY2hhcigxNikpIGNoYXJhY3RlciBzZXQg Y3A5MzI7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDB4ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsK K1NFTEVDVCBoZXgoYSksIGhleChsb3dlcihhKSksIGhleCh1cHBlcihhKSkgRlJPTSB0MSBPUkRF UiBCWSBiaW5hcnkoYSk7CitoZXgoYSkJaGV4KGxvd2VyKGEpKQloZXgodXBwZXIoYSkpCis4MzUy ODM1RQk4MzUyODM1RQk4MzUyODM1RQorODM3MjgzNUUJODM3MjgzNUUJODM3MjgzNUUKK0RST1Ag VEFCTEUgdDE7CiBFbmQgb2YgNS4xIHRlc3RzCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVz dC9yL2N0eXBlX3NqaXMucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvY3R5cGVfc2ppcy5yZXN1 bHQJMjAwOC0wMi0yMCAxODo0OToyNiArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvY3R5cGVfc2pp cy5yZXN1bHQJMjAwOS0wNS0wNCAwODo0MzoxNiArMDAwMApAQCAtMjA5LDMgKzIwOSwxMyBAQCBT RVQgTkFNRVMgc2ppczsKIFNFTEVDVCBIRVgoJ8KNwrLCk8KRwoFAwoxcJykgRlJPTSBEVUFMOwog SEVYKCfCjcKywpPCkcKBQMKMXCcpCiA4REIyOTM5MTgxNDA4QzVDCisjIFN0YXJ0IG9mIDUuMSB0 ZXN0cworQnVnIzQ0MzUyIFVQUEVSL0xPV0VSIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayBjb3JyZWN0 bHkgb24gY3A5MzIgYW5kIHNqaXMgZW52aXJvbm1lbnQuCitDUkVBVEUgVEFCTEUgdDEgKGEgdmFy Y2hhcigxNikpIGNoYXJhY3RlciBzZXQgY3A5MzI7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDB4 ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsKK1NFTEVDVCBoZXgoYSksIGhleChsb3dlcihhKSksIGhl eCh1cHBlcihhKSkgRlJPTSB0MSBPUkRFUiBCWSBiaW5hcnkoYSk7CitoZXgoYSkJaGV4KGxvd2Vy KGEpKQloZXgodXBwZXIoYSkpCis4MzUyODM1RQk4MzUyODM1RQk4MzUyODM1RQorODM3MjgzNUUJ ODM3MjgzNUUJODM3MjgzNUUKK0RST1AgVEFCTEUgdDE7CisjIEVuZCBvZiA1LjEgdGVzdHMKCj09 PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlubG9nX3N0bS50ZXN0 JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlubG9nX3N0bS50ZXN0CTIwMDctMDUt MzAgMTA6MjM6NDcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2N0eXBlX2NwOTMyX2JpbmxvZ19z dG0udGVzdAkyMDA5LTA1LTA0IDA4OjQzOjE2ICswMDAwCkBAIC0zNCw0ICszNCwxMCBAQCBkZWxp bWl0ZXIgO3wKIC0tZXJyb3IgMTIyMAogU0hPVyBCSU5MT0cgRVZFTlRTIEZST00gMzY0OwogCist LWVjaG8gQnVnIzQ0MzUyIFVQUEVSL0xPV0VSIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayBjb3JyZWN0 bHkgb24gY3A5MzIgYW5kIHNqaXMgZW52aXJvbm1lbnQuCitDUkVBVEUgVEFCTEUgdDEgKGEgdmFy Y2hhcigxNikpIGNoYXJhY3RlciBzZXQgY3A5MzI7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDB4 ODM3MjgzNUUpLCgweDgzNTI4MzVFKTsKK1NFTEVDVCBoZXgoYSksIGhleChsb3dlcihhKSksIGhl eCh1cHBlcihhKSkgRlJPTSB0MSBPUkRFUiBCWSBiaW5hcnkoYSk7CitEUk9QIFRBQkxFIHQxOwor CiAtLWVjaG8gRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qv dC9jdHlwZV9zamlzLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9jdHlwZV9zamlzLnRlc3QJMjAw OC0wMi0yMCAxODo0OToyNiArMDAwMAorKysgYi9teXNxbC10ZXN0L3QvY3R5cGVfc2ppcy50ZXN0 CTIwMDktMDUtMDQgMDg6NDM6MTYgKzAwMDAKQEAgLTgzLDMgKzgzLDEzIEBAIFNFVCBOQU1FUyBz amlzOwogU0VMRUNUIEhFWCgnwo3CssKTwpHCgUDCjFwnKSBGUk9NIERVQUw7CiAKICMgRW5kIG9m IDQuMSB0ZXN0cworCistLWVjaG8gIyBTdGFydCBvZiA1LjEgdGVzdHMKKworLS1lY2hvIEJ1ZyM0 NDM1MiBVUFBFUi9MT1dFUiBmdW5jdGlvbiBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IG9uIGNwOTMy IGFuZCBzamlzIGVudmlyb25tZW50LgorQ1JFQVRFIFRBQkxFIHQxIChhIHZhcmNoYXIoMTYpKSBj aGFyYWN0ZXIgc2V0IGNwOTMyOworSU5TRVJUIElOVE8gdDEgVkFMVUVTICgweDgzNzI4MzVFKSwo MHg4MzUyODM1RSk7CitTRUxFQ1QgaGV4KGEpLCBoZXgobG93ZXIoYSkpLCBoZXgodXBwZXIoYSkp IEZST00gdDEgT1JERVIgQlkgYmluYXJ5KGEpOworRFJPUCBUQUJMRSB0MTsKKworLS1lY2hvICMg RW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0cmluZ3MvY3R5cGUtY3A5MzIu YycKLS0tIGEvc3RyaW5ncy9jdHlwZS1jcDkzMi5jCTIwMDctMTEtMjkgMTA6MzU6MTUgKzAwMDAK KysrIGIvc3RyaW5ncy9jdHlwZS1jcDkzMi5jCTIwMDktMDUtMDQgMDg6NDM6MTYgKzAwMDAKQEAg LTU0ODksMTAgKzU0ODksMTAgQEAgc3RhdGljIE1ZX0NIQVJTRVRfSEFORExFUiBteV9jaGFyc2V0 X2hhbgogICBteV9tYl93Y19jcDkzMiwJLyogbWJfd2MgKi8KICAgbXlfd2NfbWJfY3A5MzIsCS8q IHdjX21iICovCiAgIG15X21iX2N0eXBlX21iLAotICBteV9jYXNldXBfc3RyXzhiaXQsCi0gIG15 X2Nhc2Vkbl9zdHJfOGJpdCwKLSAgbXlfY2FzZXVwXzhiaXQsCi0gIG15X2Nhc2Vkbl84Yml0LAor ICBteV9jYXNldXBfc3RyX21iLAorICBteV9jYXNlZG5fc3RyX21iLAorICBteV9jYXNldXBfbWIs CisgIG15X2Nhc2Vkbl9tYiwKICAgbXlfc25wcmludGZfOGJpdCwKICAgbXlfbG9uZzEwX3RvX3N0 cl84Yml0LAogICBteV9sb25nbG9uZzEwX3RvX3N0cl84Yml0LAoKPT09IG1vZGlmaWVkIGZpbGUg J3N0cmluZ3MvY3R5cGUtc2ppcy5jJwotLS0gYS9zdHJpbmdzL2N0eXBlLXNqaXMuYwkyMDA3LTEw LTA0IDA3OjEwOjE1ICswMDAwCisrKyBiL3N0cmluZ3MvY3R5cGUtc2ppcy5jCTIwMDktMDUtMDQg MDg6NDM6MTYgKzAwMDAKQEAgLTQ2NTAsMTAgKzQ2NTAsMTAgQEAgc3RhdGljIE1ZX0NIQVJTRVRf SEFORExFUiBteV9jaGFyc2V0X2hhbgogICBteV9tYl93Y19zamlzLAkvKiBtYl93YyAqLwogICBt eV93Y19tYl9zamlzLAkvKiB3Y19tYiAqLwogICBteV9tYl9jdHlwZV9tYiwKLSAgbXlfY2FzZXVw X3N0cl84Yml0LAotICBteV9jYXNlZG5fc3RyXzhiaXQsCi0gIG15X2Nhc2V1cF84Yml0LAotICBt eV9jYXNlZG5fOGJpdCwKKyAgbXlfY2FzZXVwX3N0cl9tYiwKKyAgbXlfY2FzZWRuX3N0cl9tYiwK KyAgbXlfY2FzZXVwX21iLAorICBteV9jYXNlZG5fbWIsCiAgIG15X3NucHJpbnRmXzhiaXQsCiAg IG15X2xvbmcxMF90b19zdHJfOGJpdCwKICAgbXlfbG9uZ2xvbmcxMF90b19zdHJfOGJpdCwKCg== --===============1978704413== 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: b415e747d7e2b00b4ff7600f1360c23f3065d07a # timestamp: 2009-05-04 13:43:29 +0500 # base_revision_id: serge.kozlov@stripped\ # nud9azfhu2rmwels # # Begin bundle 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 --===============1978704413==--