From: Date: November 20 2008 3:39pm Subject: bzr commit into mysql-5.0-bugteam branch (azundris:2719) Bug#39591 List-Archive: http://lists.mysql.com/commits/59390 X-Bug: 39591 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 I0F0IGZpbGU6Ly8vbWlzYy9teXNxbC9mb3Jlc3QvMzk1OTF2Mi81MC0zOTU5MXYyLwoKIDI3MTkg VGF0aWFuYSBBLiBOdXJuYmVyZwkyMDA4LTExLTIwCiAgICAgIEJ1ZyMzOTU5MTogQ3Jhc2ggaWYg dGFibGUgY29tbWVudCBpcyBsb25nZXIgdGhhbiA2MiBjaGFyYWN0ZXJzCiAgICAgIAogICAgICBJ dCB3YXMgcG9zc2libGUgdG8gY3Jhc2ggYSBteXNxbGQgYnVpbGQgd2l0aCBFWFRSQV9ERUJVRyB1 c2luZwogICAgICBDUkVBVEUgVEFCTEUgLi4uIENPTU1FTlQgd2l0aCBhIHNwZWNpYWxseS1jcmFm dGVkIFVURi04IHN0cmluZy4KICAgICAgCiAgICAgIFRoaXMgQ1MgcmVtb3ZlcyB0aGUgY2hlY2sg dGhhdCBjYXVzZWQgaXQgc2luY2UgaXQgbm8gbG9uZ2VyCiAgICAgIGFwcGxpZXMgaW4gY3VycmVu dCBzZXJ2ZXJzIGFueXdheSwgYW5kIGFkZHMgY29tbWVudHMgaW5zdGVhZAogICAgICB0byBhdm9p ZCBmdXR1cmUgY29uZnVzaW9uLiAKbW9kaWZpZWQ6CiAgbXlzcWwtdGVzdC9yL3N0cmljdC5yZXN1 bHQKICBteXNxbC10ZXN0L3Qvc3RyaWN0LnRlc3QKICBzcWwvdW5pcmVnLmNjCgpwZXItZmlsZSBt ZXNzYWdlczoKICBteXNxbC10ZXN0L3Ivc3RyaWN0LnJlc3VsdAogICAgVHJ5IHRvIGNyYXNoIG15 c3FsZCB3aXRoIGEgInN1aXRhYmxlIiBtdWx0aS1ieXRlICgzLWJ5dGUgVVRGLTgpIHN0cmluZwog ICAgZm9yIGEgdGFibGUgY29tbWVudC4KICBteXNxbC10ZXN0L3Qvc3RyaWN0LnRlc3QKICAgIFRy eSB0byBjcmFzaCBteXNxbGQgd2l0aCBhICJzdWl0YWJsZSIgbXVsdGktYnl0ZSAoMy1ieXRlIFVU Ri04KSBzdHJpbmcKICAgIGZvciBhIHRhYmxlIGNvbW1lbnQuCiAgc3FsL3VuaXJlZy5jYwogICAg VGFsayBhdCBsZW5ndGggYWJvdXQgbGltaXRzIGluIC5mcm0gZm9ybS1pbmZvLCBjaGFyYWN0ZXJz IHZzIGJ5dGVzLAogICAgaW5saW5lZCB2cyBleHRyYS1zZWdlbWVudCBUQUJMRS1DT01NRU5UUywg YW5kIHRoZSBkaWZmZXJlbmNlcyBpbgogICAgNi4wKyB2cyA8Ni4wIHdoZW4gaXQgY29tZXMgdG8g VVRGLTguCiAgICAKICAgIEFsc28sIHJlbW92ZSBhIGNoZWNrIHRoYXQgbm8gbG9uZ2VyIGFwcGxp ZXMgYW5kIHRoYXQgY291bGQgbGVhZCB0bwogICAgcHJvYmxlbXMgaW4gcGF0aG9sb2dpY2FsIGNh c2VzLgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3N0cmljdC5yZXN1bHQnCi0tLSBh L215c3FsLXRlc3Qvci9zdHJpY3QucmVzdWx0CTIwMDgtMDUtMDYgMTY6NDM6NDYgKzAwMDAKKysr IGIvbXlzcWwtdGVzdC9yL3N0cmljdC5yZXN1bHQJMjAwOC0xMS0yMCAxNDozOTozOSArMDAwMApA QCAtMTM0OCw2ICsxMzQ4LDEzIEBAIHQxCUNSRUFURSBUQUJMRSBgdDFgICgKICAgYGlgIGludCgx MSkgZGVmYXVsdCBOVUxMCiApIEVOR0lORT1NeUlTQU0gREVGQVVMVCBDSEFSU0VUPWxhdGluMSBD T01NRU5UPScxMjM0NTY3ODkqMTIzNDU2Nzg5KjEyMzQ1Njc4OSoxMjM0NTY3ODkqMTIzNDU2Nzg5 KjEyMzQ1Njc4OSonCiBkcm9wIHRhYmxlIHQxOworQ1JFQVRFIFRBQkxFIHQzIChmMSBJTlQpIENP TU1FTlQgJ8OXwpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OXwpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OX wpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OXwpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OXwpvDl8Knw5fC kcOXwpTDl8KXw5fCn8OXwpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OXwpvDl8Knw5fCkcOXwpTDl8KX w5fCn8OXwpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OXwpvDl8Knw5fCkcOXwpTDl8KXw5fCn8OXwpvD l8Knw5fCkcOXwpTDl8KXw5fCnyc7CitTSE9XIENSRUFURSBUQUJMRSB0MzsKK1RhYmxlCUNyZWF0 ZSBUYWJsZQordDMJQ1JFQVRFIFRBQkxFIGB0M2AgKAorICBgZjFgIGludCgxMSkgZGVmYXVsdCBO VUxMCispIEVOR0lORT1NeUlTQU0gREVGQVVMVCBDSEFSU0VUPWxhdGluMSBDT01NRU5UPSfDl8Kb w5fCp8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHD l8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHDl8KUw5fCl8OX wp/Dl8Kbw5fCp8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fC p8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHDl8KUw5fCl8OXwp/Dl8Kbw5fCp8OXwpHDl8KU w5fCl8OXwp8nCitEUk9QIFRBQkxFIHQzOwogc2V0IHNxbF9tb2RlPSAndHJhZGl0aW9uYWwnOwog Y3JlYXRlIHRhYmxlIHQxKGNvbDEgdGlueWludCwgY29sMiB0aW55aW50IHVuc2lnbmVkLCAKIGNv bDMgc21hbGxpbnQsIGNvbDQgc21hbGxpbnQgdW5zaWduZWQsCgo9PT0gbW9kaWZpZWQgZmlsZSAn bXlzcWwtdGVzdC90L3N0cmljdC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3Qvc3RyaWN0LnRlc3QJ MjAwNy0wNi0wMSAyMjo1NzoyNSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Qvc3RyaWN0LnRlc3QJ MjAwOC0xMS0yMCAxNDozOTozOSArMDAwMApAQCAtMTIwMCw2ICsxMjAwLDE1IEBAIHNob3cgY3Jl YXRlIHRhYmxlIHQxOwogZHJvcCB0YWJsZSB0MTsKIAogIworIyBCdWcgIzM5NTkxOiBDcmFzaCBp ZiB0YWJsZSBjb21tZW50IGlzIGxvbmdlciB0aGFuIDYyIGNoYXJhY3RlcnMKKyMKKworIzYwIGNo YXJzLCAxMjAgKCsxKSBieXRlcyAoVVRGLTggd2l0aCAyLWJ5dGUgY2hhcnMpCitDUkVBVEUgVEFC TEUgdDMgKGYxIElOVCkgQ09NTUVOVCAnw5fCm8OXwqfDl8KRw5fClMOXwpfDl8Kfw5fCm8OXwqfD l8KRw5fClMOXwpfDl8Kfw5fCm8OXwqfDl8KRw5fClMOXwpfDl8Kfw5fCm8OXwqfDl8KRw5fClMOX wpfDl8Kfw5fCm8OXwqfDl8KRw5fClMOXwpfDl8Kfw5fCm8OXwqfDl8KRw5fClMOXwpfDl8Kfw5fC m8OXwqfDl8KRw5fClMOXwpfDl8Kfw5fCm8OXwqfDl8KRw5fClMOXwpfDl8Kfw5fCm8OXwqfDl8KR w5fClMOXwpfDl8Kfw5fCm8OXwqfDl8KRw5fClMOXwpfDl8KfJzsKK1NIT1cgQ1JFQVRFIFRBQkxF IHQzOworRFJPUCBUQUJMRSB0MzsKKworIwogIyBCdWcgIzI2MzU5OiBTdHJpbmdzIGJlY29taW5n IHRydW5jYXRlZCBhbmQgY29udmVydGVkIHRvIG51bWJlcnMgdW5kZXIgU1RSSUNUIG1vZGUKICMK IHNldCBzcWxfbW9kZT0gJ3RyYWRpdGlvbmFsJzsKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvdW5p cmVnLmNjJwotLS0gYS9zcWwvdW5pcmVnLmNjCTIwMDctMTItMTcgMDg6NDU6MzYgKzAwMDAKKysr IGIvc3FsL3VuaXJlZy5jYwkyMDA4LTExLTIwIDE0OjM5OjM5ICswMDAwCkBAIC0xNDMsNiArMTQz LDI0IEBAIGJvb2wgbXlzcWxfY3JlYXRlX2ZybShUSEQgKnRoZCwgbXlfc3RyaW4KIAkJCSAgICAg KGNyZWF0ZV9pbmZvLT5taW5fcm93cyA9PSAxKSAmJiAoa2V5cyA9PSAwKSk7CiAgIGludDJzdG9y ZShmaWxlaW5mbysyOCxrZXlfaW5mb19sZW5ndGgpOwogCisgIC8qCisgICAgVGhpcyBnaXZlcyB1 cyB0aGUgYnl0ZS1wb3NpdGlvbiBvZiB0aGUgY2hhcmFjdGVyIGF0CisgICAgKGNoYXJhY3Rlci1w b3NpdGlvbiwgbm90IGJ5dGUtcG9zaXRpb24pIFRBQkxFX0NPTU1FTlRfTUFYTEVOLgorICAgIFRo ZSB0cmljayBoZXJlIGlzIHRoYXQgY2hhcmFjdGVyLXBvc2l0aW9ucyBzdGFydCBhdCAwLCBzbyB0 aGUgbGFzdAorICAgIGNoYXJhY3RlciBpbiBhIG1heGltdW0tYWxsb3dlZCBsZW5ndGggc3RyaW5n IHdvdWxkIGJlIGF0IGNoYXItcG9zCisgICAgTUFYTEVOLTE7IGNoYXJwb3MgTUFYTEVOIHdpbGwg YmUgdGhlIHBvc2l0aW9uIG9mIHRoZSB0ZXJtaW5hdG9yLgorICAgIENvbnNlcXVlbnRseSwgYnl0 ZXBvcyhjaGFycG9zKE1BWExFTikpIHNob3VsZCBiZSBlcXVhbCB0bworICAgIGNvbW1lbnRbbGVu Z3RoXSAod2hpY2ggc2hvdWxkIGFsc28gYmUgdGhlIHRlcm1pbmF0b3IsIG9yIGF0IGxlYXN0Cisg ICAgdGhlIGZpcnN0IGJ5dGUgYWZ0ZXIgdGhlIHBheWxvYWQgaW4gdGhlIHN0cmljdCBzZW5zZSku IElmIHRoaXMgaXMKKyAgICBub3Qgc28gKGJ5dGVwb3MoY2hhcnBvcyhNQVhMRU4pKSBjb21lcyAv YmVmb3JlLyB0aGUgZW5kIG9mIHRoZQorICAgIHN0cmluZyksIHRoZSBzdHJpbmcgaXMgdG9vIGxv bmcuCisKKyAgICBGb3IgYWRkaXRpb25hbCBjcmVkaXQsIHJlYWxpc2UgdGhhdCBVVEYtOCBoYXMg MS0zIGJ5dGVzIGJlZm9yZSA2LjAsCisgICAgYW5kIDEtNCBieXRlcyBpbiA2LjAgKDYuMCBhbHNv IGhhcyBVVEYtMzIpLiBUaGlzIG1lYW5zIHRoYXQgdGhlCisgICAgaW5saW5lZCBDT01NRU5UIHN1 cHBvc2VkbHkgZG9lcyBub3QgZXhjZWVkIDYwIGNoYXJhY3RlciBwbHVzCisgICAgdGVybWluYXRv ciwgdnVsZ28sIDE4MSBieXRlcy4KKyAgKi8KKwogICB0bXBfbGVuPSBzeXN0ZW1fY2hhcnNldF9p bmZvLT5jc2V0LT5jaGFycG9zKHN5c3RlbV9jaGFyc2V0X2luZm8sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3JlYXRlX2luZm8tPmNvbW1lbnQuc3RyLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNyZWF0ZV9pbmZv LT5jb21tZW50LnN0ciArCkBAIC0xNjUsMTQgKzE4Myw2IEBAIGJvb2wgbXlzcWxfY3JlYXRlX2Zy bShUSEQgKnRoZCwgbXlfc3RyaW4KICAgc3RybWFrZSgoY2hhciopIGZvcm1pbmZvKzQ3LCBjcmVh dGVfaW5mby0+Y29tbWVudC5zdHIgPwogICAgICAgICAgIGNyZWF0ZV9pbmZvLT5jb21tZW50LnN0 ciA6ICIiLCBjcmVhdGVfaW5mby0+Y29tbWVudC5sZW5ndGgpOwogICBmb3JtaW5mb1s0Nl09KHVj aGFyKSBjcmVhdGVfaW5mby0+Y29tbWVudC5sZW5ndGg7Ci0jaWZkZWYgRVhUUkFfREVCVUcKLSAg LyoKLSAgICBFWFRSQV9ERUJVRyBjYXVzZXMgc3RybWFrZSgpIHRvIGluaXRpYWxpemUgaXRzIGJ1 ZmZlciBiZWhpbmQgdGhlCi0gICAgcGF5bG9hZCB3aXRoIGEgbWFnaWMgdmFsdWUgdG8gZGV0ZWN0 IHdyb25nIGJ1ZmZlci1zaXplcy4gV2UKLSAgICBleHBsaWNpdGx5IHplcm8gdGhhdCBzZWdtZW50 IGFnYWluLgotICAqLwotICBtZW1zZXQoKGNoYXIqKSBmb3JtaW5mbys0NyArIGZvcm1pbmZvWzQ2 XSwgMCwgNjEgLSBmb3JtaW5mb1s0Nl0pOwotI2VuZGlmCiAgIGlmIChteV9wd3JpdGUoZmlsZSwo Ynl0ZSopIGZpbGVpbmZvLDY0LDBMLE1ZRl9SVykgfHwKICAgICAgIG15X3B3cml0ZShmaWxlLChi eXRlKikga2V5YnVmZixrZXlfaW5mb19sZW5ndGgsCiAJCSh1bG9uZykgdWludDJrb3JyKGZpbGVp bmZvKzYpLE1ZRl9SVykpCgo=