From: Tor Didriksen Date: October 3 2012 2:13pm Subject: bzr push into mysql-5.5 branch (tor.didriksen:4003 to 4004) Bug#13713525 List-Archive: http://lists.mysql.com/commits/144929 X-Bug: 13713525 Message-Id: <20121003141324.20175.40043.4004@atum07.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQwMDQgVG9yIERpZHJpa3NlbgkyMDEyLTEwLTAzCiAgICAgIEJ1ZyMxMzcxMzUyNSBDUkVBVEVf SU5JVElBTF9EQi5DTUFLRSBJUyBGQUlMSU5HIE9OIFdJTkRPV1MsIFNUSUxMICJERVZFTlYiIFJF VFVSTlMgMAogICAgICAKICAgICAgVGhpcyBidWcgZGVwZW5kcyBvbiBjbWFrZSB2ZXJzaW9uLgog ICAgICAKICAgICAgRm9yIGNtYWtlIDIuNiAod2hpY2ggaXMgc3RpbGwgaW4gdXNlIGZvciBzb21l IHB1c2hidWlsZCB0cmVlcykKICAgICAgdGhlIG1haW4gYnVpbGQgd291bGQgc3VjY2VlZCwgZXZl biBpZiBjcmVhdGVfaW5pdGlhbF9kYiBmYWlsZWQuCiAgICAgIAogICAgICBUaGUgcHJvYmxlbSB3 YXMgdGhlIGNoYWluaW5nIG9mIGNvbW1hbmRzIGluIHRoZSBDVVNUT01fQ09NTUFORAogICAgICB0 byBwcm9kdWNlICdpbml0ZGIuZGVwJy4gSXQgZmlyc3QgaW52b2tlcyBjbWFrZSB0byBydW4gbXlz cWxkLAogICAgICB0aGVuIGludm9rZXMgJ3RvdWNoJyB0byBjcmVhdGUgdGhlIGZpbGUuIE1vdmlu ZyB0aGUgJ3RvdWNoJwogICAgICBjb21tYW5kIG1ha2VzIHRoZSBlcnJvciBwcm9wYWdhdGUgcHJv cGVybHkgZm9yIGJvdGggY21ha2UgMi42IGFuZCAyLjgKCiAgICBtb2RpZmllZDoKICAgICAgY21h a2UvY3JlYXRlX2luaXRpYWxfZGIuY21ha2UuaW4KICAgICAgc3FsL0NNYWtlTGlzdHMudHh0CiA0 MDAzIEpvbiBPbGF2IEhhdWdsaWQJMjAxMi0xMC0wMwogICAgICBCdWcjMTQ0OTUzNTE6IENSQVNI IElOIEhBX1BBUlRJVElPTjo6SEFORExFX1VOT1JERVJFRF9ORVhUCiAgICAgIAogICAgICBGb2xs b3ctdXAgcGF0Y2ggLSBGaXggYnJva2VuIGJ1aWxkOgogICAgICBlcnJvcjogZm9ybWF0IOKAmCV1 4oCZIGV4cGVjdHMgYXJndW1lbnQgb2YgdHlwZSDigJh1bnNpZ25lZCBpbnTigJksCiAgICAgIGJ1 dCBhcmd1bWVudCAyIGhhcyB0eXBlIOKAmGtleV9wYXJ0X21hcCB7YWthIGxvbmcgdW5zaWduZWQg aW50feKAmQogICAgICBbLVdlcnJvcj1mb3JtYXRdCgogICAgbW9kaWZpZWQ6CiAgICAgIHNxbC9o YV9wYXJ0aXRpb24uY2MKPT09IG1vZGlmaWVkIGZpbGUgJ2NtYWtlL2NyZWF0ZV9pbml0aWFsX2Ri LmNtYWtlLmluJwotLS0gYS9jbWFrZS9jcmVhdGVfaW5pdGlhbF9kYi5jbWFrZS5pbgkyMDExLTA2 LTMwIDE1OjQ2OjUzICswMDAwCisrKyBiL2NtYWtlL2NyZWF0ZV9pbml0aWFsX2RiLmNtYWtlLmlu CTIwMTItMTAtMDMgMTQ6MDU6MDcgKzAwMDAKQEAgLTY5LDEwICs2OSwxMyBAQCBFWEVDVVRFX1BS T0NFU1MoCiAgIENPTU1BTkQgIkBDTUFLRV9DT01NQU5EQCIgLUUgZWNobyBFeGVjdXRpbmcgJHtC T09UU1RSQVBfQ09NTUFORH0KICkKIEVYRUNVVEVfUFJPQ0VTUyAoCi0gIENPTU1BTkQgIkBDTUFL RV9DT01NQU5EQCIgLUUgZWNobyBpbnB1dCBmaWxlIGJvb3RzdHJhcC5zcWwsIGN1cnJlbnQgZGly ZWN0b3J5ICR7Q1dEfQorICBDT01NQU5EICJAQ01BS0VfQ09NTUFOREAiIC1FCisgIGVjaG8gaW5w dXQgZmlsZSBib290c3RyYXAuc3FsLCBjdXJyZW50IGRpcmVjdG9yeSAke0NXRH0KICkKIEVYRUNV VEVfUFJPQ0VTUyAoICAKLSAgQ09NTUFORCAke0JPT1RTVFJBUF9DT01NQU5EfSAgSU5QVVRfRklM RSBib290c3RyYXAuc3FsIE9VVFBVVF9WQVJJQUJMRSBPVVQKKyAgQ09NTUFORCAke0JPT1RTVFJB UF9DT01NQU5EfQorICBJTlBVVF9GSUxFIGJvb3RzdHJhcC5zcWwKKyAgT1VUUFVUX1ZBUklBQkxF IE9VVAogICBFUlJPUl9WQVJJQUJMRSBFUlIKICAgUkVTVUxUX1ZBUklBQkxFIFJFU1VMVAogICkK QEAgLTgxLDMgKzg0LDYgQEAgSUYoTk9UIFJFU1VMVCBFUVVBTCAwKQogICBNRVNTQUdFKEZBVEFM X0VSUk9SICJDb3VsZCBub3QgY3JlYXRlIGluaXRpYWwgZGF0YWJhc2UgXG4gJHtPVVR9IFxuICR7 RVJSfSIpCiBFTkRJRigpCiAgCitFWEVDVVRFX1BST0NFU1MgKCAgCisgIENPTU1BTkQgIkBDTUFL RV9DT01NQU5EQCIgLUUgdG91Y2ggJHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJ9L2luaXRkYi5k ZXAKKykKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvQ01ha2VMaXN0cy50eHQnCi0tLSBhL3NxbC9D TWFrZUxpc3RzLnR4dAkyMDEyLTA1LTI5IDA4OjU0OjU3ICswMDAwCisrKyBiL3NxbC9DTWFrZUxp c3RzLnR4dAkyMDEyLTEwLTAzIDE0OjA1OjA3ICswMDAwCkBAIC0yOTEsMTUgKzI5MSwxNyBAQCBJ RihXSU4zMiBBTkQgTVlTUUxEX0VYRUNVVEFCTEUpCiAgICAgIENPTU1BTkQgJHtDTUFLRV9DT01N QU5EfQogICAgICAke0NPTkZJR19QQVJBTX0gLVAgJHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJ9 L2NyZWF0ZV9pbml0aWFsX2RiLmNtYWtlCiAgICAgIFdPUktJTkdfRElSRUNUT1JZICR7Q01BS0Vf Q1VSUkVOVF9CSU5BUllfRElSfS9kYXRhCi0gICAgIENPTU1BTkQgICR7Q01BS0VfQ09NTUFORH0g LUUgdG91Y2ggJHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJ9L2luaXRkYi5kZXAKICAgICAgREVQ RU5EUyBteXNxbGQKICAgKQogICBBRERfQ1VTVE9NX1RBUkdFVChpbml0aWFsX2RhdGFiYXNlICAK ICAgICBBTEwKICAgICBERVBFTkRTICBpbml0ZGIuZGVwCiAgICkKLSAgSU5TVEFMTChESVJFQ1RP UlkgJHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJ9L2RhdGEgREVTVElOQVRJT04gLiAKLSAgQ09N UE9ORU5UIERhdGFGaWxlcyBQQVRURVJOICJpbml0ZGIuZGVwIiBFWENMVURFICBQQVRURVJOICJi b290c3RyYXAuc3FsIiBFWENMVURFKQorICBJTlNUQUxMKERJUkVDVE9SWSAke0NNQUtFX0NVUlJF TlRfQklOQVJZX0RJUn0vZGF0YQorICAgIERFU1RJTkFUSU9OIC4gCisgICAgQ09NUE9ORU5UIERh dGFGaWxlcworICAgIFBBVFRFUk4gImluaXRkYi5kZXAiIEVYQ0xVREUKKyAgICBQQVRURVJOICJi b290c3RyYXAuc3FsIiBFWENMVURFKQogRUxTRSgpCiAgICMgTm90IHdpbmRvd3Mgb3IgY3Jvc3Mg Y29tcGlsaW5nLCBqdXN0IGluc3RhbGwgYW4gZW1wdHkgZGlyZWN0b3J5CiAgIElOU1RBTEwoRklM RVMgJHtEVU1NWV9GSUxFfSBERVNUSU5BVElPTiBkYXRhL215c3FsIENPTVBPTkVOVCBEYXRhRmls ZXMpCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==