From: Manish Kumar
Date: August 21 2012 8:53am
Subject: bzr push into mysql-5.6 branch (manish.4.kumar:4135 to 4136) Bug#14381701
List-Archive: http://lists.mysql.com/commits/144585
X-Bug: 14381701
Message-Id: <201208210853.q7L8roW7004573@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQxMzYgTWFuaXNoIEt1bWFyCTIwMTItMDgtMjEKICAgICAgQlVHIzE0MzgxNzAxIC0gREVMRVRJ
TkcgRlJPTSBBIEhBU0ggV0hJTEUgSVRFUkFUSU5HIE9WRVIgSVQgSVMgV1JPTkcKICAgICAgCiAg
ICAgIFByb2JsZW0gLSBUaGUgcHJvYmxlbSBpcyB0aGF0IGluIHNxbC9ycGxfcmxpX3BkYi5jYyBm
aWxlIHdlIGRlbGV0ZQogICAgICAgICAgICAgICAgZnJvbSBhIGhhc2ggd2hpbGUgaXRlcmF0aW5n
IG92ZXIgaXQuIFRoaXMgaXMgd3Jvbmcgc2luY2UgCiAgICAgICAgICAgICAgICBkZWxldGUgb3Bl
cmF0aW9uIG1pZ2h0IHJlYXJyYW5nZSBlbGVtZW50cyBpbiBoYXNoLCAKICAgICAgICAgICAgICAg
IHNvICJpdGVyYXRvciIgd2lsbCBiZWNvbWUgaW52YWxpZCBhbmQsIHVubGVzcyBleHRyYSBzdGVw
cwogICAgICAgICAgICAgICAgYXJlIHRha2VuLCBzdWNoIGl0ZXJhdGlvbiBpcyBsaWtlbHkgdG8g
bWlzcyBlbGVtZW50cyB3aGljaCAKICAgICAgICAgICAgICAgIHNob3VsZCBoYXZlIGJlZW4gZGVs
ZXRlZCBvdGhlcndpc2UuCiAgICAgIAogICAgICBGaXggLSBUaGUgcHJvYmxlbSBpcyBmaXhlZCBi
eSBzdG9yaW5nIHRoZSBhZGRyZXNzIG9mIHRoZSBIYXNoIGVsZW1lbnRzIAogICAgICAgICAgICB0
aGF0IG5lZWRzIHRvIGJlIGRlbGV0ZWQgYmFzZWQgb24gdGhlIHVzYWdlLCBpbiB0aGUgRHluYW1p
YyBhcnJheQogICAgICAgICAgICBvZiBwb2ludGVycyBpbiBhIGZvciBsb29wLiBJbiBhIHNlY29u
ZCBpdGVyYXRpb24gd2UgcG9wIHRoZSAKICAgICAgICAgICAgZWxlbWVudHMgb2YgdGhlIGR5bmFt
aWMgYXJyYXkgYW5kIGRlbGV0ZSB0aGUgSGFzaCBlbGVtZW50IGZyb20gCiAgICAgICAgICAgIHRo
YXQgYWRkcmVzcy4gVGhpcyB3aWxsIG5vdCBjYXVzZSBhbnkgaW5jb25zaXN0ZW5jeS4KICAgICBA
IHNxbC9ycGxfcmxpX3BkYi5jYwogICAgICAgIEFkZGVkIHRoZSBuZXcgRHluYW1pYyBhcnJheSAi
IGhhc2hfZWxlbWVudCAiICB3aGljaCBpcyB1c2VkIHRvIHN0b3JlIHRoZQogICAgICAgIGhhc2gg
ZW50cmllcyB0aGF0IG5lZWQgdG8gYmUgZGVsZXRlZC4KCiAgICBtb2RpZmllZDoKICAgICAgc3Fs
L3JwbF9ybGlfcGRiLmNjCiA0MTM1IE1hcmtvIE3DpGtlbMOkCTIwMTItMDgtMjEgW21lcmdlXQog
ICAgICBNZXJnZSBteXNxbC01LjUgdG8gbXlzcWwtNS42LgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBpbnMuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9ycGxfcmxpX3BkYi5jYycKLS0t
IGEvc3FsL3JwbF9ybGlfcGRiLmNjCTIwMTItMDgtMDkgMTA6MDU6MDEgKzAwMDAKKysrIGIvc3Fs
L3JwbF9ybGlfcGRiLmNjCTIwMTItMDgtMjEgMDg6NTA6MzkgKzAwMDAKQEAgLTExLDYgKzExLDkg
QEAKICAgdWludCBtdHNfZGVidWdfY29uY3VycmVudF9hY2Nlc3M9IDA7CiAjZW5kaWYKIAorI2Rl
ZmluZSBIQVNIX0RZTkFNSUNfSU5JVCA0CisjZGVmaW5lIEhBU0hfRFlOQU1JQ19JTkNSIDEKKwog
LyoKICAgUGxlYXNlIGV2ZXJ5IHRpbWUgeW91IGFkZCBhIG5ldyBmaWVsZCB0byB0aGUgd29ya2Vy
IHNsYXZlIGluZm8sIHVwZGF0ZQogICB3aGF0IGZvbGxvd3MuIEZvciBub3csIHRoaXMgaXMganVz
dCB1c2VkIHRvIGdldCB0aGUgbnVtYmVyIG9mIGZpZWxkcy4KQEAgLTcwOSw2ICs3MTIsMTMgQEAg
U2xhdmVfd29ya2VyICptYXBfZGJfdG9fd29ya2VyKGNvbnN0IGNoYQogewogICB1aW50IGk7CiAg
IERZTkFNSUNfQVJSQVkgKndvcmtlcnM9ICZybGktPndvcmtlcnM7CisKKyAgLyoKKyAgICBBIGR5
bmFtaWMgYXJyYXkgdG8gc3RvcmUgdGhlIG1hcHBpbmdfZGJfdG9fd29ya2VyIGhhc2ggZWxlbWVu
dHMgCisgICAgdGhhdCBuZWVkcyB0byBiZSBkZWxldGVkLCBzaW5jZSBkZWxldGluZyB0aGUgaGFz
aCBlbnRpcmVzIHdoaWxlIAorICAgIGl0ZXJhdGluZyBvdmVyIGl0IGlzIHdyb25nLgorICAqLwor
ICBEWU5BTUlDX0FSUkFZIGhhc2hfZWxlbWVudDsKICAgVEhEICp0aGQ9IHJsaS0+aW5mb190aGQ7
CiAKICAgREJVR19FTlRFUigiZ2V0X3NsYXZlX3dvcmtlciIpOwpAQCAtNzkxLDIxICs4MDEsMzkg
QEAgU2xhdmVfd29ya2VyICptYXBfZGJfdG9fd29ya2VyKGNvbnN0IGNoYQogICAgIGVudHJ5LT53
b3JrZXItPnVzYWdlX3BhcnRpdGlvbisrOwogICAgIGlmIChtYXBwaW5nX2RiX3RvX3dvcmtlci5y
ZWNvcmRzID4gbXRzX3BhcnRpdGlvbl9oYXNoX3NvZnRfbWF4KQogICAgIHsKLSAgICAgIC8qIHJl
bW92ZSB6ZXJvLXVzYWdlICh0b2RvOiByYXJlIG9yIGxvbmcgYWdvIHNjaGVkdWxlZCkgcmVjb3Jk
cyAqLworICAgICAgLyoKKyAgICAgICAgcmVtb3ZlIHplcm8tdXNhZ2UgKHRvZG86IHJhcmUgb3Ig
bG9uZyBhZ28gc2NoZWR1bGVkKSByZWNvcmRzLgorICAgICAgICBTdG9yZSB0aGUgZWxlbWVudCBv
ZiB0aGUgaGFzaCBpbiBhIGR5bmFtaWMgYXJyYXkgYWZ0ZXIgY2hlY2tpbmcgd2hldGhlcgorICAg
ICAgICB0aGUgdXNhZ2Ugb2YgdGhlIGhhc2ggZW50cnkgaXMgMCBvciBub3QuIFdlIGxhdGVyIGZy
ZWUgaXQgZnJvbSB0aGUgSEFTSC4KKyAgICAgICovCisgICAgICBteV9pbml0X2R5bmFtaWNfYXJy
YXkoJmhhc2hfZWxlbWVudCwgc2l6ZW9mKGRiX3dvcmtlcl9oYXNoX2VudHJ5ICopLAorICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIEhBU0hfRFlOQU1JQ19JTklULCBIQVNIX0RZTkFNSUNfSU5D
Uik7CiAgICAgICBmb3IgKHVpbnQgaT0gMDsgaSA8IG1hcHBpbmdfZGJfdG9fd29ya2VyLnJlY29y
ZHM7IGkrKykKICAgICAgIHsKKyAgICAgICAgREJVR19BU1NFUlQoIWVudHJ5LT50ZW1wb3Jhcnlf
dGFibGVzIHx8ICFlbnRyeS0+dGVtcG9yYXJ5X3RhYmxlcy0+cHJldik7CisgICAgICAgIERCVUdf
QVNTRVJUKCF0aGQtPnRlbXBvcmFyeV90YWJsZXMgfHwgIXRoZC0+dGVtcG9yYXJ5X3RhYmxlcy0+
cHJldik7CisKICAgICAgICAgZGJfd29ya2VyX2hhc2hfZW50cnkgKmVudHJ5PQogICAgICAgICAg
IChkYl93b3JrZXJfaGFzaF9lbnRyeSopIG15X2hhc2hfZWxlbWVudCgmbWFwcGluZ19kYl90b193
b3JrZXIsIGkpOworCiAgICAgICAgIGlmIChlbnRyeS0+dXNhZ2UgPT0gMCkKICAgICAgICAgewot
ICAgICAgICAgIERCVUdfQVNTRVJUKCFlbnRyeS0+dGVtcG9yYXJ5X3RhYmxlcyB8fCAhZW50cnkt
PnRlbXBvcmFyeV90YWJsZXMtPnByZXYpOwotICAgICAgICAgIERCVUdfQVNTRVJUKCF0aGQtPnRl
bXBvcmFyeV90YWJsZXMgfHwgIXRoZC0+dGVtcG9yYXJ5X3RhYmxlcy0+cHJldik7Ci0gICAgICAg
ICAgCiAgICAgICAgICAgbXRzX21vdmVfdGVtcF90YWJsZXNfdG9fdGhkKHRoZCwgZW50cnktPnRl
bXBvcmFyeV90YWJsZXMpOwogICAgICAgICAgIGVudHJ5LT50ZW1wb3JhcnlfdGFibGVzPSBOVUxM
OwotICAgICAgICAgIG15X2hhc2hfZGVsZXRlKCZtYXBwaW5nX2RiX3RvX3dvcmtlciwgKHVjaGFy
KikgZW50cnkpOworCisgICAgICAgICAgLyogUHVzaCB0aGUgZWxlbWVudCBpbiB0aGUgZHluYW1p
YyBhcnJheSovCisgICAgICAgICAgcHVzaF9keW5hbWljKCZoYXNoX2VsZW1lbnQsICh1Y2hhciop
ICZlbnRyeSk7CiAgICAgICAgIH0KICAgICAgIH0KKworICAgICAgLyogRGVsZXRlIHRoZSBoYXNo
IGVsZW1lbnQgYmFzZWQgb24gdGhlIHVzYWdlICovCisgICAgICBmb3IgKHVpbnQgaT0wOyBpIDwg
aGFzaF9lbGVtZW50LmVsZW1lbnRzOyBpKyspCisgICAgICB7CisgICAgICAgIGRiX3dvcmtlcl9o
YXNoX2VudHJ5ICp0ZW1wX2VudHJ5PSAqKGRiX3dvcmtlcl9oYXNoX2VudHJ5ICoqKSBkeW5hbWlj
X2FycmF5X3B0cigmaGFzaF9lbGVtZW50LCBpKTsKKyAgICAgICAgbXlfaGFzaF9kZWxldGUoJm1h
cHBpbmdfZGJfdG9fd29ya2VyLCAodWNoYXIqKSB0ZW1wX2VudHJ5KTsgICAgICAgIAorICAgICAg
fQorICAgICAgICAvKiBEZWxldGluZyB0aGUgZHluYW1pYyBhcnJheSAqLworICAgICAgZGVsZXRl
X2R5bmFtaWMoJmhhc2hfZWxlbWVudCk7CiAgICAgfQogCiAgICAgcmV0PSBteV9oYXNoX2luc2Vy
dCgmbWFwcGluZ19kYl90b193b3JrZXIsICh1Y2hhciopIGVudHJ5KTsKCk5vIGJ1bmRsZSAocmVh
c29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku