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

IDM5MDUgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0yMwogICAgICBXTCM1NTQ1IHRlc3QgY292ZXJh
Z2UgaW1wcm92ZW1lbnRzLgogICAgICAKICAgICAgVGVzdCBpZiBpbmNvbXBsZXRlbHkgY3JlYXRl
ZCBpbmRleGVzIHdpbGwgYmUgZHJvcHBlZCB3aGVuIHRoZXJlIGlzCiAgICAgIGEgdGFibGUgbmFt
ZSMyIGNsYXNoIHdoZW4gY3JlYXRpbmcgYSBjbHVzdGVyZWQgaW5kZXguCiAgICAgIAogICAgICBo
YV9pbm5vYmFzZTo6Y29tbWl0X2lucGxhY2VfYWx0ZXJfdGFibGUoKTogRml4IGJyb2tlbiBlcnJv
ciBoYW5kbGluZy4KICAgICAgRG8gbm90IGRlY3JlbWVudCBNT05JVE9SX1BFTkRJTkdfQUxURVJf
VEFCTEUgaWYgYW4gZXJyb3IgaXMgYmVpbmcKICAgICAgcmV0dXJuZWQgZm9yIGNvbW1pdD10cnVl
LiBJbiB0aGlzIGNhc2UsIHRoZSBtZXRob2Qgd2lsbCBiZSByZS1pbnZva2VkCiAgICAgIHdpdGgg
Y29tbWl0PWZhbHNlLiBUaGlzIGJ1ZyB3YXMgaW50cm9kdWNlZCBpbiBXTCM1NTI2LgoKICAgIG1v
ZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1pbmRleC1vbmxp
bmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LW9u
bGluZS50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNj
CiAzOTA0IE1hcmtvIE3DpGtlbMOkCTIwMTItMDQtMjMKICAgICAgV0wjNTUyNi9XTCM1NTQ1IHRl
c3QgY292ZXJhZ2U6IFNob3cgdGhhdCBhIGZhaWx1cmUKICAgICAgdG8gY3JlYXRlIGEgY2x1c3Rl
cmVkIGluZGV4IHdpbGwgZG8gdGhlIGxhenkgZHJvcCBpbmRleC4KCiAgICBtb2RpZmllZDoKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgtb25saW5lLnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC1vbmxpbmUudGVzdAog
MzkwMyBNYXJrbyBNw6RrZWzDpAkyMDEyLTA0LTIzCiAgICAgIFdMIzU1NDU6IENsZWFuIHVwIGlu
bm9kYi1pbmRleC1vbmxpbmUudGVzdAogICAgICBhY2NvcmRpbmcgdG8gc3VnZ2VzdGlvbnMgZnJv
bSBNYXR0aGlhcyBMZWljaC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGItaW5kZXgtb25saW5lLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRl
L2lubm9kYi90L2lubm9kYi1pbmRleC1vbmxpbmUudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgtb25saW5lLnJlc3VsdCcKLS0tIGEv
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgtb25saW5lLnJlc3VsdAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQyMzEwNDgzNS05MTM4ZzN4N2VicHkxY2Uz
CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LW9ubGluZS5yZXN1
bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MjMxMjA5MjAtaXEweTMzNmsw
bzFzc25hcQpAQCAtMzEwLDEzICszMTAsMTggQEAgZGRsX2JhY2tncm91bmRfZHJvcF9pbmRleGVz
CTEKIGRkbF9iYWNrZ3JvdW5kX2Ryb3BfdGFibGVzCTAKIGRkbF9vbmxpbmVfY3JlYXRlX2luZGV4
CTAKIGRkbF9wZW5kaW5nX2FsdGVyX3RhYmxlCTAKLUFMVEVSIFRBQkxFIHQxIENPTU1FTlQgJ3Rl
c3RpbmcgaWYgYzNwNSB3aWxsIGJlIGRyb3BwZWQnOworQ1JFQVRFIFRBQkxFIGB0MSMyYChhIElO
VCBQUklNQVJZIEtFWSkgRU5HSU5FID0gSW5ub0RCOworQ1JFQVRFIEZVTExURVhUIElOREVYIGZ0
IE9OIHQxIChjMyk7CitFUlJPUiA0MlMwMTogVGFibGUgJ3Rlc3QudDEjMicgYWxyZWFkeSBleGlz
dHMKIFNFTEVDVCBuYW1lLCBjb3VudCBGUk9NIElORk9STUFUSU9OX1NDSEVNQS5JTk5PREJfTUVU
UklDUyBXSEVSRSBzdWJzeXN0ZW09J2RkbCc7CiBuYW1lCWNvdW50CiBkZGxfYmFja2dyb3VuZF9k
cm9wX2luZGV4ZXMJMAogZGRsX2JhY2tncm91bmRfZHJvcF90YWJsZXMJMAogZGRsX29ubGluZV9j
cmVhdGVfaW5kZXgJMAogZGRsX3BlbmRpbmdfYWx0ZXJfdGFibGUJMAorRFJPUCBUQUJMRSBgdDEj
MmA7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIklubm9EQjogRXJyb3IgY3JlYXRpbmcuKnQx
QDAwMjMxLmliZCIpOworY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJJbm5vREI6IEVycm9yIG51
bWJlciAxNyBtZWFucyAnRmlsZSBleGlzdHMnIik7CiBTRVQgREVCVUdfU1lOQyA9ICdyb3dfbG9n
X2FwcGx5X2JlZm9yZSBTSUdOQUwgYzJnX2NyZWF0ZWQgV0FJVF9GT1IgZG1sNF9kb25lJzsKIFNF
VCBsb2NrX3dhaXRfdGltZW91dCA9IDE7CiBBTFRFUiBUQUJMRSB0MSBEUk9QIElOREVYIGMyZiwg
QUREIElOREVYIGMyZyhjMjJmKTsKQEAgLTMzNCw3ICszMzksNyBAQCB0MQlDUkVBVEUgVEFCTEUg
YHQxYCAoCiAgIFBSSU1BUlkgS0VZIChgYzFgKSwKICAgS0VZIGBjMmRgIChgYzIyZmApLAogICBL
RVkgYGMyZmAgKGBjMjJmYCkKLSkgRU5HSU5FPUlubm9EQiBERUZBVUxUIENIQVJTRVQ9bGF0aW4x
IENPTU1FTlQ9J3Rlc3RpbmcgaWYgYzNwNSB3aWxsIGJlIGRyb3BwZWQnCispIEVOR0lORT1Jbm5v
REIgREVGQVVMVCBDSEFSU0VUPWxhdGluMSBDT01NRU5UPSd0ZXN0aW5nIGlmIGMyZSB3aWxsIGJl
IGRyb3BwZWQnCiBBTFRFUiBUQUJMRSB0MSBEUk9QIElOREVYIGMyZCwgRFJPUCBJTkRFWCBjMmY7
CiBFUlJPUiA0MlMwMjogVGFibGUgJ3Rlc3QudDEnIGRvZXNuJ3QgZXhpc3QKIEFMVEVSIFRBQkxF
IHQxIEFERCBJTkRFWCBjMmgoYzIyZiksIEFMR09SSVRITSA9IElOUExBQ0U7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgtb25saW5lLnRl
c3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LW9ubGluZS50
ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNDIzMTA0ODM1LTkxMzhnM3g3
ZWJweTFjZTMKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgtb25s
aW5lLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MjMxMjA5MjAtaXEw
eTMzNmswbzFzc25hcQpAQCAtMzI3LDkgKzMyNywxNyBAQCByZWFwOwogIyBJbmRleCBjM3A1IHNo
b3VsZCBzdGlsbCBleGlzdCBpbiB0aGUgZGF0YSBkaWN0aW9uYXJ5IGNhY2hlLgogZXZhbCAkaW5u
b2RiX21ldHJpY3Nfc2VsZWN0OwogCi1BTFRFUiBUQUJMRSB0MSBDT01NRU5UICd0ZXN0aW5nIGlm
IGMzcDUgd2lsbCBiZSBkcm9wcGVkJzsKK0NSRUFURSBUQUJMRSBgdDEjMmAoYSBJTlQgUFJJTUFS
WSBLRVkpIEVOR0lORSA9IElubm9EQjsKKy0tZXJyb3IgRVJfVEFCTEVfRVhJU1RTX0VSUk9SCitD
UkVBVEUgRlVMTFRFWFQgSU5ERVggZnQgT04gdDEgKGMzKTsKKyMgVGhlIGZhaWxlZCBDUkVBVEUg
RlVMTFRFWFQgSU5ERVggc2hvdWxkIGhhdmUgY2xlYW5lZCB1cCBjM3A1IGZyb20gdGhlIGNhY2hl
LgogZXZhbCAkaW5ub2RiX21ldHJpY3Nfc2VsZWN0OwogCitEUk9QIFRBQkxFIGB0MSMyYDsKKwor
Y2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJJbm5vREI6IEVycm9yIGNyZWF0aW5nLip0MUAwMDIz
MS5pYmQiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiSW5ub0RCOiBFcnJvciBudW1iZXIg
MTcgbWVhbnMgJ0ZpbGUgZXhpc3RzJyIpOworCiBTRVQgREVCVUdfU1lOQyA9ICdyb3dfbG9nX2Fw
cGx5X2JlZm9yZSBTSUdOQUwgYzJnX2NyZWF0ZWQgV0FJVF9GT1IgZG1sNF9kb25lJzsKICMgVGhl
IGxvY2sgdXBncmFkZSBhdCB0aGUgZW5kIG9mIHRoZSBBTFRFUiB3aWxsIGNvbmZsaWN0IHdpdGgg
dGhlIERJU0NBUkQuCiBTRVQgbG9ja193YWl0X3RpbWVvdXQgPSAxOwoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEyMDQyMzEwNDgzNS05MTM4ZzN4N2VicHkxY2UzCisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIwNDIzMTIwOTIwLWlxMHkzMzZrMG8xc3NuYXEKQEAgLTI4NDEsNyArMjg0MSw3
IEBAIGhhX2lubm9iYXNlOjpjb21taXRfaW5wbGFjZV9hbHRlcl90YWJsZSgKIAkJCWJyZWFrOwog
CQljYXNlIERCX1RBQkxFU1BBQ0VfQUxSRUFEWV9FWElTVFM6CiAJCWNhc2UgREJfRFVQTElDQVRF
X0tFWToKLQkJCXV0X2EoY3R4LT5pbmRleGVkX3RhYmxlLT5uX3JlZl9jb3VudCA9PSAwKTsKKwkJ
CXV0X2EoY3R4LT5pbmRleGVkX3RhYmxlLT5uX3JlZl9jb3VudCA9PSAxKTsKIAkJCWlubm9iYXNl
X2NvbnZlcnRfdGFibGVuYW1lKHRtcF9uYW1lKTsKIAkJCW15X2Vycm9yKEVSX1RBQkxFX0VYSVNU
U19FUlJPUiwgTVlGKDApLCB0bXBfbmFtZSk7CiAJCQllcnIgPSBIQV9FUlJfVEFCTEVfRVhJU1Q7
CkBAIC0yODU0LDYgKzI4NTQsNyBAQCBoYV9pbm5vYmFzZTo6Y29tbWl0X2lucGxhY2VfYWx0ZXJf
dGFibGUoCiAJCWRyb3BfbmV3X2NsdXN0ZXJlZDoKIAkJCWRpY3RfdGFibGVfY2xvc2UoY3R4LT5p
bmRleGVkX3RhYmxlLCBUUlVFLCBGQUxTRSk7CiAJCQlyb3dfbWVyZ2VfZHJvcF90YWJsZSh0cngs
IGN0eC0+aW5kZXhlZF90YWJsZSk7CisJCQljdHgtPmluZGV4ZWRfdGFibGUgPSBOVUxMOwogCQl9
CiAJfSBlbHNlIGlmIChjdHgpIHsKIAkJZGJlcnJfdAllcnJvcjsKQEAgLTMwNTEsNiArMzA1Miwx
MCBAQCBwcm9jZXNzZWRfZmllbGQ6CiAJcm93X215c3FsX3VubG9ja19kYXRhX2RpY3Rpb25hcnko
dHJ4KTsKIAl0cnhfZnJlZV9mb3JfbXlzcWwodHJ4KTsKIAorCWlmICh0cnggPT0gY3R4LT50cngp
IHsKKwkJY3R4LT50cnggPSBOVUxMOworCX0KKwogCWlmIChlcnIgPT0gMCkgewogCQkvKiBEZWxl
dGUgY29ycmVzcG9uZGluZyByb3dzIGZyb20gdGhlIHN0YXRzIHRhYmxlLiBXZSB1cGRhdGUKIAkJ
dGhlIHN0YXRpc3RpY3MgaW4gYSBzZXBhcmF0ZSB0cmFuc2FjdGlvbiBmcm9tIHRyeCwgYmVjYXVz
ZQpAQCAtMzExNyw2ICszMTIyLDggQEAgZnVuY19leGl0OgogCX0KIAogcmV0OgotCU1PTklUT1Jf
QVRPTUlDX0RFQyhNT05JVE9SX1BFTkRJTkdfQUxURVJfVEFCTEUpOworCWlmIChlcnIgPT0gMCkg
eworCQlNT05JVE9SX0FUT01JQ19ERUMoTU9OSVRPUl9QRU5ESU5HX0FMVEVSX1RBQkxFKTsKKwl9
CiAJREJVR19SRVRVUk4oZXJyICE9IDApOwogfQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3Mg
Zm9yIHB1c2ggZW1haWxzKS4=