From: Nirbhay Choubey Date: January 17 2012 3:27am Subject: bzr push into mysql-trunk branch (nirbhay.choubey:3735 to 3736) Bug#13006947 List-Archive: http://lists.mysql.com/commits/142415 X-Bug: 13006947 Message-Id: <201201170327.q0H3RNWb019433@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM3MzYgTmlyYmhheSBDaG91YmV5CTIwMTItMDEtMTcKICAgICAgQnVnIzEzMDA2OTQ3IDYyNDcy OiBNWVNRTEhPVENPUFkgRVJST1JTIE9OIERBVEFCQVNFUwogICAgICAgICAgICAgICAgICAgICAg ICAgIENPTlRBSU5JTkcgTVlJU0FNIFZJRVdTCiAgICAgIAogICAgICBteXNxbGhvdGNvcHkgZmFp bGVkIHdoZW4gJ3ZpZXdzJyB3ZXJlIGludm9sdmVkLiBUaGlzCiAgICAgIGhhcHBlbmVkIGFzIGl0 IHRyaWVkIHRvIGxvY2sgdGhlIHZpZXdzIChhbG9uZyB3aXRoIHRoZQogICAgICBiYXNlIHRhYmxl cykgdXNpbmcgJ0ZMVVNIIFRBQkxFUyA8dGFibGVfbmFtZT4gLi4gV0lUSAogICAgICBSRUFEIExP Q0snIGNvbW1hbmQsIHdoaWNoIGlzIGludmFsaWQuCiAgICAgIAogICAgICBGaXhlZCBieSBkaXZp ZGluZyB0aGUgdGFibGUgbGlzdCBpbnRvIHZpZXdzICYgYmFzZSB0YWJsZXMsCiAgICAgIGFuZCB0 aGVuIGxvY2tpbmcgdGhlIHZpZXdzIHNlcGFyYXRlbHkuCiAgICAgQCBzY3JpcHRzL215c3FsaG90 Y29weS5zaAogICAgICAgIEJ1ZyMxMzAwNjk0NyA2MjQ3MjogTVlTUUxIT1RDT1BZIEVSUk9SUyBP TiBEQVRBQkFTRVMKICAgICAgICAgICAgICAgICAgICAgICAgICAgIENPTlRBSU5JTkcgTVlJU0FN IFZJRVdTCiAgICAgICAgCiAgICAgICAgVmlld3Mgd2lsbCBub3cgYmUgbG9ja2VkIHNlcGFyYXRl bHkgKGZyb20gYmFzZSB0YWJsZXMpCiAgICAgICAgYXMgdGhleSBjYW5ub3QgYmUgZmx1c2hlZC9s b2NrZWQgdXNpbmcgJ0ZMVVNIIFRBQkxFIC4uCiAgICAgICAgV0lUSCBSRUFEIExPQ0snLgoKICAg IG1vZGlmaWVkOgogICAgICBzY3JpcHRzL215c3FsaG90Y29weS5zaAogMzczNSBNYXJrbyBNw6Rr ZWzDpAkyMDEyLTAxLTE2IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS41IHRvIG15c3FsLXRy dW5rLgoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2Ri X2NoYW5nZV9idWZmZXJpbmdfZGVidWdfYmFzaWMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3Vp dGUvc3lzX3ZhcnMvci9pbm5vZGJfZG91Ymxld3JpdGVfYmF0Y2hfc2l6ZV9iYXNpYy5yZXN1bHQK ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9wYWdlX2hhc2hfbG9ja3Nf YmFzaWMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9pbm5vZGJfdHJ4 X3JzZWdfbl9zbG90c19kZWJ1Z19iYXNpYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9z eXNfdmFycy90L2lubm9kYl9jaGFuZ2VfYnVmZmVyaW5nX2RlYnVnX2Jhc2ljLnRlc3QKICAgICAg bXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9kb3VibGV3cml0ZV9iYXRjaF9zaXpl X2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9wYWdl X2hhc2hfbG9ja3NfYmFzaWMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3Qv aW5ub2RiX3RyeF9yc2VnX25fc2xvdHNfZGVidWdfYmFzaWMudGVzdAogICAgbW9kaWZpZWQ6CiAg ICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9hbGxfdmFycy5yZXN1bHQKICAgICAgbXlz cWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2FsbF92YXJzLnRlc3QKPT09IG1vZGlmaWVkIGZpbGUg J3NjcmlwdHMvbXlzcWxob3Rjb3B5LnNoJwotLS0gYS9zY3JpcHRzL215c3FsaG90Y29weS5zaAky MDExLTA2LTMwIDE1OjQ2OjUzICswMDAwCisrKyBiL3NjcmlwdHMvbXlzcWxob3Rjb3B5LnNoCTIw MTItMDEtMTcgMDM6MjU6NTcgKzAwMDAKQEAgLTI3MiwyMyArMjcyLDI4IEBAIGlmICggZGVmaW5l ZCAkb3B0e3JlZ2V4cH0gKSB7CiAgICAgfQogfQogCi0jIC0tLSBnZXQgbGlzdCBvZiB0YWJsZXMg dG8gaG90Y29weSAtLS0KKyMgLS0tIGdldCBsaXN0IG9mIHRhYmxlcyBhbmQgdmlld3MgdG8gaG90 Y29weSAtLS0KIAogbXkgJGhjX2xvY2tzID0gIiI7CiBteSAkaGNfdGFibGVzID0gIiI7CitteSAk aGNfYmFzZV90YWJsZXMgPSAiIjsKK215ICRoY192aWV3cyA9ICIiOworbXkgJG51bV9iYXNlX3Rh YmxlcyA9IDA7CitteSAkbnVtX3ZpZXdzID0gMDsKIG15ICRudW1fdGFibGVzID0gMDsKIG15ICRu dW1fZmlsZXMgPSAwOwogCiBmb3JlYWNoIG15ICRyZGIgKCBAZGJfZGVzYyApIHsKICAgICBteSAk ZGIgPSAkcmRiLT57c3JjfTsKLSAgICBteSBAZGJoX3RhYmxlcyA9IGdldF9saXN0X29mX3RhYmxl cyggJGRiICk7CisgICAgbXkgQGRiaF9iYXNlX3RhYmxlcyA9IGdldF9saXN0X29mX3RhYmxlcygg JGRiICk7CisgICAgbXkgQGRiaF92aWV3cyA9IGdldF9saXN0X29mX3ZpZXdzKCAkZGIgKTsKIAog ICAgICMjIGZpbHRlciBvdXQgY2VydGFpbiBzeXN0ZW0gbm9uLWxvY2thYmxlIHRhYmxlcy4gCiAg ICAgIyMga2VlcCBpbiBzeW5jIHdpdGggbXlzcWxkdW1wLgogICAgIGlmICgkZGIgPX4gbS9ebXlz cWwkL2kpCiAgICAgewotICAgICAgQGRiaF90YWJsZXMgPSBncmVwIAotICAgICAgICB7ICEvXihh cHBseV9zdGF0dXN8c2NoZW1hfGdlbmVyYWxfbG9nfHNsb3dfbG9nKSQvIH0gQGRiaF90YWJsZXMK KyAgICAgIEBkYmhfYmFzZV90YWJsZXMgPSBncmVwIAorICAgICAgICB7ICEvXihhcHBseV9zdGF0 dXN8c2NoZW1hfGdlbmVyYWxfbG9nfHNsb3dfbG9nKSQvIH0gQGRiaF9iYXNlX3RhYmxlcwogICAg IH0KIAogICAgICMjIGdlbmVyYXRlIHJlZ2V4IGZvciB0YWJsZXMvZmlsZXMKQEAgLTMwMywxMSAr MzA4LDIwIEBAIGZvcmVhY2ggbXkgJHJkYiAoIEBkYl9kZXNjICkgewogCiAgICAgICAgICMjIGZp bHRlciAob3V0KSB0YWJsZXMgc3BlY2lmaWVkIGluIHRfcmVnZXgKICAgICAgICAgcHJpbnQgIkZp bHRlcmluZyB0YWJsZXMgd2l0aCAnJHRfcmVnZXgnXG4iIGlmICRvcHR7ZGVidWd9OwotICAgICAg ICBAZGJoX3RhYmxlcyA9ICggJG5lZ2F0ZWQgCi0gICAgICAgICAgICAgICAgICAgICAgICA/IGdy ZXAgeyAkXyAhfiAkdF9yZWdleCB9IEBkYmhfdGFibGVzCi0gICAgICAgICAgICAgICAgICAgICAg ICA6IGdyZXAgeyAkXyA9fiAkdF9yZWdleCB9IEBkYmhfdGFibGVzICk7CisgICAgICAgIEBkYmhf YmFzZV90YWJsZXMgPSAoICRuZWdhdGVkIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICA/ IGdyZXAgeyAkXyAhfiAkdF9yZWdleCB9IEBkYmhfYmFzZV90YWJsZXMKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgOiBncmVwIHsgJF8gPX4gJHRfcmVnZXggfSBAZGJoX2Jhc2VfdGFibGVz ICk7CisKKyAgICAgICAgIyMgZmlsdGVyIChvdXQpIHZpZXdzIHNwZWNpZmllZCBpbiB0X3JlZ2V4 CisgICAgICAgIHByaW50ICJGaWx0ZXJpbmcgdGFibGVzIHdpdGggJyR0X3JlZ2V4J1xuIiBpZiAk b3B0e2RlYnVnfTsKKyAgICAgICAgQGRiaF92aWV3cyA9ICggJG5lZ2F0ZWQgCisgICAgICAgICAg ICAgICAgICAgICAgID8gZ3JlcCB7ICRfICF+ICR0X3JlZ2V4IH0gQGRiaF92aWV3cworICAgICAg ICAgICAgICAgICAgICAgICA6IGdyZXAgeyAkXyA9fiAkdF9yZWdleCB9IEBkYmhfdmlld3MgKTsK ICAgICB9CiAKKyAgICAjIyBOb3cgY29uY2F0ZW5hdGUgdGhlIGJhc2UgdGFibGUgYW5kIHZpZXcg YXJyYXlzLgorICAgIG15IEBkYmhfdGFibGVzID0gKEBkYmhfYmFzZV90YWJsZXMsIEBkYmhfdmll d3MpOworCiAgICAgIyMgZ2V0IGxpc3Qgb2YgZmlsZXMgdG8gY29weQogICAgIG15ICRkYl9kaXIg PSAiJGRhdGFkaXIvJGRiIjsKICAgICBvcGVuZGlyKERCRElSLCAkZGJfZGlyICkgCkBAIC0zNDcs MTUgKzM2MSwyNSBAQCBmb3JlYWNoIG15ICRyZGIgKCBAZGJfZGVzYyApIHsKIAogICAgICRyZGIt PntmaWxlc30gID0gWyBAZGJfZmlsZXMgXTsKICAgICAkcmRiLT57aW5kZXh9ICA9IFsgQGluZGV4 X2ZpbGVzIF07Ci0gICAgbXkgQGhjX3RhYmxlcyA9IG1hcCB7IHF1b3RlX25hbWVzKCIkZGIuJF8i KSB9IEBkYmhfdGFibGVzOworICAgIG15IEBoY19iYXNlX3RhYmxlcyA9IG1hcCB7IHF1b3RlX25h bWVzKCIkZGIuJF8iKSB9IEBkYmhfYmFzZV90YWJsZXM7CisgICAgbXkgQGhjX3ZpZXdzID0gbWFw IHsgcXVvdGVfbmFtZXMoIiRkYi4kXyIpIH0gQGRiaF92aWV3czsKKyAgICAKKyAgICBteSBAaGNf dGFibGVzID0gKEBoY19iYXNlX3RhYmxlcywgQGhjX3ZpZXdzKTsKICAgICAkcmRiLT57dGFibGVz fSA9IFsgQGhjX3RhYmxlcyBdOwogCiAgICAgJGhjX2xvY2tzIC49ICIsICIgIGlmICggbGVuZ3Ro ICRoY19sb2NrcyAmJiBAaGNfdGFibGVzICk7CiAgICAgJGhjX2xvY2tzIC49IGpvaW4gIiwgIiwg bWFwIHsgIiRfIFJFQUQiIH0gQGhjX3RhYmxlczsKLSAgICAkaGNfdGFibGVzIC49ICIsICIgIGlm ICggbGVuZ3RoICRoY190YWJsZXMgJiYgQGhjX3RhYmxlcyApOwotICAgICRoY190YWJsZXMgLj0g am9pbiAiLCAiLCBAaGNfdGFibGVzOwogCi0gICAgJG51bV90YWJsZXMgKz0gc2NhbGFyIEBoY190 YWJsZXM7CisgICAgJGhjX2Jhc2VfdGFibGVzIC49ICIsICIgIGlmICggbGVuZ3RoICRoY19iYXNl X3RhYmxlcyAmJiBAaGNfYmFzZV90YWJsZXMgKTsKKyAgICAkaGNfYmFzZV90YWJsZXMgLj0gam9p biAiLCAiLCBAaGNfYmFzZV90YWJsZXM7CisgICAgJGhjX3ZpZXdzIC49ICIsICIgIGlmICggbGVu Z3RoICRoY192aWV3cyAmJiBAaGNfdmlld3MgKTsKKyAgICAkaGNfdmlld3MgLj0gam9pbiAiLCAi LCBAaGNfdmlld3M7CisKKyAgICBAaGNfdGFibGVzID0gKEBoY19iYXNlX3RhYmxlcywgQGhjX3Zp ZXdzKTsKKworICAgICRudW1fYmFzZV90YWJsZXMgKz0gc2NhbGFyIEBoY19iYXNlX3RhYmxlczsK KyAgICAkbnVtX3ZpZXdzICs9IHNjYWxhciBAaGNfdmlld3M7CisgICAgJG51bV90YWJsZXMgKz0g JG51bV9iYXNlX3RhYmxlcyArICRudW1fdmlld3M7CiAgICAgJG51bV9maWxlcyAgKz0gc2NhbGFy IEB7JHJkYi0+e2ZpbGVzfX07CiB9CiAKQEAgLTQ2Nyw3ICs0OTEsMTAgQEAgaWYgKCAkb3B0e2Ry eXJ1bn0gKSB7CiAgICAgICAgIHByaW50ICJGTFVTSCBUQUJMRVMgLyohMzIzMjMgJGhjX3RhYmxl cyAqL1xuIjsKICAgICB9CiAgICAgZWxzZSB7Ci0gICAgICAgIHByaW50ICJGTFVTSCBUQUJMRVMg JGhjX3RhYmxlcyBXSVRIIFJFQUQgTE9DS1xuIjsKKyAgICAgICAgIyBMb2NrIGJhc2UgdGFibGVz IGFuZCB2aWV3cyBzZXBhcmF0ZWx5LgorICAgICAgICBwcmludCAiRkxVU0ggVEFCTEVTICRoY19i YXNlX3RhYmxlcyBXSVRIIFJFQUQgTE9DS1xuIgorICAgICAgICAgIGlmICggJGhjX2Jhc2VfdGFi bGVzICk7CisgICAgICAgIHByaW50ICJMT0NLIFRBQkxFUyAkaGNfdmlld3MgUkVBRFxuIiBpZiAo ICRoY192aWV3cyApOwogICAgIH0KICAgICAKICAgICBwcmludCAiRkxVU0ggTE9HU1xuIiBpZiAo ICRvcHR7Zmx1c2hsb2d9ICk7CkBAIC00ODQsMTYgKzUxMSwyNCBAQCBlbHNlIHsKICAgICAgICAg IyBmbHVzaCB0YWJsZXMgdG8gbWFrZSBvbi1kaXNrIGNvcHkgdXAgdG8gZGF0ZQogICAgICAgICAk c3RhcnQgPSB0aW1lOwogICAgICAgICAkZGJoLT5kbygiRkxVU0ggVEFCTEVTIC8qITMyMzIzICRo Y190YWJsZXMgKi8iKTsKKyAgICAgICAgcHJpbnRmICJGbHVzaGVkIHRhYmxlcyAoJGhjX3RhYmxl cykgaW4gJWQgc2Vjb25kcy5cbiIsIHRpbWUtJHN0YXJ0IHVubGVzcyAkb3B0e3F1aWV0fTsKICAg ICB9CiAgICAgZWxzZSB7Ci0gICAgICAgICRkYmgtPmRvKCJGTFVTSCBUQUJMRVMgJGhjX3RhYmxl cyBXSVRIIFJFQUQgTE9DSyIpOwotICAgICAgICBwcmludGYgIkxvY2tlZCAkbnVtX3RhYmxlcyB0 YWJsZXMgaW4gJWQgc2Vjb25kcy5cbiIsIHRpbWUtJHN0YXJ0IHVubGVzcyAkb3B0e3F1aWV0fTsK LSAgICAgICAgJGhjX3N0YXJ0ZWQgPSB0aW1lOwkjIGNvdW50IGZyb20gdGltZSBsb2NrIGlzIGdy YW50ZWQKKyAgICAgICAgIyBMb2NrIGJhc2UgdGFibGVzIGFuZCB2aWV3cyBzZXBhcmF0ZWx5LCBh cyAnRkxVU0ggVEFCTEVTIDx0YmxfbmFtZT4KKyAgICAgICAgIyAuLi4gV0lUSCBSRUFEIExPQ0sn IChpbnRyb2R1Y2VkIGluIDUuNSkgd291bGQgZmFpbCBmb3Igdmlld3MuCisgICAgICAgICMgQWxz bywgZmx1c2ggdGFibGVzIHRvIG1ha2Ugb24tZGlzayBjb3B5IHVwIHRvIGRhdGUKKyAgICAgICAg JGRiaC0+ZG8oIkZMVVNIIFRBQkxFUyAkaGNfYmFzZV90YWJsZXMgV0lUSCBSRUFEIExPQ0siKQor ICAgICAgICAgIGlmICggJGhjX2Jhc2VfdGFibGVzICk7CisgICAgICAgIHByaW50ZiAiRmx1c2hl ZCAkbnVtX2Jhc2VfdGFibGVzIHRhYmxlcyB3aXRoIHJlYWQgbG9jayAoJGhjX2Jhc2VfdGFibGVz KSBpbiAlZCBzZWNvbmRzLlxuIiwKKyAgICAgICAgICAgICAgIHRpbWUtJHN0YXJ0IHVubGVzcyAk b3B0e3F1aWV0fTsKIAotICAgICAgICAjIGZsdXNoIHRhYmxlcyB0byBtYWtlIG9uLWRpc2sgY29w eSB1cCB0byBkYXRlCiAgICAgICAgICRzdGFydCA9IHRpbWU7CisgICAgICAgICRkYmgtPmRvKCJM T0NLIFRBQkxFUyAkaGNfdmlld3MgUkVBRCIpIGlmICggJGhjX3ZpZXdzICk7CisgICAgICAgIHBy aW50ZiAiTG9ja2VkICRudW1fdmlld3Mgdmlld3MgKCRoY192aWV3cykgaW4gJWQgc2Vjb25kcy5c biIsCisgICAgICAgICAgICAgICB0aW1lLSRzdGFydCB1bmxlc3MgJG9wdHtxdWlldH07CisKKyAg ICAgICAgJGhjX3N0YXJ0ZWQgPSB0aW1lOwkjIGNvdW50IGZyb20gdGltZSBsb2NrIGlzIGdyYW50 ZWQKICAgICB9Ci0gICAgcHJpbnRmICJGbHVzaGVkIHRhYmxlcyAoJGhjX3RhYmxlcykgaW4gJWQg c2Vjb25kcy5cbiIsIHRpbWUtJHN0YXJ0IHVubGVzcyAkb3B0e3F1aWV0fTsKICAgICAkZGJoLT5k byggIkZMVVNIIExPR1MiICkgaWYgKCAkb3B0e2ZsdXNobG9nfSApOwogICAgICRkYmgtPmRvKCAi UkVTRVQgTUFTVEVSIiApIGlmICggJG9wdHtyZXNldG1hc3Rlcn0gKTsKICAgICAkZGJoLT5kbygg IlJFU0VUIFNMQVZFIiApIGlmICggJG9wdHtyZXNldHNsYXZlfSApOwpAQCAtODAyLDE0ICs4Mzcs MjkgQEAgc3ViIGdldF9saXN0X29mX3RhYmxlcyB7CiAKICAgICBteSAkdGFibGVzID0KICAgICAg ICAgZXZhbCB7Ci0gICAgICAgICAgICAkZGJoLT5zZWxlY3RhbGxfYXJyYXlyZWYoJ1NIT1cgVEFC TEVTIEZST00gJyAuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGRiaC0+ cXVvdGVfaWRlbnRpZmllcigkZGIpKQorICAgICAgICAgICAgJGRiaC0+c2VsZWN0YWxsX2FycmF5 cmVmKCdTSE9XIEZVTEwgVEFCTEVTIEZST00gJyAuCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJGRiaC0+cXVvdGVfaWRlbnRpZmllcigkZGIpIC4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnIFdIRVJFIFRhYmxlX3R5cGUgPSBcJ0JBU0UgVEFCTEVc JycpCiAgICAgICAgIH0gfHwgW107CiAgICAgd2FybiAiVW5hYmxlIHRvIHJldHJpZXZlIGxpc3Qg b2YgdGFibGVzIGluICRkYjogJEAiIGlmICRAOwogCiAgICAgcmV0dXJuIChtYXAgeyAkXy0+WzBd IH0gQCR0YWJsZXMpOwogfQogCitzdWIgZ2V0X2xpc3Rfb2Zfdmlld3MgeworICAgIG15ICggJGRi ICkgPSBAXzsKKworICAgIG15ICR2aWV3cyA9CisgICAgICAgIGV2YWwgeworICAgICAgICAgICAg JGRiaC0+c2VsZWN0YWxsX2FycmF5cmVmKCdTSE9XIEZVTEwgVEFCTEVTIEZST00gJyAuCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGRiaC0+cXVvdGVfaWRlbnRpZmllcigk ZGIpIC4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnIFdIRVJFIFRhYmxl X3R5cGUgPSBcJ1ZJRVdcJycpCisgICAgICAgIH0gfHwgW107CisgICAgd2FybiAiVW5hYmxlIHRv IHJldHJpZXZlIGxpc3Qgb2Ygdmlld3MgaW4gJGRiOiAkQCIgaWYgJEA7CisKKyAgICByZXR1cm4g KG1hcCB7ICRfLT5bMF0gfSBAJHZpZXdzKTsKK30KKwogc3ViIHF1b3RlX25hbWVzIHsKICAgbXkg KCAkbmFtZSApID0gQF87CiAgICMgZ2l2ZW4gYSBkYi50YWJsZSBuYW1lLCBhZGQgcXVvdGVzCgpO byBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==