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

IDQyNjMgTWFuaXNoIEt1bWFyCTIwMTItMDgtMjEgW21lcmdlXQogICAgICBCVUcjMTQzODE3MDEg
LSBERUxFVElORyBGUk9NIEEgSEFTSCBXSElMRSBJVEVSQVRJTkcgT1ZFUiBJVCBJUyBXUk9ORwog
ICAgICAKICAgICAgVXBtZXJnZSBmcm9tIG15c3FsLTUuNiAtPiBteXNxbC10cnVuawoKICAgIG1v
ZGlmaWVkOgogICAgICBzcWwvcnBsX3JsaV9wZGIuY2MKIDQyNjIgTWFya28gTcOka2Vsw6QJMjAx
Mi0wOC0yMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNiB0byBteXNxbC10cnVuay4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjCj09PSBtb2RpZmllZCBmaWxlICdzcWwv
cnBsX3JsaV9wZGIuY2MnCi0tLSBhL3NxbC9ycGxfcmxpX3BkYi5jYwkyMDEyLTA4LTA5IDEwOjA4
OjI4ICswMDAwCisrKyBiL3NxbC9ycGxfcmxpX3BkYi5jYwkyMDEyLTA4LTIxIDA4OjUyOjIwICsw
MDAwCkBAIC0xMSw2ICsxMSw5IEBACiAgIHVpbnQgbXRzX2RlYnVnX2NvbmN1cnJlbnRfYWNjZXNz
PSAwOwogI2VuZGlmCiAKKyNkZWZpbmUgSEFTSF9EWU5BTUlDX0lOSVQgNAorI2RlZmluZSBIQVNI
X0RZTkFNSUNfSU5DUiAxCisKIC8qCiAgIFBsZWFzZSBldmVyeSB0aW1lIHlvdSBhZGQgYSBuZXcg
ZmllbGQgdG8gdGhlIHdvcmtlciBzbGF2ZSBpbmZvLCB1cGRhdGUKICAgd2hhdCBmb2xsb3dzLiBG
b3Igbm93LCB0aGlzIGlzIGp1c3QgdXNlZCB0byBnZXQgdGhlIG51bWJlciBvZiBmaWVsZHMuCkBA
IC03MDksNiArNzEyLDEzIEBAIFNsYXZlX3dvcmtlciAqbWFwX2RiX3RvX3dvcmtlcihjb25zdCBj
aGEKIHsKICAgdWludCBpOwogICBEWU5BTUlDX0FSUkFZICp3b3JrZXJzPSAmcmxpLT53b3JrZXJz
OworCisgIC8qCisgICAgQSBkeW5hbWljIGFycmF5IHRvIHN0b3JlIHRoZSBtYXBwaW5nX2RiX3Rv
X3dvcmtlciBoYXNoIGVsZW1lbnRzIAorICAgIHRoYXQgbmVlZHMgdG8gYmUgZGVsZXRlZCwgc2lu
Y2UgZGVsZXRpbmcgdGhlIGhhc2ggZW50aXJlcyB3aGlsZSAKKyAgICBpdGVyYXRpbmcgb3ZlciBp
dCBpcyB3cm9uZy4KKyAgKi8KKyAgRFlOQU1JQ19BUlJBWSBoYXNoX2VsZW1lbnQ7CiAgIFRIRCAq
dGhkPSBybGktPmluZm9fdGhkOwogCiAgIERCVUdfRU5URVIoImdldF9zbGF2ZV93b3JrZXIiKTsK
QEAgLTc5MSwyMSArODAxLDM5IEBAIFNsYXZlX3dvcmtlciAqbWFwX2RiX3RvX3dvcmtlcihjb25z
dCBjaGEKICAgICBlbnRyeS0+d29ya2VyLT51c2FnZV9wYXJ0aXRpb24rKzsKICAgICBpZiAobWFw
cGluZ19kYl90b193b3JrZXIucmVjb3JkcyA+IG10c19wYXJ0aXRpb25faGFzaF9zb2Z0X21heCkK
ICAgICB7Ci0gICAgICAvKiByZW1vdmUgemVyby11c2FnZSAodG9kbzogcmFyZSBvciBsb25nIGFn
byBzY2hlZHVsZWQpIHJlY29yZHMgKi8KKyAgICAgIC8qCisgICAgICAgIHJlbW92ZSB6ZXJvLXVz
YWdlICh0b2RvOiByYXJlIG9yIGxvbmcgYWdvIHNjaGVkdWxlZCkgcmVjb3Jkcy4KKyAgICAgICAg
U3RvcmUgdGhlIGVsZW1lbnQgb2YgdGhlIGhhc2ggaW4gYSBkeW5hbWljIGFycmF5IGFmdGVyIGNo
ZWNraW5nIHdoZXRoZXIKKyAgICAgICAgdGhlIHVzYWdlIG9mIHRoZSBoYXNoIGVudHJ5IGlzIDAg
b3Igbm90LiBXZSBsYXRlciBmcmVlIGl0IGZyb20gdGhlIEhBU0guCisgICAgICAqLworICAgICAg
bXlfaW5pdF9keW5hbWljX2FycmF5KCZoYXNoX2VsZW1lbnQsIHNpemVvZihkYl93b3JrZXJfaGFz
aF9lbnRyeSAqKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBIQVNIX0RZTkFNSUNfSU5J
VCwgSEFTSF9EWU5BTUlDX0lOQ1IpOwogICAgICAgZm9yICh1aW50IGk9IDA7IGkgPCBtYXBwaW5n
X2RiX3RvX3dvcmtlci5yZWNvcmRzOyBpKyspCiAgICAgICB7CisgICAgICAgIERCVUdfQVNTRVJU
KCFlbnRyeS0+dGVtcG9yYXJ5X3RhYmxlcyB8fCAhZW50cnktPnRlbXBvcmFyeV90YWJsZXMtPnBy
ZXYpOworICAgICAgICBEQlVHX0FTU0VSVCghdGhkLT50ZW1wb3JhcnlfdGFibGVzIHx8ICF0aGQt
PnRlbXBvcmFyeV90YWJsZXMtPnByZXYpOworCiAgICAgICAgIGRiX3dvcmtlcl9oYXNoX2VudHJ5
ICplbnRyeT0KICAgICAgICAgICAoZGJfd29ya2VyX2hhc2hfZW50cnkqKSBteV9oYXNoX2VsZW1l
bnQoJm1hcHBpbmdfZGJfdG9fd29ya2VyLCBpKTsKKwogICAgICAgICBpZiAoZW50cnktPnVzYWdl
ID09IDApCiAgICAgICAgIHsKLSAgICAgICAgICBEQlVHX0FTU0VSVCghZW50cnktPnRlbXBvcmFy
eV90YWJsZXMgfHwgIWVudHJ5LT50ZW1wb3JhcnlfdGFibGVzLT5wcmV2KTsKLSAgICAgICAgICBE
QlVHX0FTU0VSVCghdGhkLT50ZW1wb3JhcnlfdGFibGVzIHx8ICF0aGQtPnRlbXBvcmFyeV90YWJs
ZXMtPnByZXYpOwotICAgICAgICAgIAogICAgICAgICAgIG10c19tb3ZlX3RlbXBfdGFibGVzX3Rv
X3RoZCh0aGQsIGVudHJ5LT50ZW1wb3JhcnlfdGFibGVzKTsKICAgICAgICAgICBlbnRyeS0+dGVt
cG9yYXJ5X3RhYmxlcz0gTlVMTDsKLSAgICAgICAgICBteV9oYXNoX2RlbGV0ZSgmbWFwcGluZ19k
Yl90b193b3JrZXIsICh1Y2hhciopIGVudHJ5KTsKKworICAgICAgICAgIC8qIFB1c2ggdGhlIGVs
ZW1lbnQgaW4gdGhlIGR5bmFtaWMgYXJyYXkqLworICAgICAgICAgIHB1c2hfZHluYW1pYygmaGFz
aF9lbGVtZW50LCAodWNoYXIqKSAmZW50cnkpOwogICAgICAgICB9CiAgICAgICB9CisKKyAgICAg
IC8qIERlbGV0ZSB0aGUgaGFzaCBlbGVtZW50IGJhc2VkIG9uIHRoZSB1c2FnZSAqLworICAgICAg
Zm9yICh1aW50IGk9MDsgaSA8IGhhc2hfZWxlbWVudC5lbGVtZW50czsgaSsrKQorICAgICAgewor
ICAgICAgICBkYl93b3JrZXJfaGFzaF9lbnRyeSAqdGVtcF9lbnRyeT0gKihkYl93b3JrZXJfaGFz
aF9lbnRyeSAqKikgZHluYW1pY19hcnJheV9wdHIoJmhhc2hfZWxlbWVudCwgaSk7CisgICAgICAg
IG15X2hhc2hfZGVsZXRlKCZtYXBwaW5nX2RiX3RvX3dvcmtlciwgKHVjaGFyKikgdGVtcF9lbnRy
eSk7ICAgICAgICAKKyAgICAgIH0KKyAgICAgICAgLyogRGVsZXRpbmcgdGhlIGR5bmFtaWMgYXJy
YXkgKi8KKyAgICAgIGRlbGV0ZV9keW5hbWljKCZoYXNoX2VsZW1lbnQpOwogICAgIH0KIAogICAg
IHJldD0gbXlfaGFzaF9pbnNlcnQoJm1hcHBpbmdfZGJfdG9fd29ya2VyLCAodWNoYXIqKSBlbnRy
eSk7CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==