From: marko.makela
Date: December 13 2012 3:18pm
Subject: bzr push into mysql-trunk branch (marko.makela:5241 to 5242)
List-Archive: http://lists.mysql.com/commits/145513
Message-Id: <20121213151859.16442.40456.5242@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDUyNDIgTWFya28gTcOka2Vsw6QJMjAxMi0xMi0xMyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9oYW5kbGVyL2hhX2lubm9kYi5jYwogNTI0MSBMaWJpbmcgU29uZwkyMDEyLTEyLTEzIFttZXJn
ZV0KICAgICAgQXV0byBNZXJnZQoKICAgIG1vZGlmaWVkOgogICAgICBzcWwvbG9nX2V2ZW50LmNj
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNj
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOmxpYmlu
Zy5zb25nQG9yYWNsZS5jb20tMjAxMjEyMTMxNDU3NTgtdTE5eW1tNjkwcmczaHg3aAorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTIxMjEzMTUxNzE0LTd4ejgwMTBobjZwaGo3a3oKQEAgLTE3MzksMTAxICsx
NzM5LDYgQEAgaW5ub2Jhc2VfZ2V0X2xvd2VyX2Nhc2VfdGFibGVfbmFtZXModm9pZAogCXJldHVy
bihsb3dlcl9jYXNlX3RhYmxlX25hbWVzKTsKIH0KIAotI2lmIGRlZmluZWQgKF9fV0lOX18pCi1l
eHRlcm4gTVlTUUxfUExVR0lOX0lNUE9SVCBNWV9UTVBESVIgbXlzcWxfdG1wZGlyX2xpc3Q7Ci0v
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKLU1hcCBhbiBPUyBlcnJvciB0byBhbiBlcnJubyB2YWx1ZS4gVGhlIE9T
IGVycm9yIG51bWJlciBpcyBzdG9yZWQgaW4KLV9kb3NlcnJubyBhbmQgdGhlIG1hcHBlZCB2YWx1
ZSBpcyBzdG9yZWQgaW4gZXJybm8pICovCi12b2lkIF9fY2RlY2wKLV9kb3NtYXBlcnIoCi0JdW5z
aWduZWQgbG9uZyk7CS8qITwgaW46IE9TIGVycm9yIHZhbHVlICovCi0KLS8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
LyoqCi1DcmVhdGVzIGEgdGVtcG9yYXJ5IGZpbGUuCi1AcmV0dXJuCXRlbXBvcmFyeSBmaWxlIGRl
c2NyaXB0b3IsIG9yIDwgMCBvbiBlcnJvciAqLwotVU5JVl9JTlRFUk4KLWludAotaW5ub2Jhc2Vf
bXlzcWxfdG1wZmlsZSh2b2lkKQotLyo9PT09PT09PT09PT09PT09PT09PT09PT0qLwotewotCWlu
dAlmZDsJCQkJLyogaGFuZGxlIG9mIG9wZW5lZCBmaWxlICovCi0JSEFORExFCW9zZmg7CQkJCS8q
IE9TIGhhbmRsZSBvZiBvcGVuZWQgZmlsZSAqLwotCWNoYXIqCXRtcGRpcjsJCQkJLyogcG9pbnQg
dG8gdGhlIGRpcmVjdG9yeQotCQkJCQkJd2hlcmUgdG8gY3JlYXRlIGZpbGUgKi8KLQlUQ0hBUglw
YXRoX2J1ZltNQVhfUEFUSCAtIDE0XTsJLyogYnVmZmVyIGZvciB0bXAgZmlsZSBwYXRoLgotCQkJ
CQkJVGhlIGxlbmd0aCBjYW5ub3QgYmUgbG9uZ2VyCi0JCQkJCQl0aGFuIE1BWF9QQVRIIC0gMTQs
IG9yCi0JCQkJCQlHZXRUZW1wRmlsZU5hbWUgd2lsbCBmYWlsLiAqLwotCWNoYXIJZmlsZW5hbWVb
TUFYX1BBVEhdOwkJLyogbmFtZSBvZiB0aGUgdG1wZmlsZSAqLwotCURXT1JECWZpbGVhY2Nlc3Mg
PSBHRU5FUklDX1JFQUQJLyogT1MgZmlsZSBhY2Nlc3MgKi8KLQkJCSAgICAgfCBHRU5FUklDX1dS
SVRFCi0JCQkgICAgIHwgREVMRVRFOwotCURXT1JECWZpbGVzaGFyZSA9IEZJTEVfU0hBUkVfUkVB
RAkvKiBPUyBmaWxlIHNoYXJpbmcgbW9kZSAqLwotCQkJICAgIHwgRklMRV9TSEFSRV9XUklURQot
CQkJICAgIHwgRklMRV9TSEFSRV9ERUxFVEU7Ci0JRFdPUkQJZmlsZWNyZWF0ZSA9IENSRUFURV9B
TFdBWVM7CS8qIE9TIG1ldGhvZCBvZiBvcGVuL2NyZWF0ZSAqLwotCURXT1JECWZpbGVhdHRyaWIg
PQkJCS8qIE9TIGZpbGUgYXR0cmlidXRlIGZsYWdzICovCi0JCQkgICAgIEZJTEVfQVRUUklCVVRF
X05PUk1BTAotCQkJICAgICB8IEZJTEVfRkxBR19ERUxFVEVfT05fQ0xPU0UKLQkJCSAgICAgfCBG
SUxFX0FUVFJJQlVURV9URU1QT1JBUlkKLQkJCSAgICAgfCBGSUxFX0ZMQUdfU0VRVUVOVElBTF9T
Q0FOOwotCi0JREJVR19FTlRFUigiaW5ub2Jhc2VfbXlzcWxfdG1wZmlsZSIpOwotCi0JREJVR19F
WEVDVVRFX0lGKCJpbm5vYmFzZV90bXBmaWxlX2NyZWF0aW9uX2ZhaWx1cmUiLCByZXR1cm4oLTEp
Oyk7Ci0KLQl0bXBkaXIgPSBteV90bXBkaXIoJm15c3FsX3RtcGRpcl9saXN0KTsKLQotCS8qIFRo
ZSB0bXBkaXIgcGFyYW1ldGVyIGNhbiBub3QgYmUgTlVMTCBmb3IgR2V0VGVtcEZpbGVOYW1lLiAq
LwotCWlmICghdG1wZGlyKSB7Ci0JCXVpbnQJcmV0OwotCi0JCS8qIFVzZSBHZXRUZW1wUGF0aCB0
byBkZXRlcm1pbmUgcGF0aCBmb3IgdGVtcG9yYXJ5IGZpbGVzLiAqLwotCQlyZXQgPSBHZXRUZW1w
UGF0aChzaXplb2YocGF0aF9idWYpLCBwYXRoX2J1Zik7Ci0JCWlmIChyZXQgPiBzaXplb2YocGF0
aF9idWYpIHx8IChyZXQgPT0gMCkpIHsKLQotCQkJX2Rvc21hcGVycihHZXRMYXN0RXJyb3IoKSk7
CS8qIG1hcCBlcnJvciAqLwotCQkJREJVR19SRVRVUk4oLTEpOwotCQl9Ci0KLQkJdG1wZGlyID0g
cGF0aF9idWY7Ci0JfQotCi0JLyogVXNlIEdldFRlbXBGaWxlTmFtZSB0byBnZW5lcmF0ZSBhIHVu
aXF1ZSBmaWxlbmFtZS4gKi8KLQlpZiAoIUdldFRlbXBGaWxlTmFtZSh0bXBkaXIsICJpYiIsIDAs
IGZpbGVuYW1lKSkgewotCi0JCV9kb3NtYXBlcnIoR2V0TGFzdEVycm9yKCkpOwkvKiBtYXAgZXJy
b3IgKi8KLQkJREJVR19SRVRVUk4oLTEpOwotCX0KLQotCURCVUdfUFJJTlQoImluZm8iLCAoImZp
bGVuYW1lOiAlcyIsIGZpbGVuYW1lKSk7Ci0KLQkvKiBPcGVuL0NyZWF0ZSB0aGUgZmlsZS4gKi8K
LQlvc2ZoID0gQ3JlYXRlRmlsZShmaWxlbmFtZSwgZmlsZWFjY2VzcywgZmlsZXNoYXJlLCBOVUxM
LAotCQkJICBmaWxlY3JlYXRlLCBmaWxlYXR0cmliLCBOVUxMKTsKLQlpZiAob3NmaCA9PSBJTlZB
TElEX0hBTkRMRV9WQUxVRSkgewotCi0JCS8qIG9wZW4vY3JlYXRlIGZpbGUgZmFpbGVkISAqLwot
CQlfZG9zbWFwZXJyKEdldExhc3RFcnJvcigpKTsJLyogbWFwIGVycm9yICovCi0JCURCVUdfUkVU
VVJOKC0xKTsKLQl9Ci0KLQlkbyB7Ci0JCS8qIEFzc29jaWF0ZXMgYSBDUlQgZmlsZSBkZXNjcmlw
dG9yIHdpdGggdGhlIE9TIGZpbGUgaGFuZGxlLiAqLwotCQlmZCA9IF9vcGVuX29zZmhhbmRsZSgo
aW50cHRyX3QpIG9zZmgsIDApOwotCX0gd2hpbGUgKGZkID09IC0xICYmIGVycm5vID09IEVJTlRS
KTsKLQotCWlmIChmZCA9PSAtMSkgewotCQkvKiBPcGVuIGZhaWxlZCwgY2xvc2UgdGhlIGZpbGUg
aGFuZGxlLiAqLwotCi0JCV9kb3NtYXBlcnIoR2V0TGFzdEVycm9yKCkpOwkvKiBtYXAgZXJyb3Ig
Ki8KLQkJQ2xvc2VIYW5kbGUob3NmaCk7CQkvKiBubyBuZWVkIHRvIGNoZWNrIGlmCi0JCQkJCQlD
bG9zZUhhbmRsZSBmYWlscyAqLwotCX0KLQotCURCVUdfUkVUVVJOKGZkKTsKLX0KLSNlbHNlCiAv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLy8qKgogQ3JlYXRlcyBhIHRlbXBvcmFyeSBmaWxlLgogQHJldHVybgl0ZW1w
b3JhcnkgZmlsZSBkZXNjcmlwdG9yLCBvciA8IDAgb24gZXJyb3IgKi8KQEAgLTE4OTIsNyArMTc5
Nyw2IEBAIGlubm9iYXNlX215c3FsX3RtcGZpbGUodm9pZCkKIAl9CiAJcmV0dXJuKGZkMik7CiB9
Ci0jZW5kaWYgLyogZGVmaW5lZCAoX19XSU5fXykgKi8KIAogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFdy
YXBwZXIgYXJvdW5kIE15U1FMJ3MgY29weV9hbmRfY29udmVydCBmdW5jdGlvbi4KCk5vIGJ1bmRs
ZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku