From: marko.makela
Date: May 26 2012 4:26am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3869 to 3870) WL#6255
List-Archive: http://lists.mysql.com/commits/143967
Message-Id: <201205260426.q4Q4QubW009621@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NzAgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNgogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
OiBBZGQgYXNzZXJ0aW9ucyB0byBwdXJnZSBjb2RlLgogICAgICAKICAgICAgcm93X3B1cmdlX3Jl
bW92ZV9jbHVzdF9pZl9wb3NzX2xvdygpLCByb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybl9m
dW5jKCk6CiAgICAgIEFzc2VydCB0aGF0IGRpY3Rfb3BlcmF0aW9uX2xvY2sgaXMgYmVpbmcgUy1s
YXRjaGVkLiBOYXJyb3cgdGhlIHNjb3BlCiAgICAgIG9mIHNvbWUgdmFyaWFibGUgZGVjbGFyYXRp
b25zLgogICAgICAKICAgICAgSW4gb25saW5lIHRhYmxlIHJlYnVpbGQsIHRoZXJlIGlzIGEgcG90
ZW50aWFsIHByb2JsZW0gaW4gQkxPQiByZXRyaWV2YWwuCiAgICAgIFRoZSBwbGFubmVkIHNvbHV0
aW9uIGlzIHRoYXQgd2Ugd2lsbCBoYXZlIGEgbG9va3VwIHRhYmxlIG9mIHRyeF9pZF90IG9mCiAg
ICAgIHJvbGxlZC1iYWNrIHRyYW5zYWN0aW9ucy4gQW55IHJvd3MgaW5zZXJ0ZWQgb3IgdXBkYXRl
ZCBieSBzdWNoIHRyYW5zYWN0aW9ucwogICAgICB3aWxsIGJlIGlnbm9yZWQuIEEgZGVsZXRlLW1h
cmsgb3BlcmF0aW9uIHdpbGwgYmUgYnVmZmVyZWQgYXMgYSBkZWxldGUrcHVyZ2UKICAgICAgaW4g
dGhlIG9ubGluZSBsb2csIHdpdGggdGhlIG5ldyBQUklNQVJZIEtFWSBhbmQgdGhlIERCX1RSWF9J
RCBvZiB0aGUgcmVjb3JkLAogICAgICBhbmQgYXBwbGllZCBieSBsb29raW5nIHVwIHRoZSBmaWVs
ZHMgaW4gdGhlIHJlYnVpbHQgdGFibGUuCiAgICAgIFRoaXMgKGFuZCB0aGUgZmFjdCB0aGF0IHRo
ZSBsb2cgYXBwbHkgd2lsbCBob2xkIGFuIFMtbGF0Y2ggb3IgWC1sYXRjaCBvbgogICAgICB0aGUg
Y2x1c3RlcmVkIGluZGV4IHRyZWUgb2YgdGhlIG9sZCB0YWJsZSkgc2hvdWxkIGd1YXJhbnRlZSB0
aGF0IHRoZQogICAgICBsb2cgYXBwbHkgd2lsbCBuZXZlciBkZXJlZmVyZW5jZSBmcmVlZCBCTE9C
cyBpbiB0aGUgb2xkIHRhYmxlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwcHVyZ2UuY2MKIDM4NjkgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNQogICAgICBX
TCM2MjU1IHByZXBhcmF0aW9uOiBSZWxheCBzb21lIGFzc2VydGlvbnMgYW5kIGFkanVzdCBmdW5j
dGlvbnMKICAgICAgZm9yIG9ubGluZSB0YWJsZSByZWJ1aWxkLgogICAgICAKICAgICAgRm9yIGlu
ZGljYXRpbmcgdGhhdCBhbiBvbmxpbmUgdGFibGUgcmVidWlsZCBpcyBpbiBwcm9ncmVzcywgd2Ug
d2lsbAogICAgICBmbGFnIHRoZSBvbmxpbmVfc3RhdHVzIG9mIHRoZSBjbHVzdGVyZWQgaW5kZXgg
aW4gdGhlIG9sZCB0YWJsZSwgYW5kCiAgICAgIGFsbG9jYXRlIGluZGV4LT5vbmxpbmVfbG9nIG9u
IHRoZSBjbHVzdGVyZWQgaW5kZXggb2YgdGhlIG9sZCB0YWJsZS4KICAgICAgVGhpcyBpcyBkaWZm
ZXJlbnQgZnJvbSB0aGUgbW9kaWZpY2F0aW9uIGxvZ2dpbmcgb24gc2Vjb25kYXJ5IGluZGV4CiAg
ICAgIGNyZWF0aW9uLiBJbiBzZWNvbmRhcnkgaW5kZXggY3JlYXRpb24sIGlmIHRoZSBpbmRleCBp
cyBiZWluZyBidWlsdAogICAgICBvbmxpbmUsIHdlIHdpbGwgd3JpdGUgYWxsIGNoYW5nZXMgb25s
eSB0byB0aGUgbG9nLiBJbiBvbmxpbmUgdGFibGUKICAgICAgcmVidWlsZCwgd2Ugd2lsbCBsb2cg
dGhlIGNoYW5nZXMgaW4gYWRkaXRpb24gdG8gY2hhbmdpbmcgdGhlIG9yaWdpbmFsCiAgICAgIHRh
YmxlIGRpcmVjdGx5LgogICAgICAKICAgICAgUmVsYXggbWFueSBhc3NlcnRpb25zIG9uIGRpY3Rf
aW5kZXhfaXNfb25saW5lX2RkbCgpLgogICAgICAKICAgICAgZGljdF9pbmRleF9zZXRfb25saW5l
X3N0YXR1cygpOiBSZW1vdmUgdGhlIHF1YWxpZmllciAic2Vjb25kYXJ5IiBpbmRleC4KICAgICAg
CiAgICAgIGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbCgpOiBBZGp1c3QgdGhlIGZ1bmN0aW9uIGNv
bW1lbnQuCiAgICAgIAogICAgICBpbmRleC0+dG9fYmVfZHJvcHBlZCwgaW5kZXgtPm9ubGluZV9z
dGF0dXM6IFJlZmluZSB0aGUgbGF0Y2hpbmcgcnVsZXMuCiAgICAgIAogICAgICBvbmxpbmVfaW5k
ZXhfc3RhdHVzOiBVcGRhdGUgdGhlIGNvbW1lbnQgb2YgT05MSU5FX0lOREVYX0FCT1JURUQuCiAg
ICAgIAogICAgICByb3dfbWVyZ2VfaXNfaW5kZXhfdXNhYmxlKCk6IERvIG5vdCBkZW55IGFjY2Vz
cyB0byB0aGUgY2x1c3RlcmVkIGluZGV4CiAgICAgIG9mIGEgdGFibGUgdGhhdCBpcyBiZWluZyBy
ZWJ1aWx0LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy
LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaAogICAgICBzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9kaWN0MG1lbS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2su
Y2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcHVyZ2UuY2MnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzBwdXJnZS5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEy
MDUyNTIwNDAzMi1rcWRuNDZhandrdWg1eTZ3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzBwdXJnZS5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyNjA0MjU0NS1s
ZzBnM2RlbncxdWlnMXFxCkBAIC0xMzMsNiArMTMzLDEwIEBAIHJvd19wdXJnZV9yZW1vdmVfY2x1
c3RfaWZfcG9zc19sb3coCiAJdWxpbnQJCW9mZnNldHNfW1JFQ19PRkZTX05PUk1BTF9TSVpFXTsK
IAlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsKIAorI2lmZGVmIFVOSVZfU1lOQ19ERUJVRworCXV0
X2FkKHJ3X2xvY2tfb3duKCZkaWN0X29wZXJhdGlvbl9sb2NrLCBSV19MT0NLX1NIQVJFRCkpOwor
I2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAqLworCiAJaW5kZXggPSBkaWN0X3RhYmxlX2dldF9m
aXJzdF9pbmRleChub2RlLT50YWJsZSk7CiAKIAlwY3VyID0gJm5vZGUtPnBjdXI7CkBAIC01NDUs
MTQgKzU0OSwxMCBAQCByb3dfcHVyZ2VfdXBkX2V4aXN0X29yX2V4dGVybl9mdW5jKAogCXRyeF91
bmRvX3JlY190Kgl1bmRvX3JlYykJLyohPCBpbjogcmVjb3JkIHRvIHB1cmdlICovCiB7CiAJbWVt
X2hlYXBfdCoJaGVhcDsKLQlpYm9vbAkJaXNfaW5zZXJ0OwotCXVsaW50CQlyc2VnX2lkOwotCXVs
aW50CQlwYWdlX25vOwotCXVsaW50CQlvZmZzZXQ7Ci0JdWxpbnQJCWk7Ci0JbXRyX3QJCW10cjsK
IAotCXV0X2FkKG5vZGUpOworI2lmZGVmIFVOSVZfU1lOQ19ERUJVRworCXV0X2FkKHJ3X2xvY2tf
b3duKCZkaWN0X29wZXJhdGlvbl9sb2NrLCBSV19MT0NLX1NIQVJFRCkpOworI2VuZGlmIC8qIFVO
SVZfU1lOQ19ERUJVRyAqLwogCiAJaWYgKG5vZGUtPnJlY190eXBlID09IFRSWF9VTkRPX1VQRF9E
RUxfUkVDCiAJICAgIHx8IChub2RlLT5jbXBsX2luZm8gJiBVUERfTk9ERV9OT19PUkRfQ0hBTkdF
KSkgewpAQCAtNTg1LDcgKzU4NSw3IEBAIHJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1
bmMoCiAKIHNraXBfc2Vjb25kYXJpZXM6CiAJLyogRnJlZSBwb3NzaWJsZSBleHRlcm5hbGx5IHN0
b3JlZCBmaWVsZHMgKi8KLQlmb3IgKGkgPSAwOyBpIDwgdXBkX2dldF9uX2ZpZWxkcyhub2RlLT51
cGRhdGUpOyBpKyspIHsKKwlmb3IgKHVsaW50IGkgPSAwOyBpIDwgdXBkX2dldF9uX2ZpZWxkcyhu
b2RlLT51cGRhdGUpOyBpKyspIHsKIAogCQljb25zdCB1cGRfZmllbGRfdCoJdWZpZWxkCiAJCQk9
IHVwZF9nZXRfbnRoX2ZpZWxkKG5vZGUtPnVwZGF0ZSwgaSk7CkBAIC01OTYsNiArNTk2LDExIEBA
IHNraXBfc2Vjb25kYXJpZXM6CiAJCQl1bGludAkJaW50ZXJuYWxfb2Zmc2V0OwogCQkJYnl0ZSoJ
CWRhdGFfZmllbGQ7CiAJCQlkaWN0X2luZGV4X3QqCWluZGV4OworCQkJaWJvb2wJCWlzX2luc2Vy
dDsKKwkJCXVsaW50CQlyc2VnX2lkOworCQkJdWxpbnQJCXBhZ2Vfbm87CisJCQl1bGludAkJb2Zm
c2V0OworCQkJbXRyX3QJCW10cjsKIAogCQkJLyogV2UgdXNlIHRoZSBmYWN0IHRoYXQgbmV3X3Zh
bCBwb2ludHMgdG8KIAkJCXVuZG9fcmVjIGFuZCBnZXQgdGh1cyB0aGUgb2Zmc2V0IG9mCkBAIC04
MTQsNyArODE5LDYgQEAgcm93X3B1cmdlX3JlY29yZF9mdW5jKAogCQlkaWN0X3RhYmxlX2Nsb3Nl
KG5vZGUtPnRhYmxlLCBGQUxTRSwgRkFMU0UpOwogCQlub2RlLT50YWJsZSA9IE5VTEw7CiAJfQot
CiB9CiAKICNpZmRlZiBVTklWX0RFQlVHCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3Ig
cHVzaCBlbWFpbHMpLg==