From: marko.makela
Date: January 24 2013 3:18pm
Subject: bzr push into mysql-trunk branch (marko.makela:5439 to 5440)
List-Archive: http://lists.mysql.com/commits/145640
Message-Id: <20130124151821.14868.99441.5440@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDU0NDAgTWFya28gTcOka2Vsw6QJMjAxMy0wMS0yNCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idHIvYnRyMGN1ci5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1ci5o
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MKIDU0MzkgSm9uIE9sYXYgSGF1
Z2xpZAkyMDEzLTAxLTI0IFttZXJnZV0KICAgICAgTWVyZ2UgZnJvbSBteXNxbC01LjYgdG8gbXlz
cWwtdHJ1bmsKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hh
X2lubm9kYi5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5j
Ywo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYwlyZXZpZDpqb24uaGF1Z2xpZEBvcmFj
bGUuY29tLTIwMTMwMTI0MTQzMzI5LTJreDdrenB6NmRrd25yM2oKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9idHIvYnRyMGN1ci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEzMDEy
NDE1MTU0OC1oeW95aDUyY21veWI4ZnJpCkBAIC0xOTMzLDggKzE5MzMsNyBAQCBidHJfY3VyX3Vw
ZGF0ZV9pbl9wbGFjZSgKIAljb25zdCB1cGRfdCoJdXBkYXRlLAkvKiE8IGluOiB1cGRhdGUgdmVj
dG9yICovCiAJdWxpbnQJCWNtcGxfaW5mbywvKiE8IGluOiBjb21waWxlciBpbmZvIG9uIHNlY29u
ZGFyeSBpbmRleAogCQkJCXVwZGF0ZXMgKi8KLQlxdWVfdGhyX3QqCXRociwJLyohPCBpbjogcXVl
cnkgdGhyZWFkLCBvciBOVUxMIGlmCi0JCQkJYXBwcm9wcmlhdGUgZmxhZ3MgYXJlIHNldCAqLwor
CXF1ZV90aHJfdCoJdGhyLAkvKiE8IGluOiBxdWVyeSB0aHJlYWQgKi8KIAl0cnhfaWRfdAl0cnhf
aWQsCS8qITwgaW46IHRyYW5zYWN0aW9uIGlkICovCiAJbXRyX3QqCQltdHIpCS8qITwgaW46IG10
cjsgbXVzdCBiZSBjb21taXR0ZWQgYmVmb3JlCiAJCQkJbGF0Y2hpbmcgYW55IGZ1cnRoZXIgcGFn
ZXMgKi8KQEAgLTE5NTYsOCArMTk1NSw4IEBAIGJ0cl9jdXJfdXBkYXRlX2luX3BsYWNlKAogCXV0
X2FkKCFkaWN0X2luZGV4X2lzX2lidWYoaW5kZXgpKTsKIAl1dF9hZChkaWN0X2luZGV4X2lzX29u
bGluZV9kZGwoaW5kZXgpID09ICEhKGZsYWdzICYgQlRSX0NSRUFURV9GTEFHKQogCSAgICAgIHx8
IGRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpKTsKLQl1dF9hZCghdGhyIHx8IHRocl9nZXRfdHJ4
KHRociktPmlkID09IHRyeF9pZCk7Ci0JdXRfYWQodGhyIHx8IChmbGFncyAmIH5CVFJfS0VFUF9Q
T1NfRkxBRykKKwl1dF9hZCh0aHJfZ2V0X3RyeCh0aHIpLT5pZCA9PSB0cnhfaWQKKwkgICAgICB8
fCAoZmxhZ3MgJiB+QlRSX0tFRVBfUE9TX0ZMQUcpCiAJICAgICAgPT0gKEJUUl9OT19VTkRPX0xP
R19GTEFHIHwgQlRSX05PX0xPQ0tJTkdfRkxBRwogCQkgIHwgQlRSX0NSRUFURV9GTEFHIHwgQlRS
X0tFRVBfU1lTX0ZMQUcpKTsKIAl1dF9hZChmaWxfcGFnZV9nZXRfdHlwZShidHJfY3VyX2dldF9w
YWdlKGN1cnNvcikpID09IEZJTF9QQUdFX0lOREVYKTsKQEAgLTIwNjUsNyArMjA2NCw3IEBAIGJ0
cl9jdXJfb3B0aW1pc3RpY191cGRhdGUoCiAJCQkJY3Vyc29yIHN0YXlzIHZhbGlkIGFuZCBwb3Np
dGlvbmVkIG9uIHRoZQogCQkJCXNhbWUgcmVjb3JkICovCiAJdWxpbnQqKgkJb2Zmc2V0cywvKiE8
IG91dDogb2Zmc2V0cyBvbiBjdXJzb3ItPnBhZ2VfY3VyLnJlYyAqLwotCW1lbV9oZWFwX3QqKglo
ZWFwLAkvKiE8IGluL291dDogcG9pbnRlciB0byBtZW1vcnkgaGVhcCwgb3IgTlVMTCAqLworCW1l
bV9oZWFwX3QqKgloZWFwLAkvKiE8IGluL291dDogcG9pbnRlciB0byBOVUxMIG9yIG1lbW9yeSBo
ZWFwICovCiAJY29uc3QgdXBkX3QqCXVwZGF0ZSwJLyohPCBpbjogdXBkYXRlIHZlY3RvcjsgdGhp
cyBtdXN0IGFsc28KIAkJCQljb250YWluIHRyeCBpZCBhbmQgcm9sbCBwdHIgZmllbGRzICovCiAJ
dWxpbnQJCWNtcGxfaW5mbywvKiE8IGluOiBjb21waWxlciBpbmZvIG9uIHNlY29uZGFyeSBpbmRl
eApAQCAtMjEwMSw4ICsyMTAwLDggQEAgYnRyX2N1cl9vcHRpbWlzdGljX3VwZGF0ZSgKIAl1dF9h
ZCghZGljdF9pbmRleF9pc19pYnVmKGluZGV4KSk7CiAJdXRfYWQoZGljdF9pbmRleF9pc19vbmxp
bmVfZGRsKGluZGV4KSA9PSAhIShmbGFncyAmIEJUUl9DUkVBVEVfRkxBRykKIAkgICAgICB8fCBk
aWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7Ci0JdXRfYWQoIXRociB8fCB0aHJfZ2V0X3RyeCh0
aHIpLT5pZCA9PSB0cnhfaWQpOwotCXV0X2FkKHRociB8fCAoZmxhZ3MgJiB+QlRSX0tFRVBfUE9T
X0ZMQUcpCisJdXRfYWQodGhyX2dldF90cngodGhyKS0+aWQgPT0gdHJ4X2lkCisJICAgICAgfHwg
KGZsYWdzICYgfkJUUl9LRUVQX1BPU19GTEFHKQogCSAgICAgID09IChCVFJfTk9fVU5ET19MT0df
RkxBRyB8IEJUUl9OT19MT0NLSU5HX0ZMQUcKIAkJICB8IEJUUl9DUkVBVEVfRkxBRyB8IEJUUl9L
RUVQX1NZU19GTEFHKSk7CiAJdXRfYWQoZmlsX3BhZ2VfZ2V0X3R5cGUocGFnZSkgPT0gRklMX1BB
R0VfSU5ERVgpOwpAQCAtMjM4Miw4ICsyMzgxLDggQEAgYnRyX2N1cl9wZXNzaW1pc3RpY191cGRh
dGUoCiAJdXRfYWQoIWRpY3RfaW5kZXhfaXNfaWJ1ZihpbmRleCkpOwogCXV0X2FkKGRpY3RfaW5k
ZXhfaXNfb25saW5lX2RkbChpbmRleCkgPT0gISEoZmxhZ3MgJiBCVFJfQ1JFQVRFX0ZMQUcpCiAJ
ICAgICAgfHwgZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkpOwotCXV0X2FkKCF0aHIgfHwgdGhy
X2dldF90cngodGhyKS0+aWQgPT0gdHJ4X2lkKTsKLQl1dF9hZCh0aHIgfHwgKGZsYWdzICYgfkJU
Ul9LRUVQX1BPU19GTEFHKQorCXV0X2FkKHRocl9nZXRfdHJ4KHRociktPmlkID09IHRyeF9pZAor
CSAgICAgIHx8IChmbGFncyAmIH5CVFJfS0VFUF9QT1NfRkxBRykKIAkgICAgICA9PSAoQlRSX05P
X1VORE9fTE9HX0ZMQUcgfCBCVFJfTk9fTE9DS0lOR19GTEFHCiAJCSAgfCBCVFJfQ1JFQVRFX0ZM
QUcgfCBCVFJfS0VFUF9TWVNfRkxBRykpOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L2J0cjBjdXIuaAlyZXZpZDpqb24uaGF1Z2xpZEBvcmFjbGUuY29tLTIwMTMwMTI0MTQzMzI5LTJr
eDdrenB6NmRrd25yM2oKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIuaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEzMDEyNDE1MTU0OC1oeW95aDUyY21veWI4
ZnJpCkBAIC0xLDYgKzEsNiBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNvcHlyaWdodCAo
YykgMTk5NCwgMjAxMiwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBS
ZXNlcnZlZC4KK0NvcHlyaWdodCAoYykgMTk5NCwgMjAxMywgT3JhY2xlIGFuZC9vciBpdHMgYWZm
aWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KIAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29m
dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRo
ZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5
IHRoZSBGcmVlIFNvZnR3YXJlCkBAIC0yOTMsMTIgKzI5MywxMSBAQCBidHJfY3VyX3VwZGF0ZV9p
bl9wbGFjZSgKIAljb25zdCB1cGRfdCoJdXBkYXRlLAkvKiE8IGluOiB1cGRhdGUgdmVjdG9yICov
CiAJdWxpbnQJCWNtcGxfaW5mbywvKiE8IGluOiBjb21waWxlciBpbmZvIG9uIHNlY29uZGFyeSBp
bmRleAogCQkJCXVwZGF0ZXMgKi8KLQlxdWVfdGhyX3QqCXRociwJLyohPCBpbjogcXVlcnkgdGhy
ZWFkLCBvciBOVUxMIGlmCi0JCQkJYXBwcm9wcmlhdGUgZmxhZ3MgYXJlIHNldCAqLworCXF1ZV90
aHJfdCoJdGhyLAkvKiE8IGluOiBxdWVyeSB0aHJlYWQgKi8KIAl0cnhfaWRfdAl0cnhfaWQsCS8q
ITwgaW46IHRyYW5zYWN0aW9uIGlkICovCiAJbXRyX3QqCQltdHIpCS8qITwgaW46IG10cjsgbXVz
dCBiZSBjb21taXR0ZWQgYmVmb3JlCiAJCQkJbGF0Y2hpbmcgYW55IGZ1cnRoZXIgcGFnZXMgKi8K
LQlfX2F0dHJpYnV0ZV9fKCh3YXJuX3VudXNlZF9yZXN1bHQsIG5vbm51bGwoMiwzLDQsOCkpKTsK
KwlfX2F0dHJpYnV0ZV9fKCh3YXJuX3VudXNlZF9yZXN1bHQsIG5vbm51bGwpKTsKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgogVHJpZXMgdG8gdXBkYXRlIGEgcmVjb3JkIG9uIGEgcGFnZSBpbiBhbiBpbmRleCB0cmVlLiBJ
dCBpcyBhc3N1bWVkIHRoYXQgbXRyCiBob2xkcyBhbiB4LWxhdGNoIG9uIHRoZSBwYWdlLiBUaGUg
b3BlcmF0aW9uIGRvZXMgbm90IHN1Y2NlZWQgaWYgdGhlcmUgaXMgdG9vCkBAIC0zMTYsMTcgKzMx
NSwxNiBAQCBidHJfY3VyX29wdGltaXN0aWNfdXBkYXRlKAogCQkJCWN1cnNvciBzdGF5cyB2YWxp
ZCBhbmQgcG9zaXRpb25lZCBvbiB0aGUKIAkJCQlzYW1lIHJlY29yZCAqLwogCXVsaW50KioJCW9m
ZnNldHMsLyohPCBvdXQ6IG9mZnNldHMgb24gY3Vyc29yLT5wYWdlX2N1ci5yZWMgKi8KLQltZW1f
aGVhcF90KioJaGVhcCwJLyohPCBpbi9vdXQ6IHBvaW50ZXIgdG8gbWVtb3J5IGhlYXAsIG9yIE5V
TEwgKi8KKwltZW1faGVhcF90KioJaGVhcCwJLyohPCBpbi9vdXQ6IHBvaW50ZXIgdG8gTlVMTCBv
ciBtZW1vcnkgaGVhcCAqLwogCWNvbnN0IHVwZF90Kgl1cGRhdGUsCS8qITwgaW46IHVwZGF0ZSB2
ZWN0b3I7IHRoaXMgbXVzdCBhbHNvCiAJCQkJY29udGFpbiB0cnggaWQgYW5kIHJvbGwgcHRyIGZp
ZWxkcyAqLwogCXVsaW50CQljbXBsX2luZm8sLyohPCBpbjogY29tcGlsZXIgaW5mbyBvbiBzZWNv
bmRhcnkgaW5kZXgKIAkJCQl1cGRhdGVzICovCi0JcXVlX3Rocl90Kgl0aHIsCS8qITwgaW46IHF1
ZXJ5IHRocmVhZCwgb3IgTlVMTCBpZgotCQkJCWFwcHJvcHJpYXRlIGZsYWdzIGFyZSBzZXQgKi8K
KwlxdWVfdGhyX3QqCXRociwJLyohPCBpbjogcXVlcnkgdGhyZWFkICovCiAJdHJ4X2lkX3QJdHJ4
X2lkLAkvKiE8IGluOiB0cmFuc2FjdGlvbiBpZCAqLwogCW10cl90KgkJbXRyKQkvKiE8IGluOiBt
dHI7IG11c3QgYmUgY29tbWl0dGVkIGJlZm9yZQogCQkJCWxhdGNoaW5nIGFueSBmdXJ0aGVyIHBh
Z2VzICovCi0JX19hdHRyaWJ1dGVfXygod2Fybl91bnVzZWRfcmVzdWx0LCBub25udWxsKDIsMyw0
LDUsOSkpKTsKKwlfX2F0dHJpYnV0ZV9fKCh3YXJuX3VudXNlZF9yZXN1bHQsIG5vbm51bGwpKTsK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgogUGVyZm9ybXMgYW4gdXBkYXRlIG9mIGEgcmVjb3JkIG9uIGEgcGFnZSBvZiBh
IHRyZWUuIEl0IGlzIGFzc3VtZWQKIHRoYXQgbXRyIGhvbGRzIGFuIHgtbGF0Y2ggb24gdGhlIHRy
ZWUgYW5kIG9uIHRoZSBjdXJzb3IgcGFnZS4gSWYgdGhlCkBAIC0zNTYsMTIgKzM1NCwxMSBAQCBi
dHJfY3VyX3Blc3NpbWlzdGljX3VwZGF0ZSgKIAkJCQl0aGUgdmFsdWVzIGluIHVwZGF0ZSB2ZWN0
b3IgaGF2ZSBubyBlZmZlY3QgKi8KIAl1bGludAkJY21wbF9pbmZvLC8qITwgaW46IGNvbXBpbGVy
IGluZm8gb24gc2Vjb25kYXJ5IGluZGV4CiAJCQkJdXBkYXRlcyAqLwotCXF1ZV90aHJfdCoJdGhy
LAkvKiE8IGluOiBxdWVyeSB0aHJlYWQsIG9yIE5VTEwgaWYKLQkJCQlhcHByb3ByaWF0ZSBmbGFn
cyBhcmUgc2V0ICovCisJcXVlX3Rocl90Kgl0aHIsCS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLwog
CXRyeF9pZF90CXRyeF9pZCwJLyohPCBpbjogdHJhbnNhY3Rpb24gaWQgKi8KIAltdHJfdCoJCW10
cikJLyohPCBpbjogbXRyOyBtdXN0IGJlIGNvbW1pdHRlZCBiZWZvcmUKIAkJCQlsYXRjaGluZyBh
bnkgZnVydGhlciBwYWdlcyAqLwotCV9fYXR0cmlidXRlX18oKHdhcm5fdW51c2VkX3Jlc3VsdCwg
bm9ubnVsbCgyLDMsNCw1LDYsNywxMSkpKTsKKwlfX2F0dHJpYnV0ZV9fKCh3YXJuX3VudXNlZF9y
ZXN1bHQsIG5vbm51bGwpKTsKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKi8vKioKIE1hcmtzIGEgY2x1c3RlcmVkIGluZGV4IHJlY29y
ZCBkZWxldGVkLiBXcml0ZXMgYW4gdW5kbyBsb2cgcmVjb3JkIHRvCiB1bmRvIGxvZyBvbiB0aGlz
IGRlbGV0ZSBtYXJraW5nLiBXcml0ZXMgaW4gdGhlIHRyeCBpZCBmaWVsZCB0aGUgaWQKCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOmpvbi5oYXVnbGlkQG9yYWNsZS5jb20t
MjAxMzAxMjQxNDMzMjktMmt4N2t6cHo2ZGt3bnIzagorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwbG9nLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTMwMTI0MTUxNTQ4
LWh5b3loNTJjbW95YjhmcmkKQEAgLTEsNiArMSw2IEBACiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioK
IAotQ29weXJpZ2h0IChjKSAyMDExLCAyMDEyLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVz
LiBBbGwgUmlnaHRzIFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAyMDExLCAyMDEzLCBPcmFjbGUg
YW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogCiBUaGlzIHByb2dy
YW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlm
eSBpdCB1bmRlcgogdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBh
cyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTE2ODUsNyArMTY4NSw3IEBAIGRl
bGV0ZV9pbnNlcnQ6CiAJCXwgQlRSX0tFRVBfUE9TX0ZMQUcsCiAJCWJ0cl9wY3VyX2dldF9idHJf
Y3VyKCZwY3VyKSwKIAkJJmN1cl9vZmZzZXRzLCAmb2Zmc2V0c19oZWFwLCBoZWFwLCAmYmlnX3Jl
YywKLQkJdXBkYXRlLCAwLCBOVUxMLCAwLCAmbXRyKTsKKwkJdXBkYXRlLCAwLCB0aHIsIDAsICZt
dHIpOwogCiAJaWYgKGJpZ19yZWMpIHsKIAkJaWYgKGVycm9yID09IERCX1NVQ0NFU1MpIHsKCk5v
IGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku