From: marko.makela
Date: April 23 2012 1:10pm
Subject: bzr push into mysql-trunk-wl5545 branch (marko.makela:3907 to 3908) WL#5545
List-Archive: http://lists.mysql.com/commits/143613
Message-Id: <201204231310.q3NDAF5g019799@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MDggTWFya28gTcOka2Vsw6QJMjAxMi0wNC0yMwogICAgICBXTCM1NTQ1IGVycm9yIGhhbmRs
aW5nIGltcHJvdmVtZW50cy4KICAgICAgCiAgICAgIGlubm9kYi5pbm5vZGItYWx0ZXItZGVidWc6
IEVycm9yIGluamVjdGlvbiB0ZXN0aW5nIGZvciBEUk9QIEZPUkVJR04gS0VZCiAgICAgIGFuZCBy
ZW5hbWluZyBjb2x1bW5zLgogICAgICAKICAgICAgaW5ub2Jhc2VfZHJvcF9mb3JlaWduKCksIGlu
bm9iYXNlX3JlbmFtZV9jb2x1bW4oKTogVGFrZSB0aGUgVEFCTEVfU0hBUkUKICAgICAgYXMgYSBw
YXJhbWV0ZXIsIHNvIHRoYXQgdGhlIHVzZXItdmlzaWJsZSB0YWJsZSBuYW1lIGNhbiBiZSByZXBv
cnRlZAogICAgICBpbiBhbiBlcnJvciBtZXNzYWdlLgoKICAgIGFkZGVkOgogICAgICBteXNxbC10
ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1hbHRlci1kZWJ1Zy5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItYWx0ZXItZGVidWcudGVzdAogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCiAzOTA3IE1h
cmtvIE3DpGtlbMOkCTIwMTItMDQtMjMKICAgICAgV0wjNTU0NS9XTCM1NTI2IGNvZGUgY292ZXJh
Z2UgZml4ZXMuCiAgICAgIAogICAgICByb3dfbWVyZ2VfZGljdF90YWJsZV9nZXRfaW5kZXgoKTog
UmVtb3ZlLiBUaGVyZSBuZXZlciBjYW4gYmUgZHVwbGljYXRlCiAgICAgIGluZGV4IG5hbWVzLiBV
c2UgcGxhaW4gZGljdF90YWJsZV9nZXRfaW5kZXhfb25fbmFtZSgpIGluc3RlYWQuCiAgICAgIAog
ICAgICBXaGVuIGRvaW5nIEFERCBJTkRFWCBhbmQgRFJPUCBJTkRFWCBpbiBhIHNpbmdsZSBzdGF0
ZW1lbnQsIHRoZSBuZXcgaW5kZXgKICAgICAgd2lsbCBjYXJyeSB0aGUgVEVNUF9JTkRFWF9QUkVG
SVggYW5kIHRoZSBvbGQgb25lICh0byBiZSBkcm9wcGVkKQogICAgICB3aWxsIGxhY2sgaXQuCiAg
ICAgIAogICAgICBBcHByb3ZlZCBieSBKaW1teSBZYW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1pbmRleC5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAogICAgICBzdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwbWVyZ2UuY2MKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiLWFsdGVyLWRlYnVnLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGItYWx0ZXItZGVidWcucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAw
MDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItYWx0ZXItZGVidWcucmVz
dWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDIzMTMwOTE1LXN2Y3h4NDRt
YTQ2NTd4ZXMKQEAgLTAsMCArMSwyNyBAQAorU0VUIE5BTUVTIHV0Zjg7CitDUkVBVEUgVEFCTEUg
4pGgICgKK2MxIElOVCBQUklNQVJZIEtFWSwgYzIgSU5UIERFRkFVTFQgMSwgY3QgVEVYVCwKK0lO
REVYKGMyKSkKK0VOR0lORT1Jbm5vREI7CitDUkVBVEUgVEFCTEUgdDHEhyAoYzEgSU5UIFBSSU1B
UlkgS0VZLCBjMiBJTlQsIElOREVYKGMyKSwKK0NPTlNUUkFJTlQgdDFjMiBGT1JFSUdOIEtFWSAo
YzIpIFJFRkVSRU5DRVMg4pGgKGMyKSkKK0VOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyDikaAg
U0VUIGMxPTE7CitTRVQgREVCVUcgPSAnK2QsaWJfZHJvcF9mb3JlaWduX2Vycm9yJzsKK0FMVEVS
IFRBQkxFIHQxxIcgRFJPUCBGT1JFSUdOIEtFWSB0MWMyLCBSRU5BTUUgVE8g4pGhOworRVJST1Ig
SFkwMDA6IFRoZSB0YWJsZSAndDHEhycgaXMgZnVsbAorU0VUIERFQlVHID0gJy1kLGliX2Ryb3Bf
Zm9yZWlnbl9lcnJvcic7CitTRVQgREVCVUcgPSAnK2QsaWJfcmVuYW1lX2NvbHVtbl9lcnJvcic7
CitBTFRFUiBUQUJMRSDikaAgQ0hBTkdFIGMyIMWhIElOVDsKK0VSUk9SIEhZMDAwOiBUaGUgdGFi
bGUgJ+KRoCcgaXMgZnVsbAorU0VUIERFQlVHID0gJy1kLGliX3JlbmFtZV9jb2x1bW5fZXJyb3In
OworU0hPVyBDUkVBVEUgVEFCTEUgdDHEhzsKK1RhYmxlCUNyZWF0ZSBUYWJsZQordDHEhwlDUkVB
VEUgVEFCTEUgYHQxxIdgICgKKyAgYGMxYCBpbnQoMTEpIE5PVCBOVUxMLAorICBgYzJgIGludCgx
MSkgREVGQVVMVCBOVUxMLAorICBQUklNQVJZIEtFWSAoYGMxYCksCisgIEtFWSBgYzJgIChgYzJg
KSwKKyAgQ09OU1RSQUlOVCBgdDFjMmAgRk9SRUlHTiBLRVkgKGBjMmApIFJFRkVSRU5DRVMgYOKR
oGAgKGBjMmApCispIEVOR0lORT1Jbm5vREIgREVGQVVMVCBDSEFSU0VUPWxhdGluMQorRFJPUCBU
QUJMRSB0McSHLCDikaA7Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGItYWx0ZXItZGVidWcudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGItYWx0ZXItZGVidWcudGVzdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBi
L215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWFsdGVyLWRlYnVnLnRlc3QJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MjMxMzA5MTUtc3ZjeHg0NG1hNDY1N3hlcwpA
QCAtMCwwICsxLDI5IEBACistLXNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiLmluYworLS1zb3Vy
Y2UgaW5jbHVkZS9oYXZlX2RlYnVnLmluYworCitTRVQgTkFNRVMgdXRmODsKKworQ1JFQVRFIFRB
QkxFIOKRoCAoCisgYzEgSU5UIFBSSU1BUlkgS0VZLCBjMiBJTlQgREVGQVVMVCAxLCBjdCBURVhU
LAorIElOREVYKGMyKSkKK0VOR0lORT1Jbm5vREI7CisKK0NSRUFURSBUQUJMRSB0McSHIChjMSBJ
TlQgUFJJTUFSWSBLRVksIGMyIElOVCwgSU5ERVgoYzIpLAorICAgICAgICAgICAgICAgICAgQ09O
U1RSQUlOVCB0MWMyIEZPUkVJR04gS0VZIChjMikgUkVGRVJFTkNFUyDikaAoYzIpKQorRU5HSU5F
PUlubm9EQjsKKworSU5TRVJUIElOVE8g4pGgIFNFVCBjMT0xOworCitTRVQgREVCVUcgPSAnK2Qs
aWJfZHJvcF9mb3JlaWduX2Vycm9yJzsKKy0tZXJyb3IgRVJfUkVDT1JEX0ZJTEVfRlVMTAorQUxU
RVIgVEFCTEUgdDHEhyBEUk9QIEZPUkVJR04gS0VZIHQxYzIsIFJFTkFNRSBUTyDikaE7CitTRVQg
REVCVUcgPSAnLWQsaWJfZHJvcF9mb3JlaWduX2Vycm9yJzsKKworU0VUIERFQlVHID0gJytkLGli
X3JlbmFtZV9jb2x1bW5fZXJyb3InOworLS1lcnJvciBFUl9SRUNPUkRfRklMRV9GVUxMCitBTFRF
UiBUQUJMRSDikaAgQ0hBTkdFIGMyIMWhIElOVDsKK1NFVCBERUJVRyA9ICctZCxpYl9yZW5hbWVf
Y29sdW1uX2Vycm9yJzsKKworU0hPVyBDUkVBVEUgVEFCTEUgdDHEhzsKKworRFJPUCBUQUJMRSB0
McSHLCDikaA7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hh
bmRsZXIwYWx0ZXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFs
dGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDIzMTIyNzA1LXNvazh3
YXByem5seTNnNzIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MjMxMzA5MTUtc3ZjeHg0NG1h
NDY1N3hlcwpAQCAtMTYwNyw4ICsxNjA3LDcgQEAgY29sX2ZhaWw6CiAJCQkJIG5ld190YWJsZV9u
YW1lKTsKIAkJCWdvdG8gbmV3X2NsdXN0ZXJlZF9mYWlsZWQ7CiAJCWRlZmF1bHQ6Ci0JCQlteV9l
cnJvcl9pbm5vZGIoCi0JCQkJdHJ4LT5lcnJvcl9zdGF0ZSwgdGFibGVfbmFtZSwgZmxhZ3MpOwor
CQkJbXlfZXJyb3JfaW5ub2RiKHRyeC0+ZXJyb3Jfc3RhdGUsIHRhYmxlX25hbWUsIGZsYWdzKTsK
IAkJbmV3X2NsdXN0ZXJlZF9mYWlsZWQ6CiAJCQlEQlVHX0FTU0VSVCh0cnggIT0gdXNlcl90cngp
OwogCQkJdHJ4X3JvbGxiYWNrX3RvX3NhdmVwb2ludCh0cngsIE5VTEwpOwpAQCAtMjQ0Nyw3ICsy
NDQ2LDcgQEAgYm9vbAogcm9sbGJhY2tfaW5wbGFjZV9hbHRlcl90YWJsZSgKIC8qPT09PT09PT09
PT09PT09PT09PT09PT09PSovCiAJQWx0ZXJfaW5wbGFjZV9pbmZvKgloYV9hbHRlcl9pbmZvLAot
CVRBQkxFX1NIQVJFKgkJdGFibGVfc2hhcmUsCisJY29uc3QgVEFCTEVfU0hBUkUqCXRhYmxlX3No
YXJlLAogCXJvd19wcmVidWlsdF90KgkJcHJlYnVpbHQpCiB7CiAJYm9vbAlmYWlsCT0gZmFsc2U7
CkBAIC0yNDk5LDYgKzI0OTgsNyBAQCBmdW5jX2V4aXQ6CiB9CiAKIC8qKiBEcm9wIGEgRk9SRUlH
TiBLRVkgY29uc3RyYWludC4KK0BwYXJhbSB0YWJsZV9zaGFyZQl0aGUgVEFCTEVfU0hBUkUKIEBw
YXJhbSB0cngJCWRhdGEgZGljdGlvbmFyeSB0cmFuc2FjdGlvbgogQHBhcmFtIGZvcmVpZ24JCXRo
ZSBmb3JlaWduIGtleSBjb25zdHJhaW50LCB3aWxsIGJlIGZyZWVkCiBAcmV0dmFsIHRydWUJCUZh
aWx1cmUKQEAgLTI1MDcsOCArMjUwNyw5IEBAIHN0YXRpYyBfX2F0dHJpYnV0ZV9fKChub25udWxs
LCB3YXJuX3VudXMKIGJvb2wKIGlubm9iYXNlX2Ryb3BfZm9yZWlnbigKIC8qPT09PT09PT09PT09
PT09PT09Ki8KLQl0cnhfdCoJCXRyeCwKLQlkaWN0X2ZvcmVpZ25fdCoJZm9yZWlnbikKKwljb25z
dCBUQUJMRV9TSEFSRSoJdGFibGVfc2hhcmUsCisJdHJ4X3QqCQkJdHJ4LAorCWRpY3RfZm9yZWln
bl90KgkJZm9yZWlnbikKIHsKIAlEQlVHX0VOVEVSKCJpbm5vYmFzZV9kcm9wX2ZvcmVpZ24iKTsK
IApAQCAtMjUzNyw4ICsyNTM4LDExIEBAIGlubm9iYXNlX2Ryb3BfZm9yZWlnbigKIAllcnJvciA9
IHF1ZV9ldmFsX3NxbChpbmZvLCBzcWwsIEZBTFNFLCB0cngpOwogCXRyeC0+b3BfaW5mbyA9ICIi
OwogCisJREJVR19FWEVDVVRFX0lGKCJpYl9kcm9wX2ZvcmVpZ25fZXJyb3IiLAorCQkJZXJyb3Ig
PSBEQl9PVVRfT0ZfRklMRV9TUEFDRTspOworCiAJaWYgKGVycm9yICE9IERCX1NVQ0NFU1MpIHsK
LQkJbXlfZXJyb3JfaW5ub2RiKGVycm9yLCBmb3JlaWduLT5mb3JlaWduX3RhYmxlLT5uYW1lLCAw
KTsKKwkJbXlfZXJyb3JfaW5ub2RiKGVycm9yLCB0YWJsZV9zaGFyZS0+dGFibGVfbmFtZS5zdHIs
IDApOwogCQl0cngtPmVycm9yX3N0YXRlID0gREJfU1VDQ0VTUzsKIAkJREJVR19SRVRVUk4odHJ1
ZSk7CiAJfQpAQCAtMjU0OSw2ICsyNTUzLDcgQEAgaW5ub2Jhc2VfZHJvcF9mb3JlaWduKAogfQog
CiAvKiogUmVuYW1lIGEgY29sdW1uLgorQHBhcmFtIHRhYmxlX3NoYXJlCXRoZSBUQUJMRV9TSEFS
RQogQHBhcmFtIHByZWJ1aWx0CQl0aGUgcHJlYnVpbHQgc3RydWN0CiBAcGFyYW0gdHJ4CQlkYXRh
IGRpY3Rpb25hcnkgdHJhbnNhY3Rpb24KIEBwYXJhbSBudGhfY29sCQkwLWJhc2VkIGluZGV4IG9m
IHRoZSBjb2x1bW4KQEAgLTI1NjAsMTEgKzI1NjUsMTIgQEAgc3RhdGljIF9fYXR0cmlidXRlX18o
KG5vbm51bGwsIHdhcm5fdW51cwogYm9vbAogaW5ub2Jhc2VfcmVuYW1lX2NvbHVtbigKIC8qPT09
PT09PT09PT09PT09PT09PSovCi0Jcm93X3ByZWJ1aWx0X3QqCXByZWJ1aWx0LAotCXRyeF90KgkJ
dHJ4LAotCXVsaW50CQludGhfY29sLAotCWNvbnN0IGNoYXIqCWZyb20sCi0JY29uc3QgY2hhcioJ
dG8pCisJY29uc3QgVEFCTEVfU0hBUkUqCXRhYmxlX3NoYXJlLAorCXJvd19wcmVidWlsdF90KgkJ
cHJlYnVpbHQsCisJdHJ4X3QqCQkJdHJ4LAorCXVsaW50CQkJbnRoX2NvbCwKKwljb25zdCBjaGFy
KgkJZnJvbSwKKwljb25zdCBjaGFyKgkJdG8pCiB7CiAJcGFyc19pbmZvX3QqCWluZm87CiAJZGJl
cnJfdAkJZXJyb3I7CkBAIC0yNjA1LDkgKzI2MTEsMTIgQEAgaW5ub2Jhc2VfcmVuYW1lX2NvbHVt
bigKIAkJIkVORDtcbiIsCiAJCUZBTFNFLCB0cngpOwogCisJREJVR19FWEVDVVRFX0lGKCJpYl9y
ZW5hbWVfY29sdW1uX2Vycm9yIiwKKwkJCWVycm9yID0gREJfT1VUX09GX0ZJTEVfU1BBQ0U7KTsK
KwogCWlmIChlcnJvciAhPSBEQl9TVUNDRVNTKSB7CiBlcnJfZXhpdDoKLQkJbXlfZXJyb3JfaW5u
b2RiKGVycm9yLCBwcmVidWlsdC0+dGFibGUtPm5hbWUsIDApOworCQlteV9lcnJvcl9pbm5vZGIo
ZXJyb3IsIHRhYmxlX3NoYXJlLT50YWJsZV9uYW1lLnN0ciwgMCk7CiAJCXRyeC0+ZXJyb3Jfc3Rh
dGUgPSBEQl9TVUNDRVNTOwogCQl0cngtPm9wX2luZm8gPSAiIjsKIAkJREJVR19SRVRVUk4odHJ1
ZSk7CkBAIC0yOTA5LDcgKzI5MTgsOCBAQCBoYV9pbm5vYmFzZTo6Y29tbWl0X2lucGxhY2VfYWx0
ZXJfdGFibGUoCiAJCQlEQlVHX0FTU0VSVChwcmVidWlsdC0+dGFibGUKIAkJCQkgICAgPT0gY3R4
LT5kcm9wX2ZrW2ldLT5mb3JlaWduX3RhYmxlKTsKIAotCQkJaWYgKGlubm9iYXNlX2Ryb3BfZm9y
ZWlnbih0cngsIGN0eC0+ZHJvcF9ma1tpXSkpIHsKKwkJCWlmIChpbm5vYmFzZV9kcm9wX2ZvcmVp
Z24oCisJCQkJICAgIHRhYmxlX3NoYXJlLCB0cngsIGN0eC0+ZHJvcF9ma1tpXSkpIHsKIAkJCQll
cnIgPSAtMTsKIAkJCX0KIAkJfQpAQCAtMjkzMCw2ICsyOTQwLDcgQEAgaGFfaW5ub2Jhc2U6OmNv
bW1pdF9pbnBsYWNlX2FsdGVyX3RhYmxlKAogCQkJd2hpbGUgKENyZWF0ZV9maWVsZCogY2YgPSBj
Zl9pdCsrKSB7CiAJCQkJaWYgKGNmLT5maWVsZCA9PSAqZnApIHsKIAkJCQkJaWYgKGlubm9iYXNl
X3JlbmFtZV9jb2x1bW4oCisJCQkJCQkgICAgdGFibGVfc2hhcmUsCiAJCQkJCQkgICAgcHJlYnVp
bHQsIHRyeCwgaSwKIAkJCQkJCSAgICBjZi0+ZmllbGQtPmZpZWxkX25hbWUsCiAJCQkJCQkgICAg
Y2YtPmZpZWxkX25hbWUpKSB7CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBl
bWFpbHMpLg==