From: Andrei Elkin Date: April 30 2012 4:15pm Subject: bzr push into mysql-trunk branch (andrei.elkin:3758 to 3759) Bug#14018843 List-Archive: http://lists.mysql.com/commits/143693 X-Bug: 14018843 Message-Id: <201204301615.q3UGFY51004327@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM3NTkgQW5kcmVpIEVsa2luCTIwMTItMDQtMzAKICAgICAgQnVnIzE0MDE4ODQzIC0gRkFVTFRZ IExPR0lDUyBJTiBNVFNfREVCVUdfQ09OQ1VSUkVOVF9BQ0NFU1MgSEFORExJTkcKICAgICAgCiAg ICAgIEludHJvZHVjZWQgdG8gdmVyaWZ5IE1UUyBjb25jdXJyZW50IGJlaGF2aW9yIGBtdHNfZGVi dWdfY29uY3VycmVudF9hY2Nlc3MnCiAgICAgIGRlYnVnIGZsYWcgd2FzIHVubmVjZXNzYWxpcnkg Y2hlY2tlZCBieSBJTyB0aHJlYWQgd2hpY2ggbGVhZHMgdG8gYSBoYW5nIGxpa2UuIAogICAgICAK ICAgICAgICAgaHR0cDovL3BiMi5uby5vcmFjbGUuY29tL3dlYi5weT90ZW1wbGF0ZT1teXNxbF9z aG93X3Rlc3RfZmFpbHVyZSZzZWFyY2g9eWVzJnB1c2hfaWQ9MzM5Njc4MyZ0ZXN0X2lkPTM0MDAz ODkmdGVzdF9ydW49cnBsX2JpbmxvZy1kZWJ1Zy1iaWcmdGVzdF9zdWl0ZT1ycGwmdGVzdF9jYXNl PXJwbF9tdHNfZGVidWcKICAgICAgCiAgICAgIEZpeGVkIHdpdGggZXhjbHVkaW5nIG90aGVyIHRo YW4gTVRTIHdvcmtlciB0aHJlYWRzIAogICAgICBmcm9tIGNoZWNraW5nIHRoZSBkZWJ1ZyBmbGFn LgogICAgICAKICAgICAgT25lLWxpbmVyIGZpeGVzIHN1cHByZXNzaW5nIGEgd2FybmluZyBpbiBy cGxfZmlsdGVyX3RhYmxlc19ub3RfZXhpc3QgaXMgcGlnZ3liYWNrZWQuCiAgICAgQCBteXNxbC10 ZXN0L3N1aXRlL3JwbC9yL3JwbF9maWx0ZXJfdGFibGVzX25vdF9leGlzdC5yZXN1bHQKICAgICAg ICByZXN1bHRzIGdvdCB1cGRhdGVkLgogICAgIEAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxf ZmlsdGVyX3RhYmxlc19ub3RfZXhpc3QudGVzdAogICAgICAgIGEgbmVjZXNzYXJ5IHVuc2FmZSBz dXBwcmVzc2lvbiBvbiB0aGUgbWFzdGVyIHNpZGUgaXMgYWRkZWQuCgogICAgbW9kaWZpZWQ6CiAg ICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX2ZpbHRlcl90YWJsZXNfbm90X2V4aXN0LnJl c3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9maWx0ZXJfdGFibGVzX25vdF9l eGlzdC50ZXN0CiAgICAgIHNxbC9ycGxfaW5mb190YWJsZS5jYwogMzc1OCBNYXJrbyBNw6RrZWzD pAkyMDEyLTA0LTMwCiAgICAgIE5vbi1mdW5jdGlvbmFsIGNoYW5nZXMgKGZvcm1hdHRpbmcgYW5k IGRhdGEgdHlwZSBjbGVhbnVwKQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl L2FwaS9hcGkwYXBpLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuY2MK ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwo9PT0gbW9kaWZpZWQg ZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfZmlsdGVyX3RhYmxlc19ub3RfZXhpc3Qu cmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9maWx0ZXJfdGFibGVzX25v dF9leGlzdC5yZXN1bHQJMjAxMi0wNC0yMSAxMjoxMToxNSArMDAwMAorKysgYi9teXNxbC10ZXN0 L3N1aXRlL3JwbC9yL3JwbF9maWx0ZXJfdGFibGVzX25vdF9leGlzdC5yZXN1bHQJMjAxMi0wNC0z MCAxNjoxNDoyNiArMDAwMApAQCAtMTIyLDYgKzEyMiw3IEBAIENSRUFURSBUQUJMRSB0ZXN0LnQ1 IChhIElOVCBBVVRPX0lOQ1JFTUUKIENSRUFURSBUQUJMRSB0ZXN0LnQxIChhIElOVCk7CiBJTlNF UlQgSU5UTyB0ZXN0LnQxIFZBTFVFUygxKTsKIGNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiVW5z YWZlIHN0YXRlbWVudCB3cml0dGVuIHRvIHRoZSBiaW5hcnkgbG9nIHVzaW5nIHN0YXRlbWVudCBm b3JtYXQgc2luY2UgQklOTE9HX0ZPUk1BVCA9IFNUQVRFTUVOVCIpOworY2FsbCBtdHIuYWRkX3N1 cHByZXNzaW9uKCJVbnNhZmUgc3RhdGVtZW50IHdyaXR0ZW4gdG8gdGhlIGJpbmFyeSBsb2cgdXNp bmcgc3RhdGVtZW50IGZvcm1hdCBzaW5jZSBCSU5MT0dfRk9STUFUID0gU1RBVEVNRU5UIik7CiBD UkVBVEUgVEFCTEUgdGVzdC50X3NsYXZlIChhIElOVCBBVVRPX0lOQ1JFTUVOVCBQUklNQVJZIEtF WSwgYiBJTlQsIGMgSU5UKTsKIENSRUFURSBUUklHR0VSIHQxX3VwZGF0ZSBBRlRFUiBVUERBVEUg T04gdGVzdC50MSBGT1IgRUFDSCBST1cKIElOU0VSVCBJTlRPIHRlc3QudF9zbGF2ZSBWQUxVRVMo TlVMTCwgUk9VTkQoUkFORCgpICogMTAwMCksIEBjKTsKCj09PSBtb2RpZmllZCBmaWxlICdteXNx bC10ZXN0L3N1aXRlL3JwbC90L3JwbF9maWx0ZXJfdGFibGVzX25vdF9leGlzdC50ZXN0JwotLS0g YS9teXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9maWx0ZXJfdGFibGVzX25vdF9leGlzdC50ZXN0 CTIwMTItMDQtMjEgMTI6MTE6MTUgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9y cGxfZmlsdGVyX3RhYmxlc19ub3RfZXhpc3QudGVzdAkyMDEyLTA0LTMwIDE2OjE0OjI2ICswMDAw CkBAIC0yMTksNiArMjE5LDcgQEAgY29ubmVjdGlvbiBtYXN0ZXI7CiBDUkVBVEUgVEFCTEUgdGVz dC50NSAoYSBJTlQgQVVUT19JTkNSRU1FTlQgUFJJTUFSWSBLRVksIGIgSU5ULCBjIElOVCk7ICMg aWdub3JlZCBvbiBzbGF2ZQogQ1JFQVRFIFRBQkxFIHRlc3QudDEgKGEgSU5UKTsgIyBhY2NlcHRl ZCBvbiBzbGF2ZQogSU5TRVJUIElOVE8gdGVzdC50MSBWQUxVRVMoMSk7CitjYWxsIG10ci5hZGRf c3VwcHJlc3Npb24oIlVuc2FmZSBzdGF0ZW1lbnQgd3JpdHRlbiB0byB0aGUgYmluYXJ5IGxvZyB1 c2luZyBzdGF0ZW1lbnQgZm9ybWF0IHNpbmNlIEJJTkxPR19GT1JNQVQgPSBTVEFURU1FTlQiKTsK IAogLS1zeW5jX3NsYXZlX3dpdGhfbWFzdGVyCiBjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlVu c2FmZSBzdGF0ZW1lbnQgd3JpdHRlbiB0byB0aGUgYmluYXJ5IGxvZyB1c2luZyBzdGF0ZW1lbnQg Zm9ybWF0IHNpbmNlIEJJTkxPR19GT1JNQVQgPSBTVEFURU1FTlQiKTsKCj09PSBtb2RpZmllZCBm aWxlICdzcWwvcnBsX2luZm9fdGFibGUuY2MnCi0tLSBhL3NxbC9ycGxfaW5mb190YWJsZS5jYwky MDEyLTA0LTExIDE2OjUyOjI4ICswMDAwCisrKyBiL3NxbC9ycGxfaW5mb190YWJsZS5jYwkyMDEy LTA0LTMwIDE2OjE0OjI2ICswMDAwCkBAIC0xOTksNyArMTk5LDggQEAgaW50IFJwbF9pbmZvX3Rh YmxlOjpkb19mbHVzaF9pbmZvKGNvbnN0IAogZW5kOgogICBEQlVHX0VYRUNVVEVfSUYoIm10c19k ZWJ1Z19jb25jdXJyZW50X2FjY2VzcyIsCiAgICAgewotICAgICAgd2hpbGUgKG10c19kZWJ1Z19j b25jdXJyZW50X2FjY2VzcyA8IDIgJiYgbXRzX2RlYnVnX2NvbmN1cnJlbnRfYWNjZXNzID4gIDAp CisgICAgICB3aGlsZSAodGhkLT5zeXN0ZW1fdGhyZWFkID09IFNZU1RFTV9USFJFQURfU0xBVkVf V09SS0VSICYmCisgICAgICAgICAgICAgbXRzX2RlYnVnX2NvbmN1cnJlbnRfYWNjZXNzIDwgMiAm JiBtdHNfZGVidWdfY29uY3VycmVudF9hY2Nlc3MgPiAgMCkKICAgICAgIHsKICAgICAgICAgREJV R19QUklOVCgibXRzIiwgKCJXYWl0aW5nIHdoaWxlIGxvY2tzIGFyZSBhY3F1aXJlZCB0byBzaG93 ICIKICAgICAgICAgICAiY29uY3VycmVuY3kgaW4gbXRzOiAldSAlbHVcbiIsIG10c19kZWJ1Z19j b25jdXJyZW50X2FjY2VzcywKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt YWlscyku