From: marko.makela
Date: September 24 2012 2:09pm
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4310 to 4312) WL#6494
List-Archive: http://lists.mysql.com/commits/144893
Message-Id: <20120924140949.13057.57367.4312@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzMTIgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNAogICAgICBXTCM2NDk0IGNyYXNoIGluamVj
dGlvbiB0ZXN0aW5nLgogICAgICAKICAgICAgVGVzdCByZWNvdmVyeSBvZiBhIGRpcnR5IGRhdGFi
YXNlIHdpdGggYWxsIHZhbHVlcyBvZgogICAgICAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFz
aC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGIt
bG9nLWZpbGUtc2l6ZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5v
ZGItbG9nLWZpbGUtc2l6ZS50ZXN0CiA0MzExIE1hcmtvIE3DpGtlbMOkCTIwMTItMDktMjQKICAg
ICAgUmVtb3ZlIGFuIGV4dHJhIElubm9EQjogcHJlZml4LgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwcmVjdi5jYwogNDMxMCBNYXJrbyBNw6RrZWzDpAkyMDEy
LTA5LTI0CiAgICAgIFdMIzY0OTQ6IEFkZCBhIGJhc2ljIHRlc3QsIG5vdCBjcmFzaGluZyBkdXJp
bmcgdGhlIGxvZyBzd2l0Y2guCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiLWxvZy1maWxlLXNpemUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiLWxvZy1maWxlLXNpemUudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9nLWZpbGUtc2l6ZS5yZXN1bHQnCi0tLSBh
L215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWxvZy1maWxlLXNpemUucmVzdWx0CXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI0MTMxMzA3LW01NnMxcDUyejlzMjI3
eWwKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9nLWZpbGUtc2l6ZS5y
ZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjQxNDA4MzktNDcyMXBi
ZzNjOTI4MGNxZgpAQCAtMSw2ICsxLDcgQEAKIGNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiSW5u
b0RCOiBSZXNpemluZyByZWRvIGxvZyIpOwogY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJJbm5v
REI6IFN0YXJ0aW5nIHRvIGRlbGV0ZSBhbmQgcmV3cml0ZSBsb2cgZmlsZXMiKTsKIGNhbGwgbXRy
LmFkZF9zdXBwcmVzc2lvbigiSW5ub0RCOiBOZXcgbG9nIGZpbGVzIGNyZWF0ZWQiKTsKK2NhbGwg
bXRyLmFkZF9zdXBwcmVzc2lvbigiSW5ub0RCOiBUaGUgbG9nIHNlcXVlbmNlIG51bWJlcnMgWzAt
OV0rIGFuZCBbMC05XSsgaW4gaWJkYXRhIGZpbGVzIGRvIG5vdCBtYXRjaCB0aGUgbG9nIHNlcXVl
bmNlIG51bWJlciBbMC05XSsgaW4gdGhlIGliX2xvZ2ZpbGVzIik7CiBDUkVBVEUgVEFCTEUgdDEo
YSBJTlQgUFJJTUFSWSBLRVkpIEVOR0lORT1Jbm5vREI7CiBTRVQgREVCVUc9JytkLGNyYXNoX2Nv
bW1pdF9iZWZvcmUnOwogSU5TRVJUIElOVE8gdDEgVkFMVUVTICg0Mik7CkBAIC0xNCw0ICsxNSwx
MTUgQEAgRVJST1IgSFkwMDA6IExvc3QgY29ubmVjdGlvbiB0byBNeVNRTCBzZQogU0VMRUNUICog
RlJPTSB0MTsKIGEKIDQyCitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDEyMyk7CitTRVQgREVCVUc9
JytkLGNyYXNoX2NvbW1pdF9iZWZvcmUnOworREVMRVRFIEZST00gdDE7CitFUlJPUiBIWTAwMDog
TG9zdCBjb25uZWN0aW9uIHRvIE15U1FMIHNlcnZlciBkdXJpbmcgcXVlcnkKKy0taW5ub2RiLWZv
cmNlLXJlY292ZXJ5LWNyYXNoPTEKK2F1dG8uY25mCitpYl9sb2dmaWxlMAoraWJfbG9nZmlsZTEK
K2liX2xvZ2ZpbGUyCitpYmRhdGExCittYXN0ZXItYmluLmluZGV4CittdHIKK215c3FsCitwZXJm
b3JtYW5jZV9zY2hlbWEKK3Rlc3QKKy0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTIKK2F1
dG8uY25mCitpYl9sb2dmaWxlMAoraWJfbG9nZmlsZTEKK2liX2xvZ2ZpbGUyCitpYmRhdGExCitt
YXN0ZXItYmluLmluZGV4CittdHIKK215c3FsCitwZXJmb3JtYW5jZV9zY2hlbWEKK3Rlc3QKKy0t
aW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTMKK2F1dG8uY25mCitpYl9sb2dmaWxlMAoraWJf
bG9nZmlsZTEKK2liX2xvZ2ZpbGUyCitpYmRhdGExCittYXN0ZXItYmluLmluZGV4CittdHIKK215
c3FsCitwZXJmb3JtYW5jZV9zY2hlbWEKK3Rlc3QKKy0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNy
YXNoPTQKK2F1dG8uY25mCitpYl9sb2dmaWxlMAoraWJfbG9nZmlsZTEKK2liX2xvZ2ZpbGUyCitp
YmRhdGExCittYXN0ZXItYmluLmluZGV4CittdHIKK215c3FsCitwZXJmb3JtYW5jZV9zY2hlbWEK
K3Rlc3QKKy0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTUKK2F1dG8uY25mCitpYl9sb2dm
aWxlMAoraWJfbG9nZmlsZTEKK2liX2xvZ2ZpbGUyCitpYmRhdGExCittYXN0ZXItYmluLmluZGV4
CittdHIKK215c3FsCitwZXJmb3JtYW5jZV9zY2hlbWEKK3Rlc3QKKy0taW5ub2RiLWZvcmNlLXJl
Y292ZXJ5LWNyYXNoPTYKK2F1dG8uY25mCitpYl9sb2dmaWxlMQoraWJfbG9nZmlsZTIKK2liZGF0
YTEKK21hc3Rlci1iaW4uaW5kZXgKK210cgorbXlzcWwKK3BlcmZvcm1hbmNlX3NjaGVtYQordGVz
dAorLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9NworYXV0by5jbmYKK2liZGF0YTEKK21h
c3Rlci1iaW4uaW5kZXgKK210cgorbXlzcWwKK3BlcmZvcm1hbmNlX3NjaGVtYQordGVzdAorLS1p
bm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9OAorYXV0by5jbmYKK2liX2xvZ2ZpbGUxCitpYl9s
b2dmaWxlMTAxCitpYmRhdGExCittYXN0ZXItYmluLmluZGV4CittdHIKK215c3FsCitwZXJmb3Jt
YW5jZV9zY2hlbWEKK3Rlc3QKKy0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTkKK2F1dG8u
Y25mCitpYl9sb2dmaWxlMQoraWJfbG9nZmlsZTEwMQoraWJkYXRhMQorbWFzdGVyLWJpbi5pbmRl
eAorbXRyCitteXNxbAorcGVyZm9ybWFuY2Vfc2NoZW1hCit0ZXN0CistLWlubm9kYi1mb3JjZS1y
ZWNvdmVyeS1jcmFzaD0xMAorYXV0by5jbmYKK2liX2xvZ2ZpbGUwCitpYl9sb2dmaWxlMQoraWJk
YXRhMQorbWFzdGVyLWJpbi5pbmRleAorbXRyCitteXNxbAorcGVyZm9ybWFuY2Vfc2NoZW1hCit0
ZXN0CitTRUxFQ1QgKiBGUk9NIHQxOworYQorNDIKKzEyMwogRFJPUCBUQUJMRSB0MTsKCj09PSBt
b2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1z
aXplLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWxvZy1maWxl
LXNpemUudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNDEzMTMwNy1t
NTZzMXA1Mno5czIyN3lsCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWxv
Zy1maWxlLXNpemUudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNDE0
MDgzOS00NzIxcGJnM2M5MjgwY3FmCkBAIC0xMyw2ICsxMyw3IEBACiBjYWxsIG10ci5hZGRfc3Vw
cHJlc3Npb24oIklubm9EQjogUmVzaXppbmcgcmVkbyBsb2ciKTsKIGNhbGwgbXRyLmFkZF9zdXBw
cmVzc2lvbigiSW5ub0RCOiBTdGFydGluZyB0byBkZWxldGUgYW5kIHJld3JpdGUgbG9nIGZpbGVz
Iik7CiBjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIklubm9EQjogTmV3IGxvZyBmaWxlcyBjcmVh
dGVkIik7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIklubm9EQjogVGhlIGxvZyBzZXF1ZW5j
ZSBudW1iZXJzIFswLTldKyBhbmQgWzAtOV0rIGluIGliZGF0YSBmaWxlcyBkbyBub3QgbWF0Y2gg
dGhlIGxvZyBzZXF1ZW5jZSBudW1iZXIgWzAtOV0rIGluIHRoZSBpYl9sb2dmaWxlcyIpOwogCiBD
UkVBVEUgVEFCTEUgdDEoYSBJTlQgUFJJTUFSWSBLRVkpIEVOR0lORT1Jbm5vREI7CiAKQEAgLTQy
LDYgKzQzLDYyIEBAIERFTEVURSBGUk9NIHQxOwogCiBTRUxFQ1QgKiBGUk9NIHQxOwogCi0jIFRP
RE86IFRlc3Qgd2l0aCAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaAorSU5TRVJUIElOVE8g
dDEgVkFMVUVTICgxMjMpOwogCitsZXQgJE1ZU1FMRF9EQVRBRElSPSBgc2VsZWN0IEBAZGF0YWRp
cmA7CisKK1NFVCBERUJVRz0nK2QsY3Jhc2hfY29tbWl0X2JlZm9yZSc7CisjIFdyaXRlIGZpbGUg
dG8gbWFrZSBteXNxbC10ZXN0LXJ1bi5wbCByZXN0YXJ0IHRoZSBzZXJ2ZXIKKy0tZXhlYyBlY2hv
ICJ3YWl0IiA+ICRNWVNRTFRFU1RfVkFSRElSL3RtcC9teXNxbGQuMS5leHBlY3QKKy0tZXJyb3Ig
MjAxMworREVMRVRFIEZST00gdDE7CisKKy0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1j
cmFzaD0xCistLWVycm9yIDEzNworLS1leGVjICRNWVNRTERfQ01EIC0tbG9vc2UtY29uc29sZSAt
LWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaD0xCistLWxpc3RfZmlsZXMgJE1ZU1FMRF9EQVRB
RElSCistLWVjaG8gLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9MgorLS1lcnJvciAxMzcK
Ky0tZXhlYyAkTVlTUUxEX0NNRCAtLWxvb3NlLWNvbnNvbGUgLS1pbm5vZGItZm9yY2UtcmVjb3Zl
cnktY3Jhc2g9MgorLS1saXN0X2ZpbGVzICRNWVNRTERfREFUQURJUgorLS1lY2hvIC0taW5ub2Ri
LWZvcmNlLXJlY292ZXJ5LWNyYXNoPTMKKy0tZXJyb3IgMTM3CistLWV4ZWMgJE1ZU1FMRF9DTUQg
LS1sb29zZS1jb25zb2xlIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTMKKy0tbGlzdF9m
aWxlcyAkTVlTUUxEX0RBVEFESVIKKy0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFz
aD00CistLWVycm9yIDEzNworLS1leGVjICRNWVNRTERfQ01EIC0tbG9vc2UtY29uc29sZSAtLWlu
bm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaD00CistLWxpc3RfZmlsZXMgJE1ZU1FMRF9EQVRBRElS
CistLWVjaG8gLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9NQorLS1lcnJvciAxMzcKKy0t
ZXhlYyAkTVlTUUxEX0NNRCAtLWxvb3NlLWNvbnNvbGUgLS1pbm5vZGItZm9yY2UtcmVjb3Zlcnkt
Y3Jhc2g9NQorLS1saXN0X2ZpbGVzICRNWVNRTERfREFUQURJUgorLS1lY2hvIC0taW5ub2RiLWZv
cmNlLXJlY292ZXJ5LWNyYXNoPTYKKy0tZXJyb3IgMTM3CistLWV4ZWMgJE1ZU1FMRF9DTUQgLS1s
b29zZS1jb25zb2xlIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTYKKy0tbGlzdF9maWxl
cyAkTVlTUUxEX0RBVEFESVIKKy0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaD03
CistLWVycm9yIDEzNworLS1leGVjICRNWVNRTERfQ01EIC0tbG9vc2UtY29uc29sZSAtLWlubm9k
Yi1mb3JjZS1yZWNvdmVyeS1jcmFzaD03CistLWxpc3RfZmlsZXMgJE1ZU1FMRF9EQVRBRElSCist
LWVjaG8gLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9OAorLS1lcnJvciAxMzcKKy0tZXhl
YyAkTVlTUUxEX0NNRCAtLWxvb3NlLWNvbnNvbGUgLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jh
c2g9OAorLS1saXN0X2ZpbGVzICRNWVNRTERfREFUQURJUgorLS1lY2hvIC0taW5ub2RiLWZvcmNl
LXJlY292ZXJ5LWNyYXNoPTkKKy0tZXJyb3IgMTM3CistLWV4ZWMgJE1ZU1FMRF9DTUQgLS1sb29z
ZS1jb25zb2xlIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTkKKy0tbGlzdF9maWxlcyAk
TVlTUUxEX0RBVEFESVIKKy0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaD0xMAor
LS1lcnJvciAxMzcKKy0tZXhlYyAkTVlTUUxEX0NNRCAtLWxvb3NlLWNvbnNvbGUgLS1pbm5vZGIt
Zm9yY2UtcmVjb3ZlcnktY3Jhc2g9MTAKKy0tbGlzdF9maWxlcyAkTVlTUUxEX0RBVEFESVIKKwor
LS1leGVjIGVjaG8gInJlc3RhcnQiID4gJE1ZU1FMVEVTVF9WQVJESVIvdG1wL215c3FsZC4xLmV4
cGVjdAorCistLWVuYWJsZV9yZWNvbm5lY3QKKy0tc291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9j
b25uZWN0ZWRfYWdhaW4uaW5jCistLWRpc2FibGVfcmVjb25uZWN0CisKK1NFTEVDVCAqIEZST00g
dDE7CiBEUk9QIFRBQkxFIHQxOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
bG9nL2xvZzByZWN2LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwcmVjdi5jYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNDEzMTMwNy1tNTZzMXA1Mno5czIy
N3lsCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzByZWN2LmNjCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTIwOTI0MTQwODM5LTQ3MjFwYmczYzkyODBjcWYKQEAgLTMxMzYs
NyArMzEzNiw3IEBAIHJlY3ZfcmVjb3ZlcnlfZnJvbV9jaGVja3BvaW50X3N0YXJ0X2Z1bmMKIAog
CQkJaWYgKCFyZWN2X25lZWRlZF9yZWNvdmVyeSkgewogCQkJCWliX2xvZ2YoSUJfTE9HX0xFVkVM
X1dBUk4sCi0JCQkJCSJJbm5vREI6IFRoZSBsb2cgc2VxdWVuY2UgbnVtYmVycyAiCisJCQkJCSJU
aGUgbG9nIHNlcXVlbmNlIG51bWJlcnMgIgogCQkJCQlMU05fUEYgIiBhbmQgIiBMU05fUEYKIAkJ
CQkJIiBpbiBpYmRhdGEgZmlsZXMgZG8gbm90IG1hdGNoIgogCQkJCQkiIHRoZSBsb2cgc2VxdWVu
Y2UgbnVtYmVyICIKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku