From: Annamalai Gurusami
Date: December 20 2012 1:55pm
Subject: bzr push into mysql-5.6 branch (annamalai.gurusami:4809 to 4810)
List-Archive: http://lists.mysql.com/commits/145536
Message-Id: <20121220135534.2105.52514.4810@rainbow>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQ4MTAgQW5uYW1hbGFpIEd1cnVzYW1pCTIwMTItMTItMjAgW21lcmdlXQogICAgICBNZXJnZSBm
cm9tIG15c3FsLTUuNSB0byBteXNxbC01LjYuIAoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2FyY2hpdmUvaGFfYXJjaGl2ZS5jYwogNDgwOSBNYXJrbyBNw6RrZWzDpAkyMDEyLTEyLTIwIFtt
ZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS42IHRvIHdvcmtpbmcgY29weS4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9hcmNoaXZlL2hhX2FyY2hpdmUuY2MnCi0tLSBhL3N0b3JhZ2UvYXJjaGl2ZS9o
YV9hcmNoaXZlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIxMjIwMDc1ODM3
LWFkanl1dTkxZ2t0YnEzZmwKKysrIGIvc3RvcmFnZS9hcmNoaXZlL2hhX2FyY2hpdmUuY2MJcmV2
aWQ6YW5uYW1hbGFpLmd1cnVzYW1pQG9yYWNsZS5jb20tMjAxMjEyMjAxMzUwMjItbHVncDFkemh3
eDFjZzMxeApAQCAtOTY1LDEwICs5NjUsMTEgQEAgaW50IGhhX2FyY2hpdmU6OndyaXRlX3Jvdyh1
Y2hhciAqYnVmKQogICBoYV9zdGF0aXN0aWNfaW5jcmVtZW50KCZTU1Y6OmhhX3dyaXRlX2NvdW50
KTsKICAgbXlzcWxfbXV0ZXhfbG9jaygmc2hhcmUtPm11dGV4KTsKIAotICBpZiAoIXNoYXJlLT5h
cmNoaXZlX3dyaXRlX29wZW4pCi0gICAgaWYgKHNoYXJlLT5pbml0X2FyY2hpdmVfd3JpdGVyKCkp
Ci0gICAgICBEQlVHX1JFVFVSTihIQV9FUlJfQ1JBU0hFRF9PTl9VU0FHRSk7Ci0KKyAgaWYgKCFz
aGFyZS0+YXJjaGl2ZV93cml0ZV9vcGVuICYmIHNoYXJlLT5pbml0X2FyY2hpdmVfd3JpdGVyKCkp
CisgIHsKKyAgICByYz0gSEFfRVJSX0NSQVNIRURfT05fVVNBR0U7CisgICAgZ290byBlcnJvcjsK
KyAgfQogCiAgIGlmICh0YWJsZS0+bmV4dF9udW1iZXJfZmllbGQgJiYgcmVjb3JkID09IHRhYmxl
LT5yZWNvcmRbMF0pCiAgIHsKQEAgLTEwNDksOCArMTA1MCw4IEBAIGludCBoYV9hcmNoaXZlOjp3
cml0ZV9yb3codWNoYXIgKmJ1ZikKICAgcmM9IHJlYWxfd3JpdGVfcm93KGJ1ZiwgICYoc2hhcmUt
PmFyY2hpdmVfd3JpdGUpKTsKIGVycm9yOgogICBteXNxbF9tdXRleF91bmxvY2soJnNoYXJlLT5t
dXRleCk7Ci0gIG15X2ZyZWUocmVhZF9idWYpOwotCisgIGlmIChyZWFkX2J1ZikKKyAgICBteV9m
cmVlKHJlYWRfYnVmKTsKICAgREJVR19SRVRVUk4ocmMpOwogfQogCgpObyBidW5kbGUgKHJlYXNv
bjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==