From: Vinay Fisrekar Date: September 27 2012 7:09am Subject: bzr push into mysql-5.6-wl6494 branch (vinay.fisrekar:4335 to 4336) Bug#14681799 List-Archive: http://lists.mysql.com/commits/144914 X-Bug: 14681799 Message-Id: <201209270710.q8R7ADP6026939@vinayf-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQzMzYgVmluYXkgRmlzcmVrYXIJMjAxMi0wOS0yNwogICAgICBGaXgobWFya28ncyBjaGFuZ2Up IEJ1ZyMxNDY4MTc5OSBDUkFTSCBSRUNPVkVSWSBXQVJOSU5HUyBPTiBNQUMgT1MgWCAgYW5kIHRl c3QgZmFpbHVyZSAKICAgICAgKG9mIGdyZXAgb24gZXJyb3IgbG9nIGFuZCAgQWRkZWQgc2l6ZSBj aGVjayBmb3Jpbm5vZGJfbG9nX2ZpbGVzX2luX2dyb3VwIGluIHRlc3QpCgogICAgbW9kaWZpZWQ6 CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWxvZy1maWxlLXNpemUtMS5y ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6 ZS0xLnRlc3QKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuY2MKIDQzMzUgTWFy a28gTcOka2Vsw6QJMjAxMi0wOS0yNgogICAgICBXTCM2NDk0OiBFbmFibGUgYSB0ZXN0LgoKICAg IG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmls ZS1zaXplLTEudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv ci9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9p bm5vZGIvci9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnJlc3VsdAkyMDEyLTA5LTI2IDIwOjMxOjQ3 ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWxvZy1maWxlLXNp emUtMS5yZXN1bHQJMjAxMi0wOS0yNyAwNzowNjoxMSArMDAwMApAQCAtNDcsNiArNDcsMTEgQEAg aWQJTEVGVChiZmllbGQsMjApCiAxMQlhYWFhYWFhYWFhYWFhYWFhYWFhYQogMTIJYmJiYmJiYmJi YmJiYmJiYmJiYmIKIDEzCWNjY2NjY2NjY2NjY2NjY2NjY2NjCitUaGUgc2l6ZSBvZiB0aGUgaWJf bG9nZmlsZTAgZmlsZTogMTUgCitUaGUgc2l6ZSBvZiB0aGUgaWJfbG9nZmlsZTEgZmlsZTogMTUg CitUaGUgc2l6ZSBvZiB0aGUgaWJfbG9nZmlsZTIgZmlsZTogMTUgCitUaGUgc2l6ZSBvZiB0aGUg aWJfbG9nZmlsZTMgZmlsZTogMTUgCitUaGUgc2l6ZSBvZiB0aGUgaWJfbG9nZmlsZTQgZmlsZTog MTUgCiBVU0UgZGJfd2w2NDk0OwogU0VMRUNUIGlkLExFRlQoYmZpZWxkLDIwKSBGUk9NIHQxOwog aWQJTEVGVChiZmllbGQsMjApCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9p bm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3Vp dGUvaW5ub2RiL3QvaW5ub2RiLWxvZy1maWxlLXNpemUtMS50ZXN0CTIwMTItMDktMjYgMjA6Mzg6 MjIgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUt c2l6ZS0xLnRlc3QJMjAxMi0wOS0yNyAwNzowNjoxMSArMDAwMApAQCAtNzgsMTMgKzc4LDM0IEBA IFNFTEVDVCBpZCxMRUZUKGJmaWVsZCwyMCkgRlJPTSB0MTsKIC0tZW5hYmxlX3JlY29ubmVjdAog IyBXcml0ZSBmaWxlIHRvIG1ha2UgbXlzcWwtdGVzdC1ydW4ucGwgc3RhcnQgdXAgdGhlIHNlcnZl ciBhZ2FpbgogIyBzZXQgbG9nIHNpemUgZnJvbSA1TSB0byAxME0KLS0tZXhlYyBlY2hvICJyZXN0 YXJ0OiAtLWlubm9kYi1sb2ctZmlsZS1zaXplPTE1TSAtLWlubm9kYl9sb2dfZmlsZXNfaW5fZ3Jv dXA9NSIgPiAkTVlTUUxURVNUX1ZBUkRJUi90bXAvbXlzcWxkLjEuZXhwZWN0CistLWV4ZWMgZWNo byAicmVzdGFydDogLS1pbm5vZGItbG9nLWZpbGUtc2l6ZT0xNU0gLS1pbm5vZGJfbG9nX2ZpbGVz X2luX2dyb3VwPTUgIC0tbG9nLWVycm9yPSRNWVNRTFRFU1RfVkFSRElSL2xvZy9jYXNlMS5lcnIi ID4gJE1ZU1FMVEVTVF9WQVJESVIvdG1wL215c3FsZC4xLmV4cGVjdAogLS1zb3VyY2UgaW5jbHVk ZS93YWl0X3VudGlsX2Nvbm5lY3RlZF9hZ2Fpbi5pbmMKIAotbGV0IFNFQVJDSF9GSUxFPSAkTVlT UUxURVNUX1ZBUkRJUi9sb2cvbXlzcWxkLjEuZXJyOworbGV0IFNFQVJDSF9GSUxFPSAkTVlTUUxU RVNUX1ZBUkRJUi9sb2cvY2FzZTEuZXJyOwogbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFN0 YXJ0aW5nIGFuIGFwcGx5IGJhdGNoIG9mIGxvZyByZWNvcmRzOwogLS1zb3VyY2UgaW5jbHVkZS9z ZWFyY2hfcGF0dGVybl9pbl9maWxlLmluYwogCisjIENoZWNrIHNpemUgb2YgaWJfbG9nZmlsZSog d2hlbiBpbm5vZGJfbG9nX2ZpbGVzX2luX2dyb3VwIGlzIHNldCAKK3Blcmw7CisgbXkgJGRpciA9 ICRFTlZ7J01ZU1FMRF9EQVRBRElSJ307CisgJGZpbGUgPSAiaWJfbG9nZmlsZTAiOworICRzaXpl X2luX01CID0gKC1zICIkZGlyLyRmaWxlIikgLyAoMTAyNCAqIDEwMjQpOzsKKyBwcmludCAiVGhl IHNpemUgb2YgdGhlICRmaWxlIGZpbGU6ICRzaXplX2luX01CIFxuIjsKKyAkZmlsZSA9ICJpYl9s b2dmaWxlMSI7CisgJHNpemVfaW5fTUIgPSAoLXMgIiRkaXIvJGZpbGUiKSAvICgxMDI0ICogMTAy NCk7OworIHByaW50ICJUaGUgc2l6ZSBvZiB0aGUgJGZpbGUgZmlsZTogJHNpemVfaW5fTUIgXG4i OworICRmaWxlID0gImliX2xvZ2ZpbGUyIjsKKyAkc2l6ZV9pbl9NQiA9ICgtcyAiJGRpci8kZmls ZSIpIC8gKDEwMjQgKiAxMDI0KTs7CisgcHJpbnQgIlRoZSBzaXplIG9mIHRoZSAkZmlsZSBmaWxl OiAkc2l6ZV9pbl9NQiBcbiI7CisgJGZpbGUgPSAiaWJfbG9nZmlsZTMiOworICRzaXplX2luX01C ID0gKC1zICIkZGlyLyRmaWxlIikgLyAoMTAyNCAqIDEwMjQpOzsKKyBwcmludCAiVGhlIHNpemUg b2YgdGhlICRmaWxlIGZpbGU6ICRzaXplX2luX01CIFxuIjsKKyAkZmlsZSA9ICJpYl9sb2dmaWxl NCI7CisgJHNpemVfaW5fTUIgPSAoLXMgIiRkaXIvJGZpbGUiKSAvICgxMDI0ICogMTAyNCk7Owor IHByaW50ICJUaGUgc2l6ZSBvZiB0aGUgJGZpbGUgZmlsZTogJHNpemVfaW5fTUIgXG4iOworRU9G CisKKwogVVNFIGRiX3dsNjQ5NDsKIFNFTEVDVCBpZCxMRUZUKGJmaWVsZCwyMCkgRlJPTSB0MTsK IC0tRVJST1IgRVJfRFVQX0VOVFJZCkBAIC0xNDEsMTAgKzE2MiwxMCBAQCBTRUxFQ1QgaWQsTEVG VChiZmllbGQsMjApIEZST00gdDE7CiAtLWVuYWJsZV9yZWNvbm5lY3QKICMgV3JpdGUgZmlsZSB0 byBtYWtlIG15c3FsLXRlc3QtcnVuLnBsIHN0YXJ0IHVwIHRoZSBzZXJ2ZXIgYWdhaW4KICMgc2V0 IGxvZyBzaXplIGZyb20gMTVNIHRvIDEwTQotLS1leGVjIGVjaG8gInJlc3RhcnQ6IC0taW5ub2Ri LWxvZy1maWxlLXNpemU9MTBNIC0taW5ub2RiX2xvZ19maWxlc19pbl9ncm91cD0yIiA+ICRNWVNR TFRFU1RfVkFSRElSL3RtcC9teXNxbGQuMS5leHBlY3QKKy0tZXhlYyBlY2hvICJyZXN0YXJ0OiAt LWlubm9kYi1sb2ctZmlsZS1zaXplPTEwTSAtLWlubm9kYl9sb2dfZmlsZXNfaW5fZ3JvdXA9MiAg LS1sb2ctZXJyb3I9JE1ZU1FMVEVTVF9WQVJESVIvbG9nL2Nhc2UyLmVyciIgPiAkTVlTUUxURVNU X1ZBUkRJUi90bXAvbXlzcWxkLjEuZXhwZWN0CiAtLXNvdXJjZSBpbmNsdWRlL3dhaXRfdW50aWxf Y29ubmVjdGVkX2FnYWluLmluYwogCi1sZXQgU0VBUkNIX0ZJTEU9ICRNWVNRTFRFU1RfVkFSRElS L2xvZy9teXNxbGQuMS5lcnI7CitsZXQgU0VBUkNIX0ZJTEU9ICRNWVNRTFRFU1RfVkFSRElSL2xv Zy9jYXNlMi5lcnI7CiBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU3RhcnRpbmcgYW4gYXBw bHkgYmF0Y2ggb2YgbG9nIHJlY29yZHM7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJu X2luX2ZpbGUuaW5jCiAKQEAgLTI1MSw3ICsyNzIsMTIgQEAgSU5TRVJUIElOVE8gdDEgVkFMVUVT ICgxLHJlcGVhdCgnYScsMjAwMAogIyBjbGVhbnVwIGFuZCBzZXQgb3JpZ2luYWwgdmFsdWVzIAog RFJPUCBUQUJMRSB0MTsKIERST1AgREFUQUJBU0UgZGJfd2w2NDk0OworLS1lcnJvciAwLDEKIC0t cmVtb3ZlX2ZpbGUgJE1ZU1FMVEVTVF9WQVJESVIvbG9nL215c3FsZC4xLmVyci5vbGQxCistLWVy cm9yIDAsMQorLS1yZW1vdmVfZmlsZSAkTVlTUUxURVNUX1ZBUkRJUi9sb2cvY2FzZTEuZXJyCist LWVycm9yIDAsMQorLS1yZW1vdmVfZmlsZSAkTVlTUUxURVNUX1ZBUkRJUi9sb2cvY2FzZTIuZXJy CiAtLWRpc2FibGVfcXVlcnlfbG9nCiBldmFsIFNFVCBHTE9CQUwgSU5OT0RCX0ZJTEVfRk9STUFU PSRpbm5vZGJfZmlsZV9mb3JtYXQ7CiBldmFsIFNFVCBHTE9CQUwgSU5OT0RCX0ZJTEVfUEVSX1RB QkxFPSRpbm5vZGJfZmlsZV9wZXJfdGFibGU7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p bm5vYmFzZS9sb2cvbG9nMHJlY3YuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBy ZWN2LmNjCTIwMTItMDktMjUgMjA6NTc6MjEgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9s b2cvbG9nMHJlY3YuY2MJMjAxMi0wOS0yNyAwNzowNjoxMSArMDAwMApAQCAtMzE1NCw3ICszMTU0 LDcgQEAgcmVjdl9yZWNvdmVyeV9mcm9tX2NoZWNrcG9pbnRfc3RhcnRfZnVuYwogCQkJfQogCiAJ CQlpZiAoIXJlY3ZfbmVlZGVkX3JlY292ZXJ5KSB7Ci0JCQkJaWJfbG9nZihJQl9MT0dfTEVWRUxf V0FSTiwKKwkJCQlpYl9sb2dmKElCX0xPR19MRVZFTF9JTkZPLAogCQkJCQkiVGhlIGxvZyBzZXF1 ZW5jZSBudW1iZXJzICIKIAkJCQkJTFNOX1BGICIgYW5kICIgTFNOX1BGCiAJCQkJCSIgaW4gaWJk YXRhIGZpbGVzIGRvIG5vdCBtYXRjaCIKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBw dXNoIGVtYWlscyku