From: marko.makela Date: November 10 2011 2:59pm Subject: bzr push into mysql-5.5 branch (marko.makela:3603 to 3604) List-Archive: http://lists.mysql.com/commits/141795 Message-Id: <201111101459.pAAExPRY006147@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM2MDQgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0xMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv aW5ub2RiL3IvaW5ub2RiLWxvY2sucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri L3QvaW5ub2RiLWxvY2sudGVzdAogMzYwMyBTbmVoYSBNb2RpCTIwMTEtMTEtMTAKICAgICAgQnVn IzExNzQ4NzMxIC0gMzcyNDg6IFNPTUUgJ0JJRycgVEVTVFMgRkFJTElORyBPTiA2LjA6CiAgICAg IAogICAgICBhbHRlcl90cmVhYmxlLWJpZy50ZXN0IHdhcyBmYWlsaW5nIGR1ZSB0byB0aGUgdXNl IG9mIFJBTkQoKSBmdW5jdGlvbiB3aGljaCBpcyBubyBtb3JlIAogICAgICByZXBsaWNhdGlvbiBz YWZlLgogICAgICBUaGlzIGhhcyBiZWVuIG1vZGlmaWVkIHVzaW5nIHN0YXRpYyB2YWx1ZXMuCiAg ICAgIAogICAgICBBbHNvLCAnc2xlZXAnIGhhcyBiZWVuIHJlcGxhY2VkIHVzaW5nICdkZWJ1Z19z eW5jJyBhbmQgdGhlIGV4ZWN1dGlvbiB0aW1lIG9mIHRoZSAKICAgICAgdGVzdCBoYXMgYmVlbiBy ZWR1Y2VkIHNpZ25pZmljYW50bHkuCiAgICAgIAogICAgICBUaGlzIHRlc3QgaXMgbm93IHRha2Vu IG91dCBvZiB0aGUgZGlzYWJsZWQuZGVmIGZpbGUgYW5kIGlzIGJlaW5nIGVuYWJsZWQuCgogICAg bW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9hbHRlcl90YWJsZS1iaWcucmVzdWx0CiAgICAg IG15c3FsLXRlc3QvdC9hbHRlcl90YWJsZS1iaWcudGVzdAogICAgICBteXNxbC10ZXN0L3QvZGlz YWJsZWQuZGVmCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lu bm9kYi1sb2NrLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGIt bG9jay5yZXN1bHQJcmV2aWQ6c25laGEubW9kaUBvcmFjbGUuY29tLTIwMTExMTEwMTE0ODQxLTVh MTM5ZDVybms5aXE1MDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9j ay5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMTAxNDUwMzQtZWM5 NzRhbmtodHF6dGw0OQpAQCAtODksMyArODksMjAgQEAgY29tbWl0OwogIyBDb25uZWN0aW9uICdj b24xJy4KIGNvbW1pdDsKIGRyb3AgdGFibGUgdDE7CisjCisjQnVnIzEyODQyMjA2IElOTk9EQiBM T0NLSU5HIFJFR1JFU1NJT04gRk9SIElOU0VSVCBJR05PUkUKKyNmaXhlZCBieSByZS1maXhpbmcg QnVnIzc5NzUKKyNha2EgQnVnIzExNzU5Njg4IDUyMDIwOiBJbm5vREIgY2FuIHN0aWxsIGRlYWRs b2NrIG9uIGp1c3QgSU5TRVJULi4uCisjCitDUkVBVEUgVEFCTEUgdDEgKGEgSU5UIFBSSU1BUlkg S0VZLCBiIElOVCBOT1QgTlVMTCkgRU5HSU5FPUlubm9EQjsKK0lOU0VSVCBJTlRPIHQxIFZBTFVF UygzLDEpOworQkVHSU47CitJTlNFUlQgSUdOT1JFIElOVE8gdDEgVkFMVUVTKDMsMTQpOworQkVH SU47CitJTlNFUlQgSUdOT1JFIElOVE8gdDEgVkFMVUVTKDMsMjMpOworU0VMRUNUICogRlJPTSB0 MSBGT1IgVVBEQVRFOworQ09NTUlUOworYQliCiszCTEKK0NPTU1JVDsKK0RST1AgVEFCTEUgdDE7 Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9j ay50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2NrLnRlc3QJ cmV2aWQ6c25laGEubW9kaUBvcmFjbGUuY29tLTIwMTExMTEwMTE0ODQxLTVhMTM5ZDVybms5aXE1 MDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9jay50ZXN0CXJldmlk Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEwMTQ1MDM0LWVjOTc0YW5raHRxenRsNDkK QEAgLTEyNywzICsxMjcsNDQgQEAgY29tbWl0OwogZHJvcCB0YWJsZSB0MTsKIAogIyBFbmQgb2Yg NC4xIHRlc3RzCisKKy0tZWNobyAjCistLWVjaG8gI0J1ZyMxMjg0MjIwNiBJTk5PREIgTE9DS0lO RyBSRUdSRVNTSU9OIEZPUiBJTlNFUlQgSUdOT1JFCistLWVjaG8gI2ZpeGVkIGJ5IHJlLWZpeGlu ZyBCdWcjNzk3NQorLS1lY2hvICNha2EgQnVnIzExNzU5Njg4IDUyMDIwOiBJbm5vREIgY2FuIHN0 aWxsIGRlYWRsb2NrIG9uIGp1c3QgSU5TRVJULi4uCistLWVjaG8gIworCitjb25uZWN0aW9uIGRl ZmF1bHQ7CitDUkVBVEUgVEFCTEUgdDEgKGEgSU5UIFBSSU1BUlkgS0VZLCBiIElOVCBOT1QgTlVM TCkgRU5HSU5FPUlubm9EQjsKKworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDMsMSk7CisKK0JFR0lO OworIyB0aGlzIHVzZWQgdG8gd3JvbmdseSBhY3F1aXJlIGFuIFggbG9jazsgbm93IGl0IHRha2Vz IGFuIFMgbG9jaworSU5TRVJUIElHTk9SRSBJTlRPIHQxIFZBTFVFUygzLDE0KTsKKworY29ubmVj dGlvbiBjb24xOworQkVHSU47CisjIHRoaXMgdXNlZCB0byB3cm9uZ2x5IGFjcXVpcmUgYW4gWCBs b2NrOyBub3cgaXQgdGFrZXMgYW4gUyBsb2NrCitJTlNFUlQgSUdOT1JFIElOVE8gdDEgVkFMVUVT KDMsMjMpOworLS1zZW5kCitTRUxFQ1QgKiBGUk9NIHQxIEZPUiBVUERBVEU7CisKK2Nvbm5lY3Rp b24gY29uMjsKKyMgQ2hlY2sgdGhhdCB0aGUgYWJvdmUgU0VMRUNUIGlzIGJsb2NrZWQKK2xldCAk d2FpdF9jb25kaXRpb249CisgIHNlbGVjdCBjb3VudCgqKSA9IDEgZnJvbSBpbmZvcm1hdGlvbl9z Y2hlbWEucHJvY2Vzc2xpc3QKKyAgd2hlcmUgc3RhdGUgPSAnU2VuZGluZyBkYXRhJyBhbmQKKyAg ICAgICAgaW5mbyA9ICdTRUxFQ1QgKiBGUk9NIHQxIEZPUiBVUERBVEUnOworLS1zb3VyY2UgaW5j bHVkZS93YWl0X2NvbmRpdGlvbi5pbmMKKworY29ubmVjdGlvbiBkZWZhdWx0OworQ09NTUlUOwor Y29ubmVjdGlvbiBjb24xOworcmVhcDsKK0NPTU1JVDsKK2Rpc2Nvbm5lY3QgY29uMTsKK2Rpc2Nv bm5lY3QgY29uMjsKKworY29ubmVjdGlvbiBkZWZhdWx0OworRFJPUCBUQUJMRSB0MTsKCk5vIGJ1 bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku