From: Date: July 14 2008 5:33pm Subject: bzr commit into mysql-6.0-backup branch (ingo.struewing:2662) Bug#38045 List-Archive: http://lists.mysql.com/commits/49689 X-Bug: 38045 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 I0F0IGZpbGU6Ly8vaG9tZTIvbXlkZXYvYnpycm9vdC9teXNxbC02LjAtYmFja3VwLW1lcmdlLwoK IDI2NjIgSW5nbyBTdHJ1ZXdpbmcJMjAwOC0wNy0xNAogICAgICBCdWcjMzgwNDUgLSBCYWNrdXAs IE15SVNBTSBhbmQgZmlsZSBzeXN0ZW0gZW5jb2RpbmcKICAgICAgCiAgICAgIFRhYmxlIG5hbWVz IHdpdGggbm9uLUFTQ0lJIGNoYXJhY3RlcnMgY291bGQgbm90IGJlIGJhY2tlZCB1cC4KICAgICAg CiAgICAgIFRoZSBNeUlTQU0gbmF0aXZlIGJhY2t1cCBkcml2ZXIgdXNlZCB0aGUgb3JpZ2luYWws IG5vbi10cmFuc2xhdGVkIHRhYmxlIG5hbWUuCiAgICAgIAogICAgICBGaXhlZCBieSB1c2luZyB0 aGUgdHJhbnNsYXRlZCBuYW1lLgptb2RpZmllZDoKICBteXNxbC10ZXN0L3IvYmFja3VwX215aXNh bTIucmVzdWx0CiAgbXlzcWwtdGVzdC90L2JhY2t1cF9teWlzYW0yLnRlc3QKICBzdG9yYWdlL215 aXNhbS9teWlzYW1fYmFja3VwX2VuZ2luZS5jYwoKcGVyLWZpbGUgbWVzc2FnZXM6CiAgbXlzcWwt dGVzdC9yL2JhY2t1cF9teWlzYW0yLnJlc3VsdAogICAgQnVnIzM4MDQ1IC0gQmFja3VwLCBNeUlT QU0gYW5kIGZpbGUgc3lzdGVtIGVuY29kaW5nCiAgICBBZGRlZCB0ZXN0IHJlc3VsdC4KICBteXNx bC10ZXN0L3QvYmFja3VwX215aXNhbTIudGVzdAogICAgQnVnIzM4MDQ1IC0gQmFja3VwLCBNeUlT QU0gYW5kIGZpbGUgc3lzdGVtIGVuY29kaW5nCiAgICBBZGRlZCB0ZXN0LgogIHN0b3JhZ2UvbXlp c2FtL215aXNhbV9iYWNrdXBfZW5naW5lLmNjCiAgICBVc2luZyB0cmFuc2xhdGVkIHRhYmxlIG5h bWVzLgogICAgU2ltcGxpZmllZCBzdHJpbmcgY29weS4KICAgIEFkZGVkIGVycm9yIGRldGVjdGlv biBmb3Igc3RyaW5nIGNvcHkuCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvYmFja3Vw X215aXNhbTIucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvYmFja3VwX215aXNhbTIucmVzdWx0 CTIwMDgtMDctMDIgMDc6NTM6MzQgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL2JhY2t1cF9teWlz YW0yLnJlc3VsdAkyMDA4LTA3LTE0IDE1OjMzOjAzICswMDAwCkBAIC01Niw2ICs1NiwxOCBAQCBU YWJsZQlDaGVja3N1bQogbXlzcWx0ZXN0LnQxCTE3MjgwNjkzMDgKIAogY29ubmVjdGlvbiBkZWZh dWx0OiBjbGVhbnVwCitTRVQgREVCVUdfU1lOQz0gJ1JFU0VUJzsKKworIworIyBCdWcjMzgwNDUg LSBCYWNrdXAsIE15SVNBTSBhbmQgZmlsZSBzeXN0ZW0gZW5jb2RpbmcKKyMKK0NSRUFURSBUQUJM RSBgw6TDtsO8w5/Co8OlYCAoaWQgU0VSSUFMKSBFTkdJTkU9TXlJU0FNOworQkFDS1VQIERBVEFC QVNFIG15c3FsdGVzdCBUTyAndGVzdC5iYSc7CitiYWNrdXBfaWQKKyMKK0RST1AgVEFCTEUgYMOk w7bDvMOfwqPDpWA7CisKKyMgZmluYWwgY2xlYW51cAogVVNFIHRlc3Q7CiBEUk9QIERBVEFCQVNF IG15c3FsdGVzdDsKIFNFVCBERUJVR19TWU5DPSAnUkVTRVQnOwoKPT09IG1vZGlmaWVkIGZpbGUg J215c3FsLXRlc3QvdC9iYWNrdXBfbXlpc2FtMi50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvYmFj a3VwX215aXNhbTIudGVzdAkyMDA4LTA3LTAyIDA3OjUzOjM0ICswMDAwCisrKyBiL215c3FsLXRl c3QvdC9iYWNrdXBfbXlpc2FtMi50ZXN0CTIwMDgtMDctMTQgMTU6MzM6MDMgKzAwMDAKQEAgLTc1 LDE0ICs3NSwzMCBAQCBTRVQgREVCVUdfU1lOQz0gJ25vdyBTSUdOQUwgYnVwX2ZpbmlzaCc7CiAK ICAgICBkaXNjb25uZWN0IGJhY2t1cDsKIAorLS1lY2hvCistLWVjaG8gY29ubmVjdGlvbiBkZWZh dWx0OiBjbGVhbnVwCitjb25uZWN0aW9uIGRlZmF1bHQ7CistLXJlbW92ZV9maWxlICRNWVNRTFRF U1RfVkFSRElSL21hc3Rlci1kYXRhL3Rlc3QuYmEKK1NFVCBERUJVR19TWU5DPSAnUkVTRVQnOwor CisKKy0tZWNobworLS1lY2hvICMKKy0tZWNobyAjIEJ1ZyMzODA0NSAtIEJhY2t1cCwgTXlJU0FN IGFuZCBmaWxlIHN5c3RlbSBlbmNvZGluZworLS1lY2hvICMKK0NSRUFURSBUQUJMRSBgw6TDtsO8 w5/Co8OlYCAoaWQgU0VSSUFMKSBFTkdJTkU9TXlJU0FNOworLS1yZXBsYWNlX2NvbHVtbiAxICMK K0JBQ0tVUCBEQVRBQkFTRSBteXNxbHRlc3QgVE8gJ3Rlc3QuYmEnOworRFJPUCBUQUJMRSBgw6TD tsO8w5/Co8OlYDsKKy0tcmVtb3ZlX2ZpbGUgJE1ZU1FMVEVTVF9WQVJESVIvbWFzdGVyLWRhdGEv dGVzdC5iYQorCisKICMKICMgQ2xlYW51cCBmcm9tIHRoaXMgdGVzdCBjYXNlCiAjCiAtLWVjaG8K LS0tZWNobyBjb25uZWN0aW9uIGRlZmF1bHQ6IGNsZWFudXAKLWNvbm5lY3Rpb24gZGVmYXVsdDsK Ky0tZWNobyAjIGZpbmFsIGNsZWFudXAKIFVTRSB0ZXN0OwogRFJPUCBEQVRBQkFTRSBteXNxbHRl c3Q7Ci0tLXJlbW92ZV9maWxlICRNWVNRTFRFU1RfVkFSRElSL21hc3Rlci1kYXRhL3Rlc3QuYmEK IFNFVCBERUJVR19TWU5DPSAnUkVTRVQnOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9t eWlzYW0vbXlpc2FtX2JhY2t1cF9lbmdpbmUuY2MnCi0tLSBhL3N0b3JhZ2UvbXlpc2FtL215aXNh bV9iYWNrdXBfZW5naW5lLmNjCTIwMDgtMDctMDggMjA6MTg6MTAgKzAwMDAKKysrIGIvc3RvcmFn ZS9teWlzYW0vbXlpc2FtX2JhY2t1cF9lbmdpbmUuY2MJMjAwOC0wNy0xNCAxNTozMzowMyArMDAw MApAQCAtMTMxLDggKzEzMSw5IEBAIHByb3RlY3RlZDoKIAogTXlpc2FtX3RhYmxlX3JlZjo6TXlp c2FtX3RhYmxlX3JlZihjb25zdCBUYWJsZV9yZWYgJnRibCkKIHsKLSAgY29uc3QgY2hhciAqZGJf YXJnPSB0YmwuZGIoKS5uYW1lKCkucHRyKCk7Ci0gIGNvbnN0IGNoYXIgKm5hbWVfYXJnPSB0Ymwu bmFtZSgpLnB0cigpOworICBpbnQgZXJyb3I9IDA7CisgIGNoYXIgcGF0aFtGTl9SRUZMRU5dOwor CiAgIC8qKgogICAgIFdlIGtlZXAgbG9jYWwgY29waWVzIG9mIHRoZSBkYiBhbmQgbmFtZS4gVGhp cyBpcyBiZWNhdXNlIGR1cmluZyByZXN0b3JlLAogICAgIHRoZSBUYWJsZV9yZWYgaXMgYXBwYXJl bnRseSBtb2RpZmllZCBiZWZvcmUgdGhlIFRhYmxlX3Jlc3RvcmUgaXMgZG9uZQpAQCAtMTQzLDIy ICsxNDQsMjggQEAgTXlpc2FtX3RhYmxlX3JlZjo6TXlpc2FtX3RhYmxlX3JlZihjb25zdAogICAg IGFuZCB0aGlzIHdpbGwgc2F2ZSBtZW1vcnkuCiAgICAgQXMgUmFmYWwgaXMgY2hhbmdpbmcgcmVs ZXZhbnQgY29kZSBub3csIGl0IG1heSBnbyBhd2F5LgogICAqLwotICBkYi5hcHBlbmQoZGJfYXJn KTsKLSAgbmFtZS5hcHBlbmQobmFtZV9hcmcpOworICBpZiAoZGIuYXBwZW5kKHRibC5kYigpLm5h bWUoKSkpCisgICAgZXJyb3I9IDE7CisgIGlmIChuYW1lLmFwcGVuZCh0YmwubmFtZSgpKSkKKyAg ICBlcnJvcj0gMTsKKyAgLyoKKyAgICBOb3RlOiB3aGVuIHdlIHJlcGFpciB0aGUgdGFibGUsIHdl IHVzZSBvcGVuX3RlbXBvcmFyeV90YWJsZSgpIHdoaWNoCisgICAgcmVxdWlyZXMgZGIgYW5kIHRh YmxlIG5hbWUgc2VwYXJhdGVkLiBUaGUgaW50ZXJuYWxfbmFtZSBpcyB0aGUKKyAgICB0cmFuc2xh dGVkIHRhYmxlIG5hbWUgd2l0aCBBU0NJSSBjaGFyYWN0ZXJzIG9ubHkuCisgICovCisgICh2b2lk KSB0YmwuaW50ZXJuYWxfbmFtZShwYXRoLCBzaXplb2YocGF0aCkpOworICBpZiAoZmlsZV9uYW1l LmFwcGVuZChwYXRoKSkKKyAgICBlcnJvcj0gMTsKICAgLyoKLSAgICBOb3RlOiB0aGlzIHdheSBi ZWxvdyB3aWxsIGJyZWFrIHdpdGggbm9uLUFTQ0lJIGNoYXJhY3RlcnM7Ci0gICAgd2hhdCBkcml2 ZXIgc2hvdWxkIGJlIHBhc3NlZCBpcyB3aGF0IGVuZ2luZSB1c2VkIHRvIGNyZWF0ZSB0aGUgdGFi bGUsIGllCi0gICAgb3V0cHV0IG9mIGJ1aWxkX3RhYmxlX2ZpbGVuYW1lKCkuCi0gICAgSnVzdCBy ZXBsYWNlICJidWlsZGluZyIgd2l0aCAiYsODwrtpbGRpbmciIGluIGJhY2t1cC50ZXN0IHRvIHNl ZSBpc3N1ZXMuCi0gICAgVGhpcyBpcyByZW1lbWJlcmVkIGluIFdMIzQwNjAuCi0KLSAgICBCdXQg bm90ZSwgd2hlbiB3ZSByZXBhaXIgdGhlIHRhYmxlLCB3ZSB1c2Ugb3Blbl90ZW1wb3JhcnlfdGFi bGUoKSB3aGljaAotICAgIHJlcXVpcmVzIGRiIGFuZCB0YWJsZSBuYW1lIHNlcGFyYXRlZC4KLSAg Ki8KLSAgZmlsZV9uYW1lLmFwcGVuZCgiLi8iKTsKLSAgZmlsZV9uYW1lLmFwcGVuZChkYl9hcmcp OwotICBmaWxlX25hbWUuYXBwZW5kKCIvIik7Ci0gIGZpbGVfbmFtZS5hcHBlbmQobmFtZV9hcmcp OworICAgIElmIG9uZSBvZiB0aGUgc3RyaW5nIGFsbG9jYXRpb25zIGZhaWxlZCwgY2xlYXIgYWxs LiBUaGlzIHNob3VsZCBiZQorICAgIG5vdGljZWQgbGF0ZXIsIHdoZW4gd2UgdHJ5IHRvIHVzZSB0 aGUgaW5mb3JtYXRpb24uCisgICovCisgIGlmIChlcnJvcikKKyAgeworICAgIGRiLnNldCgiIiwg MCwgc3lzdGVtX2NoYXJzZXRfaW5mbyk7CisgICAgbmFtZS5zZXQoIiIsIDAsIHN5c3RlbV9jaGFy c2V0X2luZm8pOworICAgIGZpbGVfbmFtZS5zZXQoIiIsIDAsIHN5c3RlbV9jaGFyc2V0X2luZm8p OworICB9CiB9CiAKIApAQCAtNTM4LDE1ICs1NDUsMjAgQEAgcmVzdWx0X3QgQmFja3VwOjpiZWdp bihjb25zdCBzaXplX3QpCiAgIC8qIEJ1aWxkIHRoZSBoYXNoIG9mIHRhYmxlcyBmb3IgdGhlIE15 SVNBTSBsYXllciAobWlfYmFja3VwX2xvZy5jIGV0YykgKi8KICAgZm9yICh1aW50IG49MCA7IG4g PCBtX3RhYmxlcy5jb3VudCgpIDsgbisrICkKICAgeworICAgIGNoYXIgcGF0aFtGTl9SRUZMRU5d OwogICAgIGNoYXIgdW5pcXVlX2ZpbGVfbmFtZVtGTl9SRUZMRU5dLCAqc3RyOwogICAgIHNpemVf dCBzdHJfbGVuOwogICAgIDo6TEVYX1NUUklORyAqaGFzaF9rZXk7CiAKLSAgICBteV9yZWFscGF0 aCh1bmlxdWVfZmlsZV9uYW1lLAotICAgICAgICAgICAgICAgIGZuX2Zvcm1hdCh1bmlxdWVfZmls ZV9uYW1lLG1fdGFibGVzW25dLm5hbWUoKS5wdHIoKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgbV90YWJsZXNbbl0uZGIoKS5uYW1lKCkucHRyKCksCi0gICAgICAgICAgICAgICAgICAgICAg ICAgIE1JX05BTUVfSUVYVCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgTVlfVU5QQUNLX0ZJ TEVOQU1FKSwgTVlGKE1ZX1dNRSkpOworICAgIC8qCisgICAgICBUaGUgaW50ZXJuYWxfbmFtZSBp cyB0aGUgdHJhbnNsYXRlZCB0YWJsZSBuYW1lIHdpdGggQVNDSUkKKyAgICAgIGNoYXJhY3RlcnMg b25seS4KKyAgICAqLworICAgICh2b2lkKSBtX3RhYmxlc1tuXS5pbnRlcm5hbF9uYW1lKHBhdGgs IHNpemVvZihwYXRoKSk7CisgICAgaWYgKG15X3JlYWxwYXRoKHVuaXF1ZV9maWxlX25hbWUsCisg ICAgICAgICAgICAgICAgICAgIGZuX2Zvcm1hdCh1bmlxdWVfZmlsZV9uYW1lLCBwYXRoLCAiIiwg TUlfTkFNRV9JRVhULAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTVlfVU5QQUNLX0ZJ TEVOQU1FKSwgTVlGKE1ZX1dNRSkpKQorICAgICAgICBTRVRfU1RBVEVfVE9fRVJST1JfQU5EX0RC VUdfUkVUVVJOOwogICAgIHN0cl9sZW49IHN0cmxlbih1bmlxdWVfZmlsZV9uYW1lKTsKICAgICBt eV9tdWx0aV9tYWxsb2MoTVlGKE1ZX1dNRSksCiAgICAgICAgICAgICAgICAgICAgICZoYXNoX2tl eSwgc2l6ZW9mKCpoYXNoX2tleSksCgo=