From: Vamsikrishna Bhagi Date: November 20 2012 6:10am Subject: bzr push into mysql-5.5 branch (vamsikrishna.bhagi:4070 to 4071) Bug#14463669 List-Archive: http://lists.mysql.com/commits/145333 X-Bug: 14463669 Message-Id: <20121120061049.11910.63834.4071@vamsibhagi> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQwNzEgVmFtc2lrcmlzaG5hIEJoYWdpCTIwMTItMTEtMjAKICAgICAgQnVnIzE0NDYzNjY5IEZB SUxVUkUgVE8gQ09SUkVDVExZIFBBUlNFIFJPVVRJTkVTIElOCiAgICAgICAgICAgICAgICAgICBN WVNRTERVTVAgT1VUUFVUCiAgICAgIAogICAgICBBIHBhdGNoIGlzIHB1c2hlZCBvbiB0aGlzIGJ1 Zy4gQSByZXN1bHQgbWlzbWF0Y2gKICAgICAgb2NjdXJlZCBmb3IgdGhlIHRlc3QgbWFpbi5kZGxf aTE4bl9rb2k4ciBpbgogICAgICB4ODZfNjQgZ2NvdiBidWlsZCBvZiBsaW51eCBpbiBwYjIuIFRo aXMgY29tbWl0IGlzCiAgICAgIHRvIG1vZGlmeSBkZGxfaTE4bl9rb2k4ci5yZXN1bHQgdG8gbWF0 Y2ggdGhlCiAgICAgIGNoYW5nZXMgbWFkZSBmb3IgdGhlIGJ1Zy4KCiAgICBtb2RpZmllZDoKICAg ICAgbXlzcWwtdGVzdC9yL2RkbF9pMThuX2tvaThyLnJlc3VsdAogNDA3MCBWYW1zaWtyaXNobmEg QmhhZ2kJMjAxMi0xMS0xOQogICAgICBCdWcjMTQ0NjM2NjkgRkFJTFVSRSBUTyBDT1JSRUNUTFkg UEFSU0UgUk9VVElORVMgSU4KICAgICAgICAgICAgICAgICAgIE1ZU1FMRFVNUCBPVVRQVVQKICAg ICAgCiAgICAgIFByb2JsZW06IG15c3FsZHVtcCB3aGVuIHVzZWQgd2l0aCBvcHRpb24gLS1yb3V0 aW5lcywgZHVtcHMKICAgICAgICAgICAgICAgYWxsIHRoZSByb3V0aW5lcyBvZiB0aGUgc3BlY2lm aWVkIGRhdGFiYXNlIGludG8KICAgICAgICAgICAgICAgb3V0cHV0LiBUaGUgc3RhdGVtZW50cyBp biB0aGlzIG91dHB1dCBhcmUgd3JpdHRlbgogICAgICAgICAgICAgICBpbiBzdWNoIGEgd2F5IHRo YXQgdGhleSBhcmUgdmVyc2lvbiBzYWZlIHVzaW5nIEMKICAgICAgICAgICAgICAgc3R5bGUgdmVy c2lvbiBjb21tZW50aW5nIChvZiB0aGUgZm9ybWF0CiAgICAgICAgICAgICAgIC8qITx2ZXJzaW9u IG51bT4gPHNxbCBzdGF0ZW1lbnQ+Ki8pLiBJZiBhIHNlbWljb2xvbgogICAgICAgICAgICAgICBp cyBwcmVzZW50IHJpZ2h0IGJlZm9yZSBjbG9zaW5nIG9mIHRoZSBjb21tZW50IGluCiAgICAgICAg ICAgICAgIGR1bXAgb3V0cHV0LCBpdCByZXN1bHRzIGluIGEgc3ludGF4IGVycm9yIHdoaWxlCiAg ICAgICAgICAgICAgIGltcG9ydGluZy4KICAgICAgCiAgICAgIAogICAgICBTb2x1dGlvbjogVmVy c2lvbiBjb21tZW50cyBmb3IgZHVtcGVkIHJvdXRpbmVzIGFyZQogICAgICAgICAgICAgICAgc3Bl Y2lmaWNhbGx5IHRvIHByb3RlY3QgdGhlIG9uZXMgb2xkZXIgdGhhbiA1LjAuCiAgICAgICAgICAg ICAgICBXaGVuIHRoZSBpbXBvcnQgaXMgZG9uZSBvbiA1LjAgb3IgbGF0ZXIgdmVyc2lvbnMsCiAg ICAgICAgICAgICAgICBlbnRpcmUgY3JlYXRlIHN0YXRlbWVudCBnZXRzIGV4ZWN1dGVkIGFzIGFs bCB0aGUKICAgICAgICAgICAgICAgIGNoZWNrIGNvbmRpdGlvbnMgYXQgdGhlIGJlZ2lubmluZyBv ZiB0aGUgY29tbWVudHMKICAgICAgICAgICAgICAgIGFyZSBjbGVhcmVkLiBTaW5jZSB0aGUgdHJh ZGUgb2ZmIGlzIGJldHdlZW4gdGhlCiAgICAgICAgICAgICAgICBwZXJmb3JtYW5jZSBvZiBuZXdl ciB2ZXJzaW9ucyB3aGljaCBhcmUgbW9yZSBpbgogICAgICAgICAgICAgICAgdXNlIGFuZCBwcm90 ZWN0aW9uIG9mIHZlcnkgb2xkIHZlcnNpb25zIHdoaWNoIGFyZQogICAgICAgICAgICAgICAgbm8g bG9uZ2VyIHN1cHBvcnRlZCwgaXQgaXMgcHJvcG9zZWQgdGhhdCB0aGVzZQogICAgICAgICAgICAg ICAgY29tbWVudHMgYmUgcmVtb3ZlZCBhbHRvZ2V0aGVyIHRvIG1haW50YWluCiAgICAgICAgICAg ICAgICBzdGFiaWxpdHkgb2YgdGhlIHZlcnNpb25zIHN1cHBvcnRlZC4KICAgICBAIGNsaWVudC9t eXNxbGR1bXAuYwogICAgICAgIEJ1ZyMxNDQ2MzY2OSBGQUlMVVJFIFRPIENPUlJFQ1RMWSBQQVJT RSBST1VUSU5FUyBJTgogICAgICAgICAgICAgICAgICAgICBNWVNRTERVTVAgT1VUUFVUCiAgICAg ICAgCiAgICAgICAgT3V0cHV0IG9mIG15c3FsZHVtcCBpcyBkZXJpdmVkIGJ5IGdldHRpbmcgdGhl IHF1ZXJpZXMgZnJvbQogICAgICAgIHNob3cgY3JlYXRlIGFuZCBhcHBlbmRpbmcgdmVyc2lvbiBj b21tZW50cyB0byB0aGVtLgogICAgICAgIHF1ZXJ5X3N0ciBpcyB0aGUgdmFyaWFibGUgdXNlZCB0 byBzdG9yZSB0aGUgZmluYWwgc3RyaW5nLgogICAgICAgIFNpbmNlIGl0IGlzIG5vIGxvbmdlciBy ZXF1aXJlZCwgaXRzIGRlY2xhcmF0aW9uIGFuZAogICAgICAgIG1hbmlwdWxhdGlvbnMgbWFkZSBv biBpdCBhcmUgZGVsZXRlZC4gQXQgdGhlIHN0ZXAgd2hlcmUKICAgICAgICBvdXRwdXQgaXMgcHJp bnRlZCwgcXVlcnlfc3RyIGlzIHJlcGxhY2VkIHdpdGggdGhlIG9yaWdpbmFsCiAgICAgICAgcXVl cnkgc3RyaW5nIGRlcml2ZWQgZnJvbSAnc2hvdyBjcmVhdGUnLgoKICAgIG1vZGlmaWVkOgogICAg ICBjbGllbnQvbXlzcWxkdW1wLmMKICAgICAgbXlzcWwtdGVzdC9yL215c3FsZHVtcC5yZXN1bHQK PT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9kZGxfaTE4bl9rb2k4ci5yZXN1bHQnCi0t LSBhL215c3FsLXRlc3Qvci9kZGxfaTE4bl9rb2k4ci5yZXN1bHQJMjAxMS0wMi0yMiAxNDowMjo0 OSArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvZGRsX2kxOG5fa29pOHIucmVzdWx0CTIwMTItMTEt MjAgMDY6MDA6MzkgKzAwMDAKQEAgLTczNCw3ICs3MzQsNyBAQCBBTFRFUiBEQVRBQkFTRSBgbXlz cWx0ZXN0MWAgQ0hBUkFDVEVSIFNFCiAvKiE1MDAwMyBTRVQgQHNhdmVkX3NxbF9tb2RlICAgICAg ID0gQEBzcWxfbW9kZSAqLyA7CiAvKiE1MDAwMyBTRVQgc3FsX21vZGUgICAgICAgICAgICAgID0g JycgKi8gOwogREVMSU1JVEVSIDs7Ci0vKiE1MDAwMyBDUkVBVEUqLyAvKiE1MDAyMCBERUZJTkVS PWByb290YEBgbG9jYWxob3N0YCovIC8qITUwMDAzIFBST0NFRFVSRSBgcDFgKAorQ1JFQVRFIERF RklORVI9YHJvb3RgQGBsb2NhbGhvc3RgIFBST0NFRFVSRSBgcDFgKAogSU5PVVQg77+977+977+9 77+977+9MSBDSEFSKDEwKSwKIE9VVCDvv73vv73vv73vv73vv70yIENIQVIoMTApKQogQkVHSU4K QEAgLTc1MSw3ICs3NTEsNyBAQCBDT0xMQVRJT04oX3V0ZjggJ9GC0LXQutGB0YInKSBBUyBjNiwK IEBAY2hhcmFjdGVyX3NldF9jbGllbnQgQVMgYzg7CiBTRVQg77+977+977+977+977+9MSA9ICdh JzsKIFNFVCDvv73vv73vv73vv73vv70yID0gJ2InOwotRU5EICovOzsKK0VORCA7OwogREVMSU1J VEVSIDsKIC8qITUwMDAzIFNFVCBzcWxfbW9kZSAgICAgICAgICAgICAgPSBAc2F2ZWRfc3FsX21v ZGUgKi8gOwogLyohNTAwMDMgU0VUIGNoYXJhY3Rlcl9zZXRfY2xpZW50ICA9IEBzYXZlZF9jc19j bGllbnQgKi8gOwpAQCAtNzY4LDcgKzc2OCw3IEBAIEFMVEVSIERBVEFCQVNFIGBteXNxbHRlc3Qx YCBDSEFSQUNURVIgU0UKIC8qITUwMDAzIFNFVCBAc2F2ZWRfc3FsX21vZGUgICAgICAgPSBAQHNx bF9tb2RlICovIDsKIC8qITUwMDAzIFNFVCBzcWxfbW9kZSAgICAgICAgICAgICAgPSAnJyAqLyA7 CiBERUxJTUlURVIgOzsKLS8qITUwMDAzIENSRUFURSovIC8qITUwMDIwIERFRklORVI9YHJvb3Rg QGBsb2NhbGhvc3RgKi8gLyohNTAwMDMgUFJPQ0VEVVJFIGBwMmAoCitDUkVBVEUgREVGSU5FUj1g cm9vdGBAYGxvY2FsaG9zdGAgUFJPQ0VEVVJFIGBwMmAoCiBJTk9VVCDvv73vv73vv73vv73vv70x IENIQVIoMTApIENIQVJBQ1RFUiBTRVQgdXRmOCwKIE9VVCDvv73vv73vv73vv73vv70yIENIQVIo MTApIENIQVJBQ1RFUiBTRVQgdXRmOCkKIEJFR0lOCkBAIC03ODUsNyArNzg1LDcgQEAgQ09MTEFU SU9OKF91dGY4ICfRgtC10LrRgdGCJykgQVMgYzYsCiBAQGNoYXJhY3Rlcl9zZXRfY2xpZW50IEFT IGM4OwogU0VUIO+/ve+/ve+/ve+/ve+/vTEgPSAnYSc7CiBTRVQg77+977+977+977+977+9MiA9 ICdiJzsKLUVORCAqLzs7CitFTkQgOzsKIERFTElNSVRFUiA7CiAvKiE1MDAwMyBTRVQgc3FsX21v ZGUgICAgICAgICAgICAgID0gQHNhdmVkX3NxbF9tb2RlICovIDsKIC8qITUwMDAzIFNFVCBjaGFy YWN0ZXJfc2V0X2NsaWVudCAgPSBAc2F2ZWRfY3NfY2xpZW50ICovIDsKQEAgLTgxMCw3ICs4MTAs NyBAQCBBTFRFUiBEQVRBQkFTRSBgbXlzcWx0ZXN0MmAgQ0hBUkFDVEVSIFNFCiAvKiE1MDAwMyBT RVQgQHNhdmVkX3NxbF9tb2RlICAgICAgID0gQEBzcWxfbW9kZSAqLyA7CiAvKiE1MDAwMyBTRVQg c3FsX21vZGUgICAgICAgICAgICAgID0gJycgKi8gOwogREVMSU1JVEVSIDs7Ci0vKiE1MDAwMyBD UkVBVEUqLyAvKiE1MDAyMCBERUZJTkVSPWByb290YEBgbG9jYWxob3N0YCovIC8qITUwMDAzIFBS T0NFRFVSRSBgcDNgKAorQ1JFQVRFIERFRklORVI9YHJvb3RgQGBsb2NhbGhvc3RgIFBST0NFRFVS RSBgcDNgKAogSU5PVVQg77+977+977+977+977+9MSBDSEFSKDEwKSwKIE9VVCDvv73vv73vv73v v73vv70yIENIQVIoMTApKQogQkVHSU4KQEAgLTgyNyw3ICs4MjcsNyBAQCBDT0xMQVRJT04oX3V0 ZjggJ9GC0LXQutGB0YInKSBBUyBjNiwKIEBAY2hhcmFjdGVyX3NldF9jbGllbnQgQVMgYzg7CiBT RVQg77+977+977+977+977+9MSA9ICdhJzsKIFNFVCDvv73vv73vv73vv73vv70yID0gJ2InOwot RU5EICovOzsKK0VORCA7OwogREVMSU1JVEVSIDsKIC8qITUwMDAzIFNFVCBzcWxfbW9kZSAgICAg ICAgICAgICAgPSBAc2F2ZWRfc3FsX21vZGUgKi8gOwogLyohNTAwMDMgU0VUIGNoYXJhY3Rlcl9z ZXRfY2xpZW50ICA9IEBzYXZlZF9jc19jbGllbnQgKi8gOwpAQCAtODQ0LDcgKzg0NCw3IEBAIEFM VEVSIERBVEFCQVNFIGBteXNxbHRlc3QyYCBDSEFSQUNURVIgU0UKIC8qITUwMDAzIFNFVCBAc2F2 ZWRfc3FsX21vZGUgICAgICAgPSBAQHNxbF9tb2RlICovIDsKIC8qITUwMDAzIFNFVCBzcWxfbW9k ZSAgICAgICAgICAgICAgPSAnJyAqLyA7CiBERUxJTUlURVIgOzsKLS8qITUwMDAzIENSRUFURSov IC8qITUwMDIwIERFRklORVI9YHJvb3RgQGBsb2NhbGhvc3RgKi8gLyohNTAwMDMgUFJPQ0VEVVJF IGBwNGAoCitDUkVBVEUgREVGSU5FUj1gcm9vdGBAYGxvY2FsaG9zdGAgUFJPQ0VEVVJFIGBwNGAo CiBJTk9VVCDvv73vv73vv73vv73vv70xIENIQVIoMTApIENIQVJBQ1RFUiBTRVQgdXRmOCwKIE9V VCDvv73vv73vv73vv73vv70yIENIQVIoMTApIENIQVJBQ1RFUiBTRVQgdXRmOCkKIEJFR0lOCkBA IC04NjEsNyArODYxLDcgQEAgQ09MTEFUSU9OKF91dGY4ICfRgtC10LrRgdGCJykgQVMgYzYsCiBA QGNoYXJhY3Rlcl9zZXRfY2xpZW50IEFTIGM4OwogU0VUIO+/ve+/ve+/ve+/ve+/vTEgPSAnYSc7 CiBTRVQg77+977+977+977+977+9MiA9ICdiJzsKLUVORCAqLzs7CitFTkQgOzsKIERFTElNSVRF UiA7CiAvKiE1MDAwMyBTRVQgc3FsX21vZGUgICAgICAgICAgICAgID0gQHNhdmVkX3NxbF9tb2Rl ICovIDsKIC8qITUwMDAzIFNFVCBjaGFyYWN0ZXJfc2V0X2NsaWVudCAgPSBAc2F2ZWRfY3NfY2xp ZW50ICovIDsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku