From: marko.makela
Date: September 25 2012 12:42pm
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4318 to 4321)
List-Archive: http://lists.mysql.com/commits/144880
Message-Id: <20120925124241.26353.70393.4321@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzMjEgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBTdXBwcmVzcyBhIHdhcm5pbmcg
dGhhdCBpcyBzb21ldGltZXMgaXNzdWVkIGFib3V0IGNyYXNoIHJlY292ZXJ5LgoKICAgIG1vZGlm
aWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3BhcnRzL3IvcGFydGl0aW9uX2RlYnVnLnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3N1aXRlL3BhcnRzL3QvcGFydGl0aW9uX2RlYnVnLnRlc3QKIDQz
MjAgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBNYWtlIHRoZSB0ZXN0IHdvcmsgd2l0
aCBub24tZGVmYXVsdCBpbm5vZGItcGFnZS1zaXplLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLnRlc3QKIDQzMTkgTWFy
a28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBTdXBwcmVzcyB3YXJuaW5ncyBhYm91dCByZXNp
emluZyB0aGUgSW5ub0RCIHJlZG8gbG9nLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0
L3IvbXlzcWxfcGx1Z2luLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvbXlzcWxfcGx1Z2luLnRl
c3QKIDQzMTggTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBDb3JyZWN0IGEgdHlwbyBp
biBhIGNvbW1lbnQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny
djBzdGFydC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL215c3FsX3BsdWdpbi5y
ZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9teXNxbF9wbHVnaW4ucmVzdWx0CXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI1MDg0MjE5LW03OGY3aTJxdGI3aW91dnQKKysrIGIv
bXlzcWwtdGVzdC9yL215c3FsX3BsdWdpbi5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjA5MjUxMjQxNDgtdmZvczN5bnZpZHlvazJtOApAQCAtMSwzICsxLDYgQEAKK2Nh
bGwgbXRyLmFkZF9zdXBwcmVzc2lvbignSW5ub0RCOiBSZXNpemluZyByZWRvIGxvZycpOworY2Fs
bCBtdHIuYWRkX3N1cHByZXNzaW9uKCdJbm5vREI6IFN0YXJ0aW5nIHRvIGRlbGV0ZSBhbmQgcmV3
cml0ZSBsb2cgZmlsZXMnKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbignSW5ub0RCOiBOZXcg
bG9nIGZpbGVzIGNyZWF0ZWQnKTsKICMKICMgRW5zdXJlIHRoZSBwbHVnaW4gaXNuJ3QgbG9hZGVk
LgogIwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2Ri
LWxvZy1maWxlLXNpemUudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5v
ZGItbG9nLWZpbGUtc2l6ZS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIw
OTI1MDg0MjE5LW03OGY3aTJxdGI3aW91dnQKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGItbG9nLWZpbGUtc2l6ZS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTIwOTI1MTI0MTQ4LXZmb3MzeW52aWR5b2sybTgKQEAgLTgyLDcgKzgyLDcgQEAgbGV0IFNF
QVJDSF9QQVRURVJOPSBJbm5vREI6IFN0YXJ0aW5nIGFuCiAtLWV4ZWMgJE1ZU1FMRF9DTUQgJGNy
YXNoPTQKIGxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBTdGFydGluZyBhbiBhcHBseSBiYXRj
aCBvZiBsb2cgcmVjb3JkczsKIC0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmls
ZS5pbmMKLWxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBSZXNpemluZyByZWRvIGxvZyBmcm9t
IDNcKjMyMCB0byAyXCozMjAgcGFnZXM7CitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogUmVz
aXppbmcgcmVkbyBsb2cgZnJvbSAzKFwqWzAtOV0rMCkgdG8gMlwxIHBhZ2VzOwogLS1zb3VyY2Ug
aW5jbHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxlLmluYwogLS1saXN0X2ZpbGVzICRNWVNRTERf
REFUQURJUgogLS1yZW1vdmVfZmlsZSAkU0VBUkNIX0ZJTEUKQEAgLTkxLDcgKzkxLDcgQEAgbGV0
IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFJlc2l6aW5nIHJlZAogLS1leGVjICRNWVNRTERfQ01E
ICRjcmFzaD01CiBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU3RhcnRpbmcgYW4gYXBwbHkg
YmF0Y2ggb2YgbG9nIHJlY29yZHM7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2lu
X2ZpbGUuaW5jCi1sZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogUmVzaXppbmcgcmVkbyBsb2cg
ZnJvbSAzXCozMjAgdG8gMlwqMzIwIHBhZ2VzOworbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6
IFJlc2l6aW5nIHJlZG8gbG9nIGZyb20gMyhcKlswLTldKzApIHRvIDJcMSBwYWdlczsKIC0tc291
cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tbGlzdF9maWxlcyAkTVlT
UUxEX0RBVEFESVIKIC0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCkBAIC0xMDAsNyArMTAwLDcg
QEAgbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFJlc2l6aW5nIHJlZAogLS1leGVjICRNWVNR
TERfQ01EICRjcmFzaD02CiBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU3RhcnRpbmcgYW4g
YXBwbHkgYmF0Y2ggb2YgbG9nIHJlY29yZHM7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0
ZXJuX2luX2ZpbGUuaW5jCi1sZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogUmVzaXppbmcgcmVk
byBsb2cgZnJvbSAzXCozMjAgdG8gMlwqMzIwIHBhZ2VzOworbGV0IFNFQVJDSF9QQVRURVJOPSBJ
bm5vREI6IFJlc2l6aW5nIHJlZG8gbG9nIGZyb20gMyhcKlswLTldKzApIHRvIDJcMSBwYWdlczsK
IC0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tbGlzdF9maWxl
cyAkTVlTUUxEX0RBVEFESVIKIC0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCgo9PT0gbW9kaWZp
ZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9yL3BhcnRpdGlvbl9kZWJ1Zy5yZXN1bHQn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvci9wYXJ0aXRpb25fZGVidWcucmVzdWx0CXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI1MDg0MjE5LW03OGY3aTJxdGI3aW91
dnQKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9yL3BhcnRpdGlvbl9kZWJ1Zy5yZXN1bHQJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjUxMjQxNDgtdmZvczN5bnZpZHlv
azJtOApAQCAtMyw2ICszLDcgQEAgRFJPUCBUQUJMRSBJRiBFWElTVFMgdDE7CiAjIFdMIzQ0NDU6
IEVYQ0hBTkdFIFBBUlRJVElPTiBXSVRIIFRBQkxFCiAjIFZlcmlmeSBkZGxfbG9nIGluIGNhc2Ug
b2YgY3Jhc2hpbmcuCiBjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIkF0dGVtcHRpbmcgYmFja3Ry
YWNlLiBZb3UgY2FuIHVzZSB0aGUgZm9sbG93aW5nIGluZm9ybWF0aW9uIHRvIGZpbmQgb3V0Iik7
CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oJ0lubm9EQjogVGhlIGxvZyBzZXF1ZW5jZSBudW1i
ZXJzIFswLTldKyBhbmQgWzAtOV0rIGluIGliZGF0YSBmaWxlcyBkbyBub3QgbWF0Y2ggdGhlIGxv
ZyBzZXF1ZW5jZSBudW1iZXIgWzAtOV0rIGluIHRoZSBpYl9sb2dmaWxlcyEnKTsKIFNFVCBTRVNT
SU9OIGRlYnVnPSIrZCxleGNoYW5nZV9wYXJ0aXRpb25fYWJvcnRfMSI7CiBDUkVBVEUgVEFCTEUg
dDIgKGEgSU5ULCBiIFZBUkNIQVIoNjQpKTsKIElOU0VSVCBJTlRPIHQyIFZBTFVFUyAoNSwgIk9y
aWdpbmFsIGZyb20gdGFibGUgdDIiKSwgKDYsICJPcmlnaW5hbCBmcm9tIHRhYmxlIHQyIiksICg3
LCAiT3JpZ2luYWwgZnJvbSB0YWJsZSB0MiIpLCAoOCwgIk9yaWdpbmFsIGZyb20gdGFibGUgdDIi
KTsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL3BhcnRzL3QvcGFydGl0aW9u
X2RlYnVnLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvdC9wYXJ0aXRpb25fZGVi
dWcudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNTA4NDIxOS1tNzhm
N2kycXRiN2lvdXZ0CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvdC9wYXJ0aXRpb25fZGVi
dWcudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNTEyNDE0OC12Zm9z
M3ludmlkeW9rMm04CkBAIC0xOCw2ICsxOCw3IEBAIERST1AgVEFCTEUgSUYgRVhJU1RTIHQxOwog
LS1lY2hvICMgV0wjNDQ0NTogRVhDSEFOR0UgUEFSVElUSU9OIFdJVEggVEFCTEUKIC0tZWNobyAj
IFZlcmlmeSBkZGxfbG9nIGluIGNhc2Ugb2YgY3Jhc2hpbmcuCiBjYWxsIG10ci5hZGRfc3VwcHJl
c3Npb24oIkF0dGVtcHRpbmcgYmFja3RyYWNlLiBZb3UgY2FuIHVzZSB0aGUgZm9sbG93aW5nIGlu
Zm9ybWF0aW9uIHRvIGZpbmQgb3V0Iik7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oJ0lubm9E
QjogVGhlIGxvZyBzZXF1ZW5jZSBudW1iZXJzIFswLTldKyBhbmQgWzAtOV0rIGluIGliZGF0YSBm
aWxlcyBkbyBub3QgbWF0Y2ggdGhlIGxvZyBzZXF1ZW5jZSBudW1iZXIgWzAtOV0rIGluIHRoZSBp
Yl9sb2dmaWxlcyEnKTsKIAogbGV0ICRjcmVhdGVfc3RhdGVtZW50PSBDUkVBVEUgVEFCTEUgdDEg
KGEgSU5ULCBiIFZBUkNIQVIoNjQpKSBQQVJUSVRJT04gQlkgUkFOR0UgKGEpCiAoUEFSVElUSU9O
IHAwIFZBTFVFUyBMRVNTIFRIQU4gKDEwKSwKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0
L3QvbXlzcWxfcGx1Z2luLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9teXNxbF9wbHVnaW4udGVz
dAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNTA4NDIxOS1tNzhmN2kycXRi
N2lvdXZ0CisrKyBiL215c3FsLXRlc3QvdC9teXNxbF9wbHVnaW4udGVzdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNTEyNDE0OC12Zm9zM3ludmlkeW9rMm04CkBAIC0yMyw2
ICsyMywxMCBAQAogLS1zb3VyY2UgaW5jbHVkZS9ub3RfZW1iZWRkZWQuaW5jCiAtLXNvdXJjZSBp
bmNsdWRlL2hhdmVfaW5ub2RiXzE2ay5pbmMKIAorY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCdJ
bm5vREI6IFJlc2l6aW5nIHJlZG8gbG9nJyk7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oJ0lu
bm9EQjogU3RhcnRpbmcgdG8gZGVsZXRlIGFuZCByZXdyaXRlIGxvZyBmaWxlcycpOworY2FsbCBt
dHIuYWRkX3N1cHByZXNzaW9uKCdJbm5vREI6IE5ldyBsb2cgZmlsZXMgY3JlYXRlZCcpOworCiAj
IEFkZCB0aGUgZGF0YWRpciwgYmFzZWRpciwgcGx1Z2luX2RpciB0byB0aGUgYm9vdHN0cmFwIGNv
bW1hbmQKIGxldCAkTVlTUUxEX0RBVEFESVI9IGBzZWxlY3QgQEBkYXRhZGlyYDsKIGxldCAkTVlT
UUxfQkFTRURJUj0gYHNlbGVjdCBAQGJhc2VkaXJgOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxl
c3MgZm9yIHB1c2ggZW1haWxzKS4=