From: Sergey Vojtovich Date: October 21 2011 6:18am Subject: bzr push into mysql-trunk branch (sergey.vojtovich:3518 to 3519) List-Archive: http://lists.mysql.com/commits/141528 Message-Id: <201110210615.p9L6FGbK020831@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM1MTkgU2VyZ2V5IFZvanRvdmljaAkyMDExLTEwLTIxIFttZXJnZV0KICAgICAgTWVyZ2UuCgog ICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW0ucmVzdWx0CiAgICAgIG15c3Fs LXRlc3QvdC9teWlzYW0udGVzdAogICAgICBzdG9yYWdlL215aXNhbS9oYV9teWlzYW0uY2MKICAg ICAgc3RvcmFnZS9teWlzYW0vbWlfZGVsZXRlX2FsbC5jCiAzNTE4IE1hcmtvIE3DpGtlbMOkCTIw MTEtMTAtMjEgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjUgdG8gbXlzcWwtdHJ1bmsuCgog ICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwo9PT0gbW9k aWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL215aXNhbS5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qv ci9teWlzYW0ucmVzdWx0CTIwMTEtMDYtMjQgMTI6NTM6NTcgKzAwMDAKKysrIGIvbXlzcWwtdGVz dC9yL215aXNhbS5yZXN1bHQJMjAxMS0xMC0yMSAwNTo0MjowMSArMDAwMApAQCAtMjQxOCw2ICsy NDE4LDMwIEBAIENBUkRJTkFMSVRZCiBEUk9QIFRBQkxFIHQxOwogU0VUIG15aXNhbV9zb3J0X2J1 ZmZlcl9zaXplPUBAZ2xvYmFsLm15aXNhbV9zb3J0X2J1ZmZlcl9zaXplOwogU0VUIG15aXNhbV9y ZXBhaXJfdGhyZWFkcz1AQGdsb2JhbC5teWlzYW1fcmVwYWlyX3RocmVhZHM7CisjCisjIEJVRyMx MTc1NzAzMiAtIDQ5MDMwOiBPUFRJTUlaRSBUQUJMRSBCUkVBS1MgTVlJU0FNIFRBQkxFIFdIRU4K KyMgICAgICAgICAgICAgICAgVVNJTkcgTVlJU0FNX1VTRV9NTUFQIE9OIFdJTkRPV1MKKyMKK1NF VCBHTE9CQUwgbXlpc2FtX3VzZV9tbWFwPTE7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQpOworSU5T RVJUIElOVE8gdDEgVkFMVUVTKDEpLCgyKTsKK0RFTEVURSBGUk9NIHQxIFdIRVJFIGE9MTsKK0ZM VVNIIFRBQkxFIHQxOworTE9DSyBUQUJMRSB0MSBXUklURTsKK09QVElNSVpFIFRBQkxFIHQxOwor VGFibGUJT3AJTXNnX3R5cGUJTXNnX3RleHQKK3Rlc3QudDEJb3B0aW1pemUJc3RhdHVzCU9LCitJ TlNFUlQgSU5UTyB0MSBWQUxVRVMoMyk7CitVTkxPQ0sgVEFCTEVTOworU0VMRUNUICogRlJPTSB0 MTsKK2EKKzIKKzMKK0NIRUNLIFRBQkxFIHQxOworVGFibGUJT3AJTXNnX3R5cGUJTXNnX3RleHQK K3Rlc3QudDEJY2hlY2sJc3RhdHVzCU9LCitEUk9QIFRBQkxFIHQxOworU0VUIEdMT0JBTCBteWlz YW1fdXNlX21tYXA9ZGVmYXVsdDsKIEVuZCBvZiA1LjEgdGVzdHMKICMKICMgQnVnIzQzNjAwOiBJ bmNvcnJlY3QgdHlwZSBjb252ZXJzaW9uIGNhdXNlZCB3cm9uZyByZXN1bHQuCgo9PT0gbW9kaWZp ZWQgZmlsZSAnbXlzcWwtdGVzdC90L215aXNhbS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvbXlp c2FtLnRlc3QJMjAxMC0wNS0xNCAxMDo1ODozOSArMDAwMAorKysgYi9teXNxbC10ZXN0L3QvbXlp c2FtLnRlc3QJMjAxMS0xMC0yMSAwNTo0MjowMSArMDAwMApAQCAtMTY0Nyw2ICsxNjQ3LDI0IEBA IERST1AgVEFCTEUgdDE7CiBTRVQgbXlpc2FtX3NvcnRfYnVmZmVyX3NpemU9QEBnbG9iYWwubXlp c2FtX3NvcnRfYnVmZmVyX3NpemU7CiBTRVQgbXlpc2FtX3JlcGFpcl90aHJlYWRzPUBAZ2xvYmFs Lm15aXNhbV9yZXBhaXJfdGhyZWFkczsKIAorLS1lY2hvICMKKy0tZWNobyAjIEJVRyMxMTc1NzAz MiAtIDQ5MDMwOiBPUFRJTUlaRSBUQUJMRSBCUkVBS1MgTVlJU0FNIFRBQkxFIFdIRU4KKy0tZWNo byAjICAgICAgICAgICAgICAgIFVTSU5HIE1ZSVNBTV9VU0VfTU1BUCBPTiBXSU5ET1dTCistLWVj aG8gIworU0VUIEdMT0JBTCBteWlzYW1fdXNlX21tYXA9MTsKK0NSRUFURSBUQUJMRSB0MShhIElO VCk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMSksKDIpOworREVMRVRFIEZST00gdDEgV0hFUkUg YT0xOworRkxVU0ggVEFCTEUgdDE7CitMT0NLIFRBQkxFIHQxIFdSSVRFOworT1BUSU1JWkUgVEFC TEUgdDE7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMyk7CitVTkxPQ0sgVEFCTEVTOworU0VMRUNU ICogRlJPTSB0MTsKK0NIRUNLIFRBQkxFIHQxOworRFJPUCBUQUJMRSB0MTsKK1NFVCBHTE9CQUwg bXlpc2FtX3VzZV9tbWFwPWRlZmF1bHQ7CisKIC0tZWNobyBFbmQgb2YgNS4xIHRlc3RzCiAKIC0t ZWNobyAjCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9teWlzYW0vaGFfbXlpc2FtLmNjJwot LS0gYS9zdG9yYWdlL215aXNhbS9oYV9teWlzYW0uY2MJMjAxMS0xMC0wNSAxMzoxNjozOCArMDAw MAorKysgYi9zdG9yYWdlL215aXNhbS9oYV9teWlzYW0uY2MJMjAxMS0xMC0yMSAwNTo0MjowMSAr MDAwMApAQCAtMTAyMiw2ICsxMDIyLDE4IEBAIGludCBoYV9teWlzYW06OnJlcGFpcihUSEQgKnRo ZCwgTUlfQ0hFQ0sKIAkJCW1pX2dldF9tYXNrX2FsbF9rZXlzX2FjdGl2ZShzaGFyZS0+YmFzZS5r ZXlzKSA6CiAJCQlzaGFyZS0+c3RhdGUua2V5X21hcCk7CiAgICAgdWludCB0ZXN0ZmxhZz1wYXJh bS50ZXN0ZmxhZzsKKyNpZmRlZiBIQVZFX01NQVAKKyAgICBib29sIHJlbWFwPSB0ZXN0KHNoYXJl LT5maWxlX21hcCk7CisgICAgLyoKKyAgICAgIG1pX3JlcGFpciooKSBmdW5jdGlvbnMgZmFtaWx5 IHVzZSBmaWxlIEkvTyBldmVuIGlmIG1lbW9yeQorICAgICAgbWFwcGluZyBpcyBhdmFpbGFibGUu CisKKyAgICAgIFNpbmNlIG1peGluZyBtbWFwIEkvTyBhbmQgZmlsZSBJL08gbWF5IGNhdXNlIHZh cmlvdXMgYXJ0aWZhY3RzLAorICAgICAgbWVtb3J5IG1hcHBpbmcgbXVzdCBiZSBkaXNhYmxlZC4K KyAgICAqLworICAgIGlmIChyZW1hcCkKKyAgICAgIG1pX211bm1hcF9maWxlKGZpbGUpOworI2Vu ZGlmCiAgICAgaWYgKG1pX3Rlc3RfaWZfc29ydF9yZXAoZmlsZSxmaWxlLT5zdGF0ZS0+cmVjb3Jk cyxrZXlfbWFwLDApICYmCiAJKGxvY2FsX3Rlc3RmbGFnICYgVF9SRVBfQllfU09SVCkpCiAgICAg ewpAQCAtMTA1Myw2ICsxMDY1LDEwIEBAIGludCBoYV9teWlzYW06OnJlcGFpcihUSEQgKnRoZCwg TUlfQ0hFQ0sKICAgICAgIGVycm9yPSAgbWlfcmVwYWlyKCZwYXJhbSwgZmlsZSwgZml4ZWRfbmFt ZSwKIAkJCXBhcmFtLnRlc3RmbGFnICYgVF9RVUlDSyk7CiAgICAgfQorI2lmZGVmIEhBVkVfTU1B UAorICAgIGlmIChyZW1hcCkKKyAgICAgIG1pX2R5bm1hcF9maWxlKGZpbGUsIGZpbGUtPnN0YXRl LT5kYXRhX2ZpbGVfbGVuZ3RoKTsKKyNlbmRpZgogICAgIHBhcmFtLnRlc3RmbGFnPXRlc3RmbGFn OwogICAgIG9wdGltaXplX2RvbmU9MTsKICAgfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv bXlpc2FtL21pX2RlbGV0ZV9hbGwuYycKLS0tIGEvc3RvcmFnZS9teWlzYW0vbWlfZGVsZXRlX2Fs bC5jCTIwMTEtMDYtMzAgMTU6NTA6NDUgKzAwMDAKKysrIGIvc3RvcmFnZS9teWlzYW0vbWlfZGVs ZXRlX2FsbC5jCTIwMTEtMTAtMjEgMDU6NDI6MDEgKzAwMDAKQEAgLTYxLDExICs2MSw2IEBAIGlu dCBtaV9kZWxldGVfYWxsX3Jvd3MoTUlfSU5GTyAqaW5mbykKICAgICAgIG15c3FsX2ZpbGVfY2hz aXplKHNoYXJlLT5rZmlsZSwgc2hhcmUtPmJhc2Uua2V5c3RhcnQsIDAsIE1ZRihNWV9XTUUpKSkK ICAgICBnb3RvIGVycjsKICAgKHZvaWQpIF9taV93cml0ZWluZm8oaW5mbyxXUklURUlORk9fVVBE QVRFX0tFWUZJTEUpOwotI2lmZGVmIEhBVkVfTU1BUAotICAvKiBNYXAgYWdhaW4gKi8KLSAgaWYg KHNoYXJlLT5maWxlX21hcCkKLSAgICBtaV9keW5tYXBfZmlsZShpbmZvLCAobXlfb2ZmX3QpIDAp OwotI2VuZGlmCiAgIERCVUdfUkVUVVJOKDApOwogCiBlcnI6CgpObyBidW5kbGUgKHJlYXNvbjog dXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==