From: Annamalai Gurusami
Date: December 28 2011 8:38am
Subject: bzr push into mysql-trunk branch (annamalai.gurusami:3691 to 3692)
 Bug#13255225
List-Archive: http://lists.mysql.com/commits/142272
X-Bug: 13255225
Message-Id: <201112280838.pBS8ctOO017106@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2OTIgQW5uYW1hbGFpIEd1cnVzYW1pCTIwMTEtMTItMjgKICAgICAgQnVnICMxMzI1NTIyNTog
VEhFIFZBTFVFIE9GIElOTk9EQl9VTkRPX0xPR1MgSU4gTVkuQ05GIElTIElHTk9SRUQKICAgICAg
CiAgICAgIEludHJvZHVjZWQgYSBuZXcgcmVhZCBvbmx5IHN0YXR1cyB2YXJpYWJsZSBzcnZfYXZh
aWxhYmxlX3VuZG9fbG9ncy4gIAogICAgICBEdXJpbmcgc3RhcnR1cCwgdGhpcyB2YXJpYWJsZSB3
aWxsIGJlIHNldCB0byB0aGUgdG90YWwgYXZhaWxhYmxlIAogICAgICBudW1iZXIgb2Ygcm9sbGJh
Y2sgc2VnbWVudHMuICBVc2VycyBjYW4gYWNjZXNzIHRoaXMgdmFyaWFibGUgdG8gZmluZAogICAg
ICBvdXQgdGhlIGF2YWlsYWJsZSBudW1iZXIgb2Ygcm9sbGJhY2sgc2VnbWVudHMuICBUaGUgaW5u
b2RiX3VuZG9fbG9ncwogICAgICB3aWxsIGNvbnRhaW4gdGhlIG51bWJlciBvZiBhY3RpdmUgcm9s
bGJhY2sgc2VnbWVudHMuIAogICAgICAKICAgICAgUmV2aWV3IEJvYXJkIGxpbms6CiAgICAgIGh0
dHA6Ly9idXIwMy5uby5vcmFjbGUuY29tL3JiL3IvODYyLwoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9zcnYwc3J2LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5j
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MKIDM2OTEgTWFya28gTcOk
a2Vsw6QJMjAxMS0xMi0yNwogICAgICBDb3JyZWN0IHRoZSBjb21tZW50IG9mIHJ3X2xvY2tfeF9s
b2NrX2xvdygpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3N5bmMvc3lu
YzBydy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lu
bm9kYi5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTIyNzE1Mzk1Ni11YmZqM3I0dWhiMmk1OWVv
CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6YW5uYW1h
bGFpLmd1cnVzYW1pQG9yYWNsZS5jb20tMjAxMTEyMjgwODM3MDgteGc3N2RveHR2c3VyYTh0OQpA
QCAtNTY5LDYgKzU2OSw4IEBAIHN0YXRpYyBTSE9XX1ZBUiBpbm5vZGJfc3RhdHVzX3ZhcmlhYmxl
c1sKICAgKGNoYXIqKSAmZXhwb3J0X3ZhcnMuaW5ub2RiX251bV9vcGVuX2ZpbGVzLAkJICBTSE9X
X0xPTkd9LAogICB7InRydW5jYXRlZF9zdGF0dXNfd3JpdGVzIiwKICAgKGNoYXIqKSAmZXhwb3J0
X3ZhcnMuaW5ub2RiX3RydW5jYXRlZF9zdGF0dXNfd3JpdGVzLAkgIFNIT1dfTE9OR30sCisgIHsi
YXZhaWxhYmxlX3VuZG9fbG9ncyIsCisgIChjaGFyKikgJmV4cG9ydF92YXJzLmlubm9kYl9hdmFp
bGFibGVfdW5kb19sb2dzLCAgICAgICAgU0hPV19MT05HfSwKICAge051bGxTLCBOdWxsUywgU0hP
V19MT05HfQogfTsKIApAQCAtMTMzMTUsNiArMTMzMTcsMzkgQEAgaW5ub2RiX2NoYW5nZV9idWZm
ZXJfbWF4X3NpemVfdXBkYXRlKAogCWlidWZfbWF4X3NpemVfdXBkYXRlKGlubm9iYXNlX2NoYW5n
ZV9idWZmZXJfbWF4X3NpemUpOwogfQogCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKK0NoZWNrIGlmIGlubm9kYl91
bmRvX2xvZ3MgaXMgdmFsaWQuIFRoaXMgZnVuY3Rpb24gaXMgcmVnaXN0ZXJlZCBhcworYSBjYWxs
YmFjayB3aXRoIE15U1FMLgorQHJldHVybgkwIGZvciB2YWxpZCBpbm5vZGJfdW5kb19sb2dzCitA
c2VlIG15c3FsX3Zhcl9jaGVja19mdW5jICovCitzdGF0aWMKK2ludAoraW5ub2RiX3VuZG9fbG9n
c192YWxpZGF0ZSgKKy8qPT09PT09PT09PT09PT09PT09PT09PSovCisJVEhEKgkJCQl0aGQsCS8q
ITwgaW46IHRocmVhZCBoYW5kbGUgKi8KKwlzdHJ1Y3Qgc3RfbXlzcWxfc3lzX3ZhcioJdmFyLAkv
KiE8IGluOiBwdHIgdG8gc3lzIHZhciAqLworCXZvaWQqCQkJCXNhdmUsCS8qITwgb3V0OiBpbW1l
ZGlhdGUgcmVzdWx0CisJCQkJCQlmb3IgdXBkYXRlIGZ1bmN0aW9uICovCisJc3RydWN0IHN0X215
c3FsX3ZhbHVlKgkJdmFsdWUpCS8qITwgaW46IGluY29taW5nIHN0cmluZyAqLworeworICAgICAg
ICBsb25nIGxvbmcgcnNlZ3M7CisKKwlEQlVHX0VOVEVSKCJpbm5vZGJfdW5kb19sb2dzX3ZhbGlk
YXRlIik7CisKKwlEQlVHX0FTU0VSVChzYXZlICE9IE5VTEwpOworCURCVUdfQVNTRVJUKHZhbHVl
ICE9IE5VTEwpOworCURCVUdfQVNTRVJUKHNydl9hdmFpbGFibGVfdW5kb19sb2dzIDw9IFRSWF9T
WVNfTl9SU0VHUyk7CisKKwl2YWx1ZS0+dmFsX2ludCh2YWx1ZSwgJnJzZWdzKTsKKworICAgICAg
ICBpZiAocnNlZ3MgPiAobG9uZyBsb25nKSBzcnZfYXZhaWxhYmxlX3VuZG9fbG9ncykgeworCQly
c2VncyA9IHNydl9hdmFpbGFibGVfdW5kb19sb2dzOworCX0KKwkqcmVpbnRlcnByZXRfY2FzdDx1
bGludCo+KHNhdmUpID0gc3RhdGljX2Nhc3Q8dWxpbnQ+KHJzZWdzKTsKKworCURCVUdfUkVUVVJO
KDApOworfQorCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKIEZpbmQgdGhlIGNvcnJlc3BvbmRpbmcgaWJ1Zl91c2VfdCB2
YWx1ZSB0aGF0IGluZGV4ZXMgaW50bwogaW5ub2Jhc2VfY2hhbmdlX2J1ZmZlcmluZ192YWx1ZXNb
XSBhcnJheSBmb3IgdGhlIGlucHV0CkBAIC0xNDY2NCw3ICsxNDY5OSw3IEBAIHN0YXRpYyBNWVNR
TF9TWVNWQVJfVUxPTkcodW5kb190YWJsZXNwYWMKIHN0YXRpYyBNWVNRTF9TWVNWQVJfVUxPTkco
dW5kb19sb2dzLCBzcnZfdW5kb19sb2dzLAogICBQTFVHSU5fVkFSX09QQ01EQVJHLAogICAiTnVt
YmVyIG9mIHVuZG8gbG9ncyB0byB1c2UuIiwKLSAgTlVMTCwgTlVMTCwKKyAgaW5ub2RiX3VuZG9f
bG9nc192YWxpZGF0ZSwgTlVMTCwKICAgVFJYX1NZU19OX1JTRUdTLAkvKiBEZWZhdWx0IHNldHRp
bmcgKi8KICAgMSwJCQkvKiBNaW5pbXVtIHZhbHVlICovCiAgIFRSWF9TWVNfTl9SU0VHUywgMCk7
CS8qIE1heGltdW0gdmFsdWUgKi8KQEAgLTE1MTgxLDMgKzE1MjE2LDUgQEAgaGFfaW5ub2Jhc2U6
OmlkeF9jb25kX3B1c2goCiAJLyogV2Ugd2lsbCBldmFsdWF0ZSB0aGUgY29uZGl0aW9uIGVudGly
ZWx5ICovCiAJREJVR19SRVRVUk4oTlVMTCk7CiB9CisKKwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zcnYwc3J2LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9zcnYwc3J2LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTEyMjcx
NTM5NTYtdWJmajNyNHVoYjJpNTllbworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2
MHNydi5oCXJldmlkOmFubmFtYWxhaS5ndXJ1c2FtaUBvcmFjbGUuY29tLTIwMTExMjI4MDgzNzA4
LXhnNzdkb3h0dnN1cmE4dDkKQEAgLTI4OSw2ICsyODksNyBAQCBleHRlcm4gaWJvb2wJc3J2X3By
aW9yaXR5X2Jvb3N0OwogZXh0ZXJuIHVsaW50CXNydl9uX2xvY2tfd2FpdF9jb3VudDsKIAogZXh0
ZXJuIHVsaW50CXNydl90cnVuY2F0ZWRfc3RhdHVzX3dyaXRlczsKK2V4dGVybiB1bGludAlzcnZf
YXZhaWxhYmxlX3VuZG9fbG9nczsKIAogZXh0ZXJuCXVsaW50CXNydl9tZW1fcG9vbF9zaXplOwog
ZXh0ZXJuCXVsaW50CXNydl9sb2NrX3RhYmxlX3NpemU7CkBAIC03OTEsNiArNzkyLDcgQEAgc3Ry
dWN0IGV4cG9ydF92YXJfc3RydWN0ewogCXVsaW50IGlubm9kYl9yb3dzX2RlbGV0ZWQ7CQkvKiE8
IHNydl9uX3Jvd3NfZGVsZXRlZCAqLwogCXVsaW50IGlubm9kYl9udW1fb3Blbl9maWxlczsJCS8q
ITwgZmlsX25fZmlsZV9vcGVuZWQgKi8KIAl1bGludCBpbm5vZGJfdHJ1bmNhdGVkX3N0YXR1c193
cml0ZXM7CS8qITwgc3J2X3RydW5jYXRlZF9zdGF0dXNfd3JpdGVzICovCisJdWxpbnQgaW5ub2Ri
X2F2YWlsYWJsZV91bmRvX2xvZ3M7ICAgICAgIC8qITwgc3J2X2F2YWlsYWJsZV91bmRvX2xvZ3Mg
Ki8KIH07CiAKIC8qKiBUaHJlYWQgc2xvdCBpbiB0aGUgdGhyZWFkIHRhYmxlLiAgKi8KCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmNjJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTExMjI3MTUzOTU2LXViZmozcjR1aGIyaTU5ZW8KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9z
cnYvc3J2MHNydi5jYwlyZXZpZDphbm5hbWFsYWkuZ3VydXNhbWlAb3JhY2xlLmNvbS0yMDExMTIy
ODA4MzcwOC14Zzc3ZG94dHZzdXJhOHQ5CkBAIC0zODYsNiArMzg2LDcgQEAgc3RhdGljIHVsaW50
CQlzcnZfbl9yb3dzX2RlbGV0ZWRfb2xkCQk9CiBzdGF0aWMgdWxpbnQJCXNydl9uX3Jvd3NfcmVh
ZF9vbGQJCT0gMDsKIAogVU5JVl9JTlRFUk4gdWxpbnQJc3J2X3RydW5jYXRlZF9zdGF0dXNfd3Jp
dGVzCT0gMDsKK1VOSVZfSU5URVJOIHVsaW50CXNydl9hdmFpbGFibGVfdW5kb19sb2dzICAgICAg
ICAgPSAwOwogCiAvKiBTZXQgdGhlIGZvbGxvd2luZyB0byAwIGlmIHlvdSB3YW50IElubm9EQiB0
byB3cml0ZSBtZXNzYWdlcyBvbgogc3RkZXJyIG9uIHN0YXJ0dXAvc2h1dGRvd24uICovCkBAIC0x
MzY4LDYgKzEzNjksNyBAQCBzcnZfZXhwb3J0X2lubm9kYl9zdGF0dXModm9pZCkKIAlleHBvcnRf
dmFycy5pbm5vZGJfcm93c19kZWxldGVkID0gc3J2X25fcm93c19kZWxldGVkOwogCWV4cG9ydF92
YXJzLmlubm9kYl9udW1fb3Blbl9maWxlcyA9IGZpbF9uX2ZpbGVfb3BlbmVkOwogCWV4cG9ydF92
YXJzLmlubm9kYl90cnVuY2F0ZWRfc3RhdHVzX3dyaXRlcyA9IHNydl90cnVuY2F0ZWRfc3RhdHVz
X3dyaXRlczsKKwlleHBvcnRfdmFycy5pbm5vZGJfYXZhaWxhYmxlX3VuZG9fbG9ncyA9IHNydl9h
dmFpbGFibGVfdW5kb19sb2dzOwogCiAJbXV0ZXhfZXhpdCgmc3J2X2lubm9kYl9tb25pdG9yX211
dGV4KTsKIH0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3Rh
cnQuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTIyNzE1Mzk1Ni11YmZqM3I0dWhiMmk1OWVvCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwlyZXZpZDphbm5hbWFsYWkuZ3VydXNh
bWlAb3JhY2xlLmNvbS0yMDExMTIyODA4MzcwOC14Zzc3ZG94dHZzdXJhOHQ5CkBAIC0yMTcwLDEy
ICsyMTcwLDExIEBAIGlubm9iYXNlX3N0YXJ0X29yX2NyZWF0ZV9mb3JfbXlzcWwodm9pZCkKIAl1
dF9hKHNydl91bmRvX2xvZ3MgPiAwKTsKIAl1dF9hKHNydl91bmRvX2xvZ3MgPD0gVFJYX1NZU19O
X1JTRUdTKTsKIAotCS8qIE5vdGU6IFdlIHNldCB0aGUgY29uZmlnIHZhcmlhYmxlIGhlcmUgdG8g
dGhlIG51bWJlciBvZiByb2xsYmFjawotCXNlZ21lbnRzIHRoYXQgYXJlIGFjdHVhbGx5IGFjdGl2
ZS4gVGhpcyBhbGxvd3MgdGhlIHVzZXIgdG8gZGlzY292ZXIKLQl0aGUgY3VycmVudGx5IGNvbmZp
Z3VyZWQgbnVtYmVyIG9mIHVuZG8gc2VnbWVudHMgaW4gYW4gZXhpc3RpbmcKLQlpbnN0YW5jZS4g
Ki8KKwkvKiBUaGUgbnVtYmVyIG9mIHJzZWdzIHRoYXQgZXhpc3QgaW4gSW5ub0RCIGlzIGdpdmVu
IGJ5IHN0YXR1cworCXZhcmlhYmxlIHNydl9hdmFpbGFibGVfdW5kb19sb2dzLiBUaGUgbnVtYmVy
IG9mIHJzZWdzIHRvIHVzZSBjYW4KKwliZSBzZXQgdXNpbmcgdGhlIGR5bmFtaWMgZ2xvYmFsIHZh
cmlhYmxlIHNydl91bmRvX2xvZ3MuICovCiAKLQlzcnZfdW5kb19sb2dzID0gdHJ4X3N5c19jcmVh
dGVfcnNlZ3MoCisJc3J2X2F2YWlsYWJsZV91bmRvX2xvZ3MgPSB0cnhfc3lzX2NyZWF0ZV9yc2Vn
cygKIAkJc3J2X3VuZG9fdGFibGVzcGFjZXMsIHNydl91bmRvX2xvZ3MpOwogCiAJLyogQ3JlYXRl
IHRoZSB0aHJlYWQgd2hpY2ggd2F0Y2hlcyB0aGUgdGltZW91dHMgZm9yIGxvY2sgd2FpdHMgKi8K
Ck5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku