From: marko.makela
Date: April 7 2012 2:21pm
Subject: bzr push into mysql-trunk-wl5522 branch (marko.makela:3865 to 3866)
List-Archive: http://lists.mysql.com/commits/143422
Message-Id: <201204071421.q37ELQHQ025823@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NjYgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0wNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LXRydW5rLXdsNTU0NSB0byBteXNxbC01LjYtbGFicy1hcHJpbC0yMDEyLgoKICAgIG1vZGlmaWVk
OgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1pbmRleC1vbmxpbmUucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LW9ubGluZS50
ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCiAzODY1
IFlhc3VmdW1pIEtpbm9zaGl0YQkyMDEyLTA0LTA3CiAgICAgIEZpeCBmb3IgQnVnIzEzNzk4OTU2
OiBmaXggZm9yIGZsdXNoX25laWdoYm9ycyBiZWhhdmlvciB0byBmbHVzaCBvbmx5IGNvbnRpZ3Vv
dXMgcGFnZXMKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGZs
dS5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGIt
aW5kZXgtb25saW5lLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5v
ZGItaW5kZXgtb25saW5lLnJlc3VsdAlyZXZpZDp5YXN1ZnVtaS5raW5vc2hpdGFAb3JhY2xlLmNv
bS0yMDEyMDQwNzA2NTQ0MS1kNTNqeXFsbnEzaWJ2OHgyCisrKyBiL215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3IvaW5ub2RiLWluZGV4LW9ubGluZS5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMjA0MDcxNDA2NTMtdXdjOG0wdmpyNmQyYzJvMwpAQCAtNTcsNiArNTcsMTAg
QEAgQ09NTUlUOwogQUxURVIgVEFCTEUgdDEgQUREIFVOSVFVRSBJTkRFWChjMik7CiBFUlJPUiAy
MzAwMDogRHVwbGljYXRlIGVudHJ5ICc0JyBmb3Iga2V5ICdjMicKIERFTEVURSBGUk9NIHQxIFdI
RVJFIGMxPTc7CitBTFRFUiBUQUJMRSB0MSBBREQgRk9SRUlHTiBLRVkoYzIpIFJFRkVSRU5DRVMg
dDEoYzIpLCBBTEdPUklUSE09SU5QTEFDRTsKK0VSUk9SIDQyMDAwOiBUaGlzIHZlcnNpb24gb2Yg
TXlTUUwgZG9lc24ndCB5ZXQgc3VwcG9ydCAnQUxURVIgVEFCTEUgdDEgQUREIEZPUkVJR04gS0VZ
KGMyKSBSRUZFUkVOQ0VTIHQxKGMyKSwgQUxHT1JJVEhNPUlOUExBQ0UnCitBTFRFUiBUQUJMRSB0
MSBBREQgVU5JUVVFIElOREVYKGMyKSwgTE9DSz1FWENMVVNJVkUsIEFMR09SSVRITT1JTlBMQUNF
OworRFJPUCBJTkRFWCBjMiBPTiB0MTsKIEFMVEVSIFRBQkxFIHQxIEFERCBVTklRVUUgSU5ERVgo
YzIpOwogU0VUIERFQlVHX1NZTkM9J25vdyBXQUlUX0ZPUiBzY2FubmVkJzsKIFNFTEVDVCBuYW1l
LGNvdW50IEZST00gSU5GT1JNQVRJT05fU0NIRU1BLklOTk9EQl9NRVRSSUNTIFdIRVJFIHN1YnN5
c3RlbT0nZGRsJzsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYi1pbmRleC1vbmxpbmUudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGItaW5kZXgtb25saW5lLnRlc3QJcmV2aWQ6eWFzdWZ1bWkua2lub3NoaXRhQG9yYWNs
ZS5jb20tMjAxMjA0MDcwNjU0NDEtZDUzanlxbG5xM2lidjh4MgorKysgYi9teXNxbC10ZXN0L3N1
aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC1vbmxpbmUudGVzdAlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEyMDQwNzE0MDY1My11d2M4bTB2anI2ZDJjMm8zCkBAIC03Niw2ICs3Niwx
MyBAQCBBTFRFUiBUQUJMRSB0MSBBREQgVU5JUVVFIElOREVYKGMyKTsKIGNvbm5lY3Rpb24gZGVm
YXVsdDsKIERFTEVURSBGUk9NIHQxIFdIRVJFIGMxPTc7CiBjb25uZWN0aW9uIGNvbjE7CisjIEFE
RCBGT1JFSUdOIEtFWSBpcyBub3Qgc3VwcG9ydGVkIGluLXBsYWNlCistLWVycm9yIEVSX05PVF9T
VVBQT1JURURfWUVUCitBTFRFUiBUQUJMRSB0MSBBREQgRk9SRUlHTiBLRVkoYzIpIFJFRkVSRU5D
RVMgdDEoYzIpLCBBTEdPUklUSE09SU5QTEFDRTsKKyMgVGhlIHByZXZpb3VzIERFQlVHX1NZTkMg
c2hvdWxkIGJlIGlnbm9yZWQsIGJlY2F1c2UgYW4gZXhjbHVzaXZlIGxvY2sKKyMgaGFzIGJlZW4g
cmVxdWVzdGVkIGFuZCB0aGUgb25saW5lIGxvZyBpcyBub3QgYmVpbmcgYWxsb2NhdGVkLgorQUxU
RVIgVEFCTEUgdDEgQUREIFVOSVFVRSBJTkRFWChjMiksIExPQ0s9RVhDTFVTSVZFLCBBTEdPUklU
SE09SU5QTEFDRTsKK0RST1AgSU5ERVggYzIgT04gdDE7CiAjIE5vdyB0aGUgcHJldmlvdXMgREVC
VUdfU1lOQyBzaG91bGQga2ljayBpbi4KIC0tc2VuZAogQUxURVIgVEFCTEUgdDEgQUREIFVOSVFV
RSBJTkRFWChjMik7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVy
L2hhbmRsZXIwYWx0ZXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVy
MGFsdGVyLmNjCXJldmlkOnlhc3VmdW1pLmtpbm9zaGl0YUBvcmFjbGUuY29tLTIwMTIwNDA3MDY1
NDQxLWQ1M2p5cWxucTNpYnY4eDIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRs
ZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MDcxNDA2NTMt
dXdjOG0wdmpyNmQyYzJvMwpAQCAtMTQyOCw2ICsxNDI4LDkgQEAgcHJlcGFyZV9pbnBsYWNlX2Fs
dGVyX3RhYmxlX2RpY3QoCiAJdGhlIGRhdGEgZGljdGlvbmFyeSB3aWxsIGJlIGxvY2tlZCBpbiBj
cmFzaCByZWNvdmVyeS4gKi8KIAl0cnhfc2V0X2RpY3Rfb3BlcmF0aW9uKHRyeCwgVFJYX0RJQ1Rf
T1BfSU5ERVgpOwogCisJY29uc3QgYm9vbCBleGNsdXNpdmUgPSBoYV9hbHRlcl9pbmZvLT5hbHRl
cl9pbmZvLT5yZXF1ZXN0ZWRfbG9jaworCQk9PSBBbHRlcl9pbmZvOjpBTFRFUl9UQUJMRV9MT0NL
X0VYQ0xVU0lWRTsKKwogCS8qIEFjcXVpcmUgYSBsb2NrIG9uIHRoZSB0YWJsZSBiZWZvcmUgY3Jl
YXRpbmcgYW55IGluZGV4ZXMuICovCiAJaWYgKG5ld19jbHVzdGVyZWQpIHsKIAkJZXJyb3IgPSBy
b3dfbWVyZ2VfbG9ja190YWJsZSgKQEAgLTE2NTgsNyArMTY2MSw3IEBAIGNvbF9mYWlsOgogCQly
ZXF1ZXN0ZWQsIGFsbG9jYXRlIGEgbW9kaWZpY2F0aW9uIGxvZy4gSWYgdGhlIHRhYmxlCiAJCXdp
bGwgYmUgZXhjbHVzaXZlbHkgbG9ja2VkIGFueXdheSwgdGhlIG1vZGlmaWNhdGlvbgogCQlsb2cg
aXMgdW5uZWNlc3NhcnkuICovCi0JCWlmICghbnVtX2Z0c19pbmRleAorCQlpZiAoIWV4Y2x1c2l2
ZSAmJiAhbnVtX2Z0c19pbmRleAogCQkgICAgJiYgIShoYV9hbHRlcl9pbmZvLT5oYW5kbGVyX2Zs
YWdzCiAJCQkgJiB+SU5OT0JBU0VfT05MSU5FX09QRVJBVElPTlMpKSB7CiAJCQlEQlVHX0VYRUNV
VEVfSUYoImlubm9kYl9PT01fcHJlcGFyZV9pbnBsYWNlX2FsdGVyIiwKQEAgLTE3NzIsNyArMTc3
NSw3IEBAIGVycm9yX2hhbmRsaW5nOgogCQkJYWRkX2luZGV4LCBhZGRfa2V5X251bXMsIG5fYWRk
X2luZGV4LAogCQkJZHJvcF9pbmRleCwgbl9kcm9wX2luZGV4LAogCQkJZHJvcF9mb3JlaWduLCBu
X2Ryb3BfZm9yZWlnbiwKLQkJCSFuZXdfY2x1c3RlcmVkICYmICFudW1fZnRzX2luZGV4LAorCQkJ
IWV4Y2x1c2l2ZSAmJiAhbmV3X2NsdXN0ZXJlZCAmJiAhbnVtX2Z0c19pbmRleCwKIAkJCWhlYXAs
IHRyeCwgaW5kZXhlZF90YWJsZSk7CiAJCURCVUdfUkVUVVJOKGZhbHNlKTsKIAljYXNlIERCX1RB
QkxFU1BBQ0VfRVhJU1RTOgpAQCAtMjExMiwxMSArMjExNSwxNCBAQCBpbmRleF9uZWVkZWQ6CiAK
IAlpZiAoIShoYV9hbHRlcl9pbmZvLT5oYW5kbGVyX2ZsYWdzICYgSU5OT0JBU0VfSU5QTEFDRV9D
UkVBVEUpKSB7CiAJCWlmIChoZWFwKSB7CisJCQljb25zdCBib29sIGV4Y2x1c2l2ZQorCQkJCT0g
aGFfYWx0ZXJfaW5mby0+YWx0ZXJfaW5mby0+cmVxdWVzdGVkX2xvY2sKKwkJCQk9PSBBbHRlcl9p
bmZvOjpBTFRFUl9UQUJMRV9MT0NLX0VYQ0xVU0lWRTsKIAkJCWhhX2FsdGVyX2luZm8tPmhhbmRs
ZXJfY3R4CiAJCQkJPSBuZXcgaGFfaW5ub2Jhc2VfaW5wbGFjZV9jdHgoCiAJCQkJCU5VTEwsIE5V
TEwsIDAsCiAJCQkJCWRyb3BfaW5kZXgsIG5fZHJvcF9pbmRleCwKLQkJCQkJZHJvcF9maywgbl9k
cm9wX2ZrLCB0cnVlLAorCQkJCQlkcm9wX2ZrLCBuX2Ryb3BfZmssICFleGNsdXNpdmUsCiAJCQkJ
CWhlYXAsIE5VTEwsIGluZGV4ZWRfdGFibGUpOwogCQl9CiAKCk5vIGJ1bmRsZSAocmVhc29uOiB1
c2VsZXNzIGZvciBwdXNoIGVtYWlscyku