From: marko.makela
Date: January 26 2012 12:51pm
Subject: bzr push into mysql-trunk branch (marko.makela:3797 to 3798) Bug#13610358
List-Archive: http://lists.mysql.com/commits/142581
X-Bug: 13610358
Message-Id: <201201261251.q0QCpYQr027380@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3OTggTWFya28gTcOka2Vsw6QJMjAxMi0wMS0yNgogICAgICBCdWcjMTM2MTAzNTggaW5ub2Ri
X3NvcnRfYnVmX3NpemUgc2hvdWxkIGJlIGNhbGxlZCBpbm5vZGJfc29ydF9idWZmZXJfc2l6ZQog
ICAgICBmb3IgY29uc2lzdGVuY3kKCiAgICByZW5hbWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRl
L3N5c192YXJzL3IvaW5ub2RiX3NvcnRfYnVmX3NpemVfYmFzaWMucmVzdWx0ID0+IG15c3FsLXRl
c3Qvc3VpdGUvc3lzX3ZhcnMvci9pbm5vZGJfc29ydF9idWZmZXJfc2l6ZV9iYXNpYy5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9zb3J0X2J1Zl9zaXplX2Jh
c2ljLnRlc3QgPT4gbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9zb3J0X2J1ZmZl
cl9zaXplX2Jhc2ljLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hh
bmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9pbm5v
ZGJfc29ydF9idWZmZXJfc2l6ZV9iYXNpYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9z
eXNfdmFycy90L2lubm9kYl9zb3J0X2J1ZmZlcl9zaXplX2Jhc2ljLnRlc3QKIDM3OTcgTWF0dGlh
cyBKb25zc29uCTIwMTItMDEtMjYKICAgICAgQnVnIzEzNTExNTI5IHBvc3QtcHVzaCBmaXggb2Yg
dGVzdC4KICAgICAgCiAgICAgIFRlc3QgZmFpbGVkIHdpdGggLS1wcy1wcm90b2NvbC4KICAgICAg
CiAgICAgIEZpeGVkIGJ5IG1vdmluZyBmYWlsaW5nIGNyZWF0ZSB0YWJsZSdzIHRvIGJlZm9yZQog
ICAgICB0aGUgd29ya2luZyBvbmUuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9w
bHVnaW4ucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9wbHVnaW4udGVzdAo9PT0gcmVuYW1lZCBm
aWxlICdteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX3NvcnRfYnVmX3NpemVfYmFz
aWMucmVzdWx0JyA9PiAnbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9zb3J0X2J1
ZmZlcl9zaXplX2Jhc2ljLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9y
L2lubm9kYl9zb3J0X2J1Zl9zaXplX2Jhc2ljLnJlc3VsdAlyZXZpZDptYXR0aWFzLmpvbnNzb25A
b3JhY2xlLmNvbS0yMDEyMDEyNjEyMzkzNS02bmR3d2hzYWx1aWE3bDl3CisrKyBiL215c3FsLXRl
c3Qvc3VpdGUvc3lzX3ZhcnMvci9pbm5vZGJfc29ydF9idWZmZXJfc2l6ZV9iYXNpYy5yZXN1bHQJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjAxMjYxMjUwMzQtdXlobWp5YWp2ZWd5
ZzAwZApAQCAtMSwyMSArMSwyMSBAQAotc2VsZWN0IEBAZ2xvYmFsLmlubm9kYl9zb3J0X2J1Zl9z
aXplOwotQEBnbG9iYWwuaW5ub2RiX3NvcnRfYnVmX3NpemUKK3NlbGVjdCBAQGdsb2JhbC5pbm5v
ZGJfc29ydF9idWZmZXJfc2l6ZTsKK0BAZ2xvYmFsLmlubm9kYl9zb3J0X2J1ZmZlcl9zaXplCiAx
MDQ4NTc2Ci1zZWxlY3QgQEBzZXNzaW9uLmlubm9kYl9zb3J0X2J1Zl9zaXplOwotRVJST1IgSFkw
MDA6IFZhcmlhYmxlICdpbm5vZGJfc29ydF9idWZfc2l6ZScgaXMgYSBHTE9CQUwgdmFyaWFibGUK
LXNob3cgZ2xvYmFsIHZhcmlhYmxlcyBsaWtlICdpbm5vZGJfc29ydF9idWZfc2l6ZSc7CitzZWxl
Y3QgQEBzZXNzaW9uLmlubm9kYl9zb3J0X2J1ZmZlcl9zaXplOworRVJST1IgSFkwMDA6IFZhcmlh
YmxlICdpbm5vZGJfc29ydF9idWZmZXJfc2l6ZScgaXMgYSBHTE9CQUwgdmFyaWFibGUKK3Nob3cg
Z2xvYmFsIHZhcmlhYmxlcyBsaWtlICdpbm5vZGJfc29ydF9idWZmZXJfc2l6ZSc7CiBWYXJpYWJs
ZV9uYW1lCVZhbHVlCi1pbm5vZGJfc29ydF9idWZfc2l6ZQkxMDQ4NTc2Ci1zaG93IHNlc3Npb24g
dmFyaWFibGVzIGxpa2UgJ2lubm9kYl9zb3J0X2J1Zl9zaXplJzsKK2lubm9kYl9zb3J0X2J1ZmZl
cl9zaXplCTEwNDg1NzYKK3Nob3cgc2Vzc2lvbiB2YXJpYWJsZXMgbGlrZSAnaW5ub2RiX3NvcnRf
YnVmZmVyX3NpemUnOwogVmFyaWFibGVfbmFtZQlWYWx1ZQotaW5ub2RiX3NvcnRfYnVmX3NpemUJ
MTA0ODU3Ngotc2VsZWN0ICogZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEuZ2xvYmFsX3ZhcmlhYmxl
cyB3aGVyZSB2YXJpYWJsZV9uYW1lPSdpbm5vZGJfc29ydF9idWZfc2l6ZSc7Citpbm5vZGJfc29y
dF9idWZmZXJfc2l6ZQkxMDQ4NTc2CitzZWxlY3QgKiBmcm9tIGluZm9ybWF0aW9uX3NjaGVtYS5n
bG9iYWxfdmFyaWFibGVzIHdoZXJlIHZhcmlhYmxlX25hbWU9J2lubm9kYl9zb3J0X2J1ZmZlcl9z
aXplJzsKIFZBUklBQkxFX05BTUUJVkFSSUFCTEVfVkFMVUUKLUlOTk9EQl9TT1JUX0JVRl9TSVpF
CTEwNDg1NzYKLXNlbGVjdCAqIGZyb20gaW5mb3JtYXRpb25fc2NoZW1hLnNlc3Npb25fdmFyaWFi
bGVzIHdoZXJlIHZhcmlhYmxlX25hbWU9J2lubm9kYl9zb3J0X2J1Zl9zaXplJzsKK0lOTk9EQl9T
T1JUX0JVRkZFUl9TSVpFCTEwNDg1NzYKK3NlbGVjdCAqIGZyb20gaW5mb3JtYXRpb25fc2NoZW1h
LnNlc3Npb25fdmFyaWFibGVzIHdoZXJlIHZhcmlhYmxlX25hbWU9J2lubm9kYl9zb3J0X2J1ZmZl
cl9zaXplJzsKIFZBUklBQkxFX05BTUUJVkFSSUFCTEVfVkFMVUUKLUlOTk9EQl9TT1JUX0JVRl9T
SVpFCTEwNDg1NzYKLXNldCBnbG9iYWwgaW5ub2RiX3NvcnRfYnVmX3NpemU9MTsKLUVSUk9SIEhZ
MDAwOiBWYXJpYWJsZSAnaW5ub2RiX3NvcnRfYnVmX3NpemUnIGlzIGEgcmVhZCBvbmx5IHZhcmlh
YmxlCi1zZXQgc2Vzc2lvbiBpbm5vZGJfc29ydF9idWZfc2l6ZT0xOwotRVJST1IgSFkwMDA6IFZh
cmlhYmxlICdpbm5vZGJfc29ydF9idWZfc2l6ZScgaXMgYSByZWFkIG9ubHkgdmFyaWFibGUKK0lO
Tk9EQl9TT1JUX0JVRkZFUl9TSVpFCTEwNDg1NzYKK3NldCBnbG9iYWwgaW5ub2RiX3NvcnRfYnVm
ZmVyX3NpemU9MTsKK0VSUk9SIEhZMDAwOiBWYXJpYWJsZSAnaW5ub2RiX3NvcnRfYnVmZmVyX3Np
emUnIGlzIGEgcmVhZCBvbmx5IHZhcmlhYmxlCitzZXQgc2Vzc2lvbiBpbm5vZGJfc29ydF9idWZm
ZXJfc2l6ZT0xOworRVJST1IgSFkwMDA6IFZhcmlhYmxlICdpbm5vZGJfc29ydF9idWZmZXJfc2l6
ZScgaXMgYSByZWFkIG9ubHkgdmFyaWFibGUKCj09PSByZW5hbWVkIGZpbGUgJ215c3FsLXRlc3Qv
c3VpdGUvc3lzX3ZhcnMvdC9pbm5vZGJfc29ydF9idWZfc2l6ZV9iYXNpYy50ZXN0JyA9PiAnbXlz
cWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9zb3J0X2J1ZmZlcl9zaXplX2Jhc2ljLnRl
c3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9pbm5vZGJfc29ydF9idWZfc2l6
ZV9iYXNpYy50ZXN0CXJldmlkOm1hdHRpYXMuam9uc3NvbkBvcmFjbGUuY29tLTIwMTIwMTI2MTIz
OTM1LTZuZHd3aHNhbHVpYTdsOXcKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lu
bm9kYl9zb3J0X2J1ZmZlcl9zaXplX2Jhc2ljLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjAxMjYxMjUwMzQtdXlobWp5YWp2ZWd5ZzAwZApAQCAtOCwxOSArOCwxOSBAQAog
IwogIyBzaG93IHRoZSBnbG9iYWwgYW5kIHNlc3Npb24gdmFsdWVzOwogIwotc2VsZWN0IEBAZ2xv
YmFsLmlubm9kYl9zb3J0X2J1Zl9zaXplOworc2VsZWN0IEBAZ2xvYmFsLmlubm9kYl9zb3J0X2J1
ZmZlcl9zaXplOwogLS1lcnJvciBFUl9JTkNPUlJFQ1RfR0xPQkFMX0xPQ0FMX1ZBUgotc2VsZWN0
IEBAc2Vzc2lvbi5pbm5vZGJfc29ydF9idWZfc2l6ZTsKLXNob3cgZ2xvYmFsIHZhcmlhYmxlcyBs
aWtlICdpbm5vZGJfc29ydF9idWZfc2l6ZSc7Ci1zaG93IHNlc3Npb24gdmFyaWFibGVzIGxpa2Ug
J2lubm9kYl9zb3J0X2J1Zl9zaXplJzsKLXNlbGVjdCAqIGZyb20gaW5mb3JtYXRpb25fc2NoZW1h
Lmdsb2JhbF92YXJpYWJsZXMgd2hlcmUgdmFyaWFibGVfbmFtZT0naW5ub2RiX3NvcnRfYnVmX3Np
emUnOwotc2VsZWN0ICogZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEuc2Vzc2lvbl92YXJpYWJsZXMg
d2hlcmUgdmFyaWFibGVfbmFtZT0naW5ub2RiX3NvcnRfYnVmX3NpemUnOworc2VsZWN0IEBAc2Vz
c2lvbi5pbm5vZGJfc29ydF9idWZmZXJfc2l6ZTsKK3Nob3cgZ2xvYmFsIHZhcmlhYmxlcyBsaWtl
ICdpbm5vZGJfc29ydF9idWZmZXJfc2l6ZSc7CitzaG93IHNlc3Npb24gdmFyaWFibGVzIGxpa2Ug
J2lubm9kYl9zb3J0X2J1ZmZlcl9zaXplJzsKK3NlbGVjdCAqIGZyb20gaW5mb3JtYXRpb25fc2No
ZW1hLmdsb2JhbF92YXJpYWJsZXMgd2hlcmUgdmFyaWFibGVfbmFtZT0naW5ub2RiX3NvcnRfYnVm
ZmVyX3NpemUnOworc2VsZWN0ICogZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEuc2Vzc2lvbl92YXJp
YWJsZXMgd2hlcmUgdmFyaWFibGVfbmFtZT0naW5ub2RiX3NvcnRfYnVmZmVyX3NpemUnOwogCiAj
CiAjIHNob3cgdGhhdCBpdCdzIHJlYWQtb25seQogIwogLS1lcnJvciBFUl9JTkNPUlJFQ1RfR0xP
QkFMX0xPQ0FMX1ZBUgotc2V0IGdsb2JhbCBpbm5vZGJfc29ydF9idWZfc2l6ZT0xOworc2V0IGds
b2JhbCBpbm5vZGJfc29ydF9idWZmZXJfc2l6ZT0xOwogLS1lcnJvciBFUl9JTkNPUlJFQ1RfR0xP
QkFMX0xPQ0FMX1ZBUgotc2V0IHNlc3Npb24gaW5ub2RiX3NvcnRfYnVmX3NpemU9MTsKK3NldCBz
ZXNzaW9uIGlubm9kYl9zb3J0X2J1ZmZlcl9zaXplPTE7CiAKCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hdHRpYXMuam9uc3NvbkBvcmFjbGUuY29t
LTIwMTIwMTI2MTIzOTM1LTZuZHd3aHNhbHVpYTdsOXcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9o
YW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDEy
NjEyNTAzNC11eWhtanlhanZlZ3lnMDBkCkBAIC0xNDU0OCwxMCArMTQ1NDgsMTAgQEAgc3RhdGlj
IE1ZU1FMX1NZU1ZBUl9VTE9ORyhmdF9zb3J0X3BsbF9kZQogICAiSW5ub0RCIEZ1bGx0ZXh0IHNl
YXJjaCBwYXJhbGxlbCBzb3J0IGRlZ3JlZSwgd2lsbCByb3VuZCB1cCB0byBuZWFyZXN0IHBvd2Vy
IG9mIDIgbnVtYmVyIiwKICAgTlVMTCwgTlVMTCwgMiwgMSwgMTYsIDApOwogCi1zdGF0aWMgTVlT
UUxfU1lTVkFSX1VMT05HKHNvcnRfYnVmX3NpemUsIHNydl9zb3J0X2J1Zl9zaXplLAorc3RhdGlj
IE1ZU1FMX1NZU1ZBUl9VTE9ORyhzb3J0X2J1ZmZlcl9zaXplLCBzcnZfc29ydF9idWZfc2l6ZSwK
ICAgUExVR0lOX1ZBUl9SUUNNREFSRyB8IFBMVUdJTl9WQVJfUkVBRE9OTFksCi0gICJJbm5vREIg
RnVsbHRleHQgc2VhcmNoIHNvcnQgYnVmZmVyIHNpemUiLAotICBOVUxMLCBOVUxMLCAxMDQ4NTc2
LCA1MjQyODgsIDY0ODM2NDgwLCAwKTsKKyAgIk1lbW9yeSBidWZmZXIgc2l6ZSBmb3IgaW5kZXgg
Y3JlYXRpb24iLAorICBOVUxMLCBOVUxMLCAxMDQ4NTc2LCA1MjQyODgsIDY0PDwyMCwgMCk7CiAK
IHN0YXRpYyBNWVNRTF9TWVNWQVJfQk9PTChvcHRpbWl6ZV9mdWxsdGV4dF9vbmx5LCBpbm5vZGJf
b3B0aW1pemVfZnVsbHRleHRfb25seSwKICAgUExVR0lOX1ZBUl9OT0NNREFSRywKQEAgLTE0ODY0
LDcgKzE0ODY0LDcgQEAgc3RhdGljIHN0cnVjdCBzdF9teXNxbF9zeXNfdmFyKiBpbm5vYmFzZQog
ICBNWVNRTF9TWVNWQVIoc3RhdHVzX2ZpbGUpLAogICBNWVNRTF9TWVNWQVIoc3RyaWN0X21vZGUp
LAogICBNWVNRTF9TWVNWQVIoc3VwcG9ydF94YSksCi0gIE1ZU1FMX1NZU1ZBUihzb3J0X2J1Zl9z
aXplKSwKKyAgTVlTUUxfU1lTVkFSKHNvcnRfYnVmZmVyX3NpemUpLAogICBNWVNRTF9TWVNWQVIo
YW5hbHl6ZV9pc19wZXJzaXN0ZW50KSwKICAgTVlTUUxfU1lTVkFSKHN5bmNfc3Bpbl9sb29wcyks
CiAgIE1ZU1FMX1NZU1ZBUihzcGluX3dhaXRfZGVsYXkpLAoKTm8gYnVuZGxlIChyZWFzb246IHVz
ZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=