From: marko.makela
Date: September 28 2012 10:46am
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4345 to 4347) WL#6494
List-Archive: http://lists.mysql.com/commits/144902
Message-Id: <20120928104600.32335.24701.4347@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzNDcgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yOAogICAgICBXTCM2NDk0IHRlc3QgY2FzZSBm
aXg6IFN1cHByZXNzIGdjb3YgZmFpbHVyZSwgc2tpcCB0ZXN0IHdpdGggMk0gbG9nIHNpemUuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWxvZy1m
aWxlLXNpemUtMS50ZXN0CiA0MzQ2IE1hcmtvIE3DpGtlbMOkCTIwMTItMDktMjgKICAgICAgV0wj
NjQ5NDogTWFrZSB0aGUgdGVzdCBpbmRlcGVuZGVudCBvZiBkZWZhdWx0IGlubm9kYi1sb2ctZmls
ZS1zaXplLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lu
bm9kYi1sb2ctZmlsZS1zaXplLnRlc3QKIDQzNDUgVmluYXkgRmlzcmVrYXIJMjAxMi0wOS0yOAog
ICAgICBVc2Ugc21hbGwgdmFsdWVzIGZvciBpbm5vZGJfbG9nX2ZpbGVfc2l6ZSBpbiB0ZXN0LgoK
ICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1sb2ct
ZmlsZS1zaXplLTEucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2Ri
LWxvZy1maWxlLXNpemUtMS50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRl
L2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLTEudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnRlc3QJcmV2aWQ6dmluYXkuZmlz
cmVrYXJAb3JhY2xlLmNvbS0yMDEyMDkyODA3MzQzMi1uaTNtMzNwY2g1MXI5dHU0CisrKyBiL215
c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWxvZy1maWxlLXNpemUtMS50ZXN0CXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI4MTA0NDI4LTU3bHU2ZW00djI1NmpiMjMK
QEAgLTE4LDkgKzE4LDEzIEBACiAjIFZhbGdyaW5kIHdvdWxkIGNvbXBsYWluIGFib3V0IG1lbW9y
eSBsZWFrcyB3aGVuIHdlIGNyYXNoIG9uIHB1cnBvc2UuCiAtLXNvdXJjZSBpbmNsdWRlL25vdF92
YWxncmluZC5pbmMKIAoraWYgKGBTRUxFQ1QgQEBpbm5vZGJfbG9nX2ZpbGVfc2l6ZSA9IDIwOTcx
NTJgKSB7CisgIC0tc2tpcCBUZXN0IHJlcXVpcmVzIGlubm9kYl9sb2dfZmlsZV9zaXplIT0yTS4K
K30KKwogIyByZXN0YXJ0IHdpdGggaW5ub2RiLWZhc3Qtc2h1dGRvd249MiB0byBvbiBzdG9wcGlu
ZyBpdCAsIGJlaGF2ZSBhcyBjcmFzaAogLS1leGVjIGVjaG8gIndhaXQiID4gJE1ZU1FMVEVTVF9W
QVJESVIvdG1wL215c3FsZC4xLmV4cGVjdAotLS1zaHV0ZG93bl9zZXJ2ZXIgCistLXNodXRkb3du
X3NlcnZlcgogLS1zb3VyY2UgaW5jbHVkZS93YWl0X3VudGlsX2Rpc2Nvbm5lY3RlZC5pbmMKICMg
RG8gc29tZXRoaW5nIHdoaWxlIHNlcnZlciBpcyBkb3duCiAtLWVuYWJsZV9yZWNvbm5lY3QKQEAg
LTgzLDEwICs4NywxMCBAQCBTRUxFQ1QgaWQsTEVGVChiZmllbGQsMjApIEZST00gdDE7CiAtLXNv
dXJjZSBpbmNsdWRlL3dhaXRfdW50aWxfY29ubmVjdGVkX2FnYWluLmluYwogCiBsZXQgU0VBUkNI
X0ZJTEU9ICRNWVNRTFRFU1RfVkFSRElSL2xvZy9jYXNlMS5lcnI7Ci1sZXQgU0VBUkNIX1BBVFRF
Uk49IElubm9EQjogU3RhcnRpbmcgYW4gYXBwbHkgYmF0Y2ggb2YgbG9nIHJlY29yZHM7CitsZXQg
U0VBUkNIX1BBVFRFUk49IElubm9EQjogU3RhcnRpbmcgY3Jhc2ggcmVjb3Zlcnk7CiAtLXNvdXJj
ZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCiAKLSMgQ2hlY2sgc2l6ZSBvZiBp
Yl9sb2dmaWxlKiB3aGVuIGlubm9kYl9sb2dfZmlsZXNfaW5fZ3JvdXAgaXMgc2V0IAorIyBDaGVj
ayBzaXplIG9mIGliX2xvZ2ZpbGUqIHdoZW4gaW5ub2RiX2xvZ19maWxlc19pbl9ncm91cCBpcyBz
ZXQKIHBlcmw7CiAgbXkgJGRpciA9ICRFTlZ7J01ZU1FMRF9EQVRBRElSJ307CiAgJGZpbGUgPSAi
aWJfbG9nZmlsZTAiOwpAQCAtMTI4LDcgKzEzMiw3IEBAIERST1AgREFUQUJBU0UgZGJfd2w2NDk0
OwogLS1tb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFICRNWVNRTFRFU1RfVkFSRElSL2xvZy9teXNxbGQu
MS5lcnIub2xkMQogLS1lbmFibGVfcmVjb25uZWN0CiAjIFdyaXRlIGZpbGUgdG8gbWFrZSBteXNx
bC10ZXN0LXJ1bi5wbCBzdGFydCB1cCB0aGUgc2VydmVyIGFnYWluCi0jIHNldCBsb2cgc2l6ZSB0
byAzTQorIyBzZXQgbG9nIHNpemUgdG8gMyozTQogLS1leGVjIGVjaG8gInJlc3RhcnQ6IC0taW5u
b2RiLWZhc3Qtc2h1dGRvd249MiAtLWlubm9kYi1sb2ctZmlsZS1zaXplPTNNIC0taW5ub2RiX2xv
Z19maWxlc19pbl9ncm91cD0zIiA+ICRNWVNRTFRFU1RfVkFSRElSL3RtcC9teXNxbGQuMS5leHBl
Y3QKIC0tc291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9jb25uZWN0ZWRfYWdhaW4uaW5jCiAKQEAg
LTE2NCw3ICsxNjgsNyBAQCBTRUxFQ1QgaWQsTEVGVChiZmllbGQsMjApIEZST00gdDE7CiAjIERv
IHNvbWV0aGluZyB3aGlsZSBzZXJ2ZXIgaXMgZG93bgogLS1lbmFibGVfcmVjb25uZWN0CiAjIFdy
aXRlIGZpbGUgdG8gbWFrZSBteXNxbC10ZXN0LXJ1bi5wbCBzdGFydCB1cCB0aGUgc2VydmVyIGFn
YWluCi0jIHNldCBsb2cgc2l6ZSBmcm9tIDIqM00gdG8gMioyTQorIyBzZXQgbG9nIHNpemUgZnJv
bSAzKjNNIHRvIDIqMk0KIC0tZXhlYyBlY2hvICJyZXN0YXJ0OiAtLWlubm9kYi1sb2ctZmlsZS1z
aXplPTJNIC0taW5ub2RiX2xvZ19maWxlc19pbl9ncm91cD0yICAtLWxvZy1lcnJvcj0kTVlTUUxU
RVNUX1ZBUkRJUi9sb2cvY2FzZTIuZXJyIiA+ICRNWVNRTFRFU1RfVkFSRElSL3RtcC9teXNxbGQu
MS5leHBlY3QKIC0tc291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9jb25uZWN0ZWRfYWdhaW4uaW5j
CiAKQEAgLTE3Myw3ICsxNzcsNyBAQCBTRUxFQ1QgQEBpbm5vZGJfbG9nX2ZpbGVzX2luX2dyb3Vw
OwogCiAKIGxldCBTRUFSQ0hfRklMRT0gJE1ZU1FMVEVTVF9WQVJESVIvbG9nL2Nhc2UyLmVycjsK
LWxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBTdGFydGluZyBhbiBhcHBseSBiYXRjaCBvZiBs
b2cgcmVjb3JkczsKK2xldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBTdGFydGluZyBjcmFzaCBy
ZWNvdmVyeTsKIC0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIAog
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9n
LWZpbGUtc2l6ZS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1s
b2ctZmlsZS1zaXplLnRlc3QJcmV2aWQ6dmluYXkuZmlzcmVrYXJAb3JhY2xlLmNvbS0yMDEyMDky
ODA3MzQzMi1uaTNtMzNwY2g1MXI5dHU0CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Qv
aW5ub2RiLWxvZy1maWxlLXNpemUudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDkyODEwNDQyOC01N2x1NmVtNHYyNTZqYjIzCkBAIC0xMCw2ICsxMCwxMCBAQAogIyBBdm9p
ZCBDcmFzaFJlcG9ydGVyIHBvcHVwIG9uIE1hYwogLS1zb3VyY2UgaW5jbHVkZS9ub3RfY3Jhc2hy
ZXAuaW5jCiAKK2lmIChgU0VMRUNUIEBAaW5ub2RiX2xvZ19maWxlX3NpemUgPSAxMDQ4NTc2YCkg
eworICAtLXNraXAgVGVzdCByZXF1aXJlcyBpbm5vZGJfbG9nX2ZpbGVfc2l6ZT4xTS4KK30KKwog
Y2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJJbm5vREI6IFJlc2l6aW5nIHJlZG8gbG9nIik7CiBj
YWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIklubm9EQjogU3RhcnRpbmcgdG8gZGVsZXRlIGFuZCBy
ZXdyaXRlIGxvZyBmaWxlcyIpOwogY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJJbm5vREI6IE5l
dyBsb2cgZmlsZXMgY3JlYXRlZCIpOwpAQCAtOTksNyArMTAzLDcgQEAgbGV0IFNFQVJDSF9QQVRU
RVJOPSBJbm5vREI6IENhbi50IGluaXRpYQogLS1leGVjICRNWVNRTERfQ01EICRjcmFzaD00CiBs
ZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU3RhcnRpbmcgYW4gYXBwbHkgYmF0Y2ggb2YgbG9n
IHJlY29yZHM7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCi1s
ZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogUmVzaXppbmcgcmVkbyBsb2cgZnJvbSAzKFwqWzAt
OV0rMCkgdG8gMlwxIHBhZ2VzOworbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFJlc2l6aW5n
IHJlZG8gbG9nIGZyb20gM1wqWzAtOV0rIHRvIDJcKlswLTldKyBwYWdlczsKIC0tc291cmNlIGlu
Y2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9G
SUxFCiAtLWVjaG8gLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9NQpAQCAtMTA3LDcgKzEx
MSw3IEBAIGxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBSZXNpemluZyByZWQKIC0tZXhlYyAk
TVlTUUxEX0NNRCAkY3Jhc2g9NQogbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFN0YXJ0aW5n
IGFuIGFwcGx5IGJhdGNoIG9mIGxvZyByZWNvcmRzOwogLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hf
cGF0dGVybl9pbl9maWxlLmluYwotbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFJlc2l6aW5n
IHJlZG8gbG9nIGZyb20gMyhcKlswLTldKzApIHRvIDJcMSBwYWdlczsKK2xldCBTRUFSQ0hfUEFU
VEVSTj0gSW5ub0RCOiBSZXNpemluZyByZWRvIGxvZyBmcm9tIDNcKlswLTldKyB0byAyXCpbMC05
XSsgcGFnZXM7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCiAt
LXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQogCkBAIC0xMjIsNyArMTI2LDcgQEAgbGV0IFNFQVJD
SF9QQVRURVJOPSBJbm5vREI6IENhbi50IGluaXRpYQogLS1leGVjICRNWVNRTERfQ01EICRjcmFz
aD02CiBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU3RhcnRpbmcgYW4gYXBwbHkgYmF0Y2gg
b2YgbG9nIHJlY29yZHM7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUu
aW5jCi1sZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogUmVzaXppbmcgcmVkbyBsb2cgZnJvbSAz
KFwqWzAtOV0rMCkgdG8gMlwxIHBhZ2VzOworbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFJl
c2l6aW5nIHJlZG8gbG9nIGZyb20gM1wqWzAtOV0rIHRvIDJcKlswLTldKyBwYWdlczsKIC0tc291
cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tcmVtb3ZlX2ZpbGUgJFNF
QVJDSF9GSUxFCiAtLWVjaG8gLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9NwpAQCAtMTQw
LDEzICsxNDQsMTMgQEAgbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IENhbm5vdCBjcmVhdAog
LS1lY2hvIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTgKIC0tZXJyb3IgMywxMzcKIC0t
ZXhlYyAkTVlTUUxEX0NNRCAkY3Jhc2g9OAotbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFNl
dHRpbmcgbG9nIGZpbGUgLippYl9sb2dmaWxlWzAtOV0rIHNpemUgdG8gNSBNQjsKK2xldCBTRUFS
Q0hfUEFUVEVSTj0gSW5ub0RCOiBTZXR0aW5nIGxvZyBmaWxlIC4qaWJfbG9nZmlsZVswLTldKyBz
aXplIHRvOwogLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxlLmluYwogLS1y
ZW1vdmVfZmlsZSAkU0VBUkNIX0ZJTEUKIC0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1j
cmFzaD05CiAtLWVycm9yIDMsMTM3CiAtLWV4ZWMgJE1ZU1FMRF9DTUQgJGNyYXNoPTkKLWxldCBT
RUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBTZXR0aW5nIGxvZyBmaWxlIC4qaWJfbG9nZmlsZVswLTld
KyBzaXplIHRvIDUgTUI7CitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU2V0dGluZyBsb2cg
ZmlsZSAuKmliX2xvZ2ZpbGVbMC05XSsgc2l6ZSB0bzsKIC0tc291cmNlIGluY2x1ZGUvc2VhcmNo
X3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCiAKQEAgLTE4
Miw3ICsxODYsNyBAQCBFT0YKIAogLS1lcnJvciAxCiAtLWV4ZWMgJE1ZU1FMRF9DTUQgJGFyZ3MK
LWxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBMb2cgZmlsZSAuKmliX2xvZ2ZpbGUxIGlzIG9m
IGRpZmZlcmVudCBzaXplIDEwNDg1NzYgYnl0ZXMgdGhhbiBvdGhlciBsb2cgZmlsZXMgNTI0Mjg4
MCBieXRlcyE7CitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogTG9nIGZpbGUgLippYl9sb2dm
aWxlMSBpcyBvZiBkaWZmZXJlbnQgc2l6ZSAxMDQ4NTc2IGJ5dGVzIHRoYW4gb3RoZXIgbG9nIGZp
bGVzOwogLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxlLmluYwogLS1yZW1v
dmVfZmlsZSAkU0VBUkNIX0ZJTEUKIC0tcmVtb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL2liX2xv
Z2ZpbGUxCkBAIC0xOTIsNyArMTk2LDcgQEAgbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IExv
ZyBmaWxlIC4qaQogLS1lY2hvIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTEwCiAtLWVy
cm9yIDMsMTM3CiAtLWV4ZWMgJE1ZU1FMRF9DTUQgJGNyYXNoPTEwCi1sZXQgU0VBUkNIX1BBVFRF
Uk49IElubm9EQjogU2V0dGluZyBsb2cgZmlsZSAuKmliX2xvZ2ZpbGVbMC05XSsgc2l6ZSB0byA1
IE1COworbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFNldHRpbmcgbG9nIGZpbGUgLippYl9s
b2dmaWxlWzAtOV0rIHNpemUgdG87CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2lu
X2ZpbGUuaW5jCiBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogUmVuYW1pbmcgbG9nIGZpbGUg
LippYl9sb2dmaWxlMTAxIHRvIC4qaWJfbG9nZmlsZTA7CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJj
aF9wYXR0ZXJuX2luX2ZpbGUuaW5jCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVz
aCBlbWFpbHMpLg==