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

IDQzMzEgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNgogICAgICBXTCM2NDk0OiBDb3ZlciBzb21l
IGVycm9yIGhhbmRsaW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLnRlc3QKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9z
cnYvc3J2MHN0YXJ0LmNjCiA0MzMwIE1hcmtvIE3DpGtlbMOkCTIwMTItMDktMjYKICAgICAgV0wj
NjQ5NCBlcnJvciBoYW5kbGluZy4KICAgICAgCiAgICAgIElzc3VlIGFuIGVycm9yIG1lc3NhZ2Ug
d2hlbiBvbmx5IGliX2xvZ2ZpbGUwIGlzIGZvdW5kLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLnRlc3QKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjCiA0MzI5IE1hcmtvIE3DpGtlbMOkCTIwMTIt
MDktMjYKICAgICAgV0wjNjQ5NDogSW1wcm92ZSBjb2RlIGNvdmVyYWdlIGluIHRoZSB0ZXN0Lgog
ICAgICAKICAgICAgRW5zdXJlIHRoYXQgSW5ub0RCIHJlZnVzZXMgdG8gY3JlYXRlIGxvZyBmaWxl
cyBpbiByZWFkLW9ubHkgbW9kZS4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS50ZXN0CiA0MzI4IE1hcmtvIE3DpGtlbMOk
CTIwMTItMDktMjYKICAgICAgV0wjNjQ5NDogSW1wcm92ZSBjb2RlIGNvdmVyYWdlIGluIHRoZSB0
ZXN0LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9k
Yi1sb2ctZmlsZS1zaXplLnRlc3QKIDQzMjcgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNgogICAg
ICBXTCM2NDk0OiBGaXggYSByZWdyZXNzaW9uIGZyb20gYW4gaW5jb3JyZWN0IGdvdG8tcmVtb3Zh
bAogICAgICAobWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjUyMDA5MTAtYnBrcXBhOXlu
YjVucnhleikuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBz
dGFydC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5v
ZGItbG9nLWZpbGUtc2l6ZS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lu
bm9kYi1sb2ctZmlsZS1zaXplLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MjA5MjYwODA5Mjctdzl3N2lndGViMm9sdzRncQorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYi1sb2ctZmlsZS1zaXplLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMjA5MjYxMDA5NDcteWp6YXUyYXB0Mmx5eWVtcApAQCAtNDUsOSArNDUsMTAgQEAgU0VM
RUNUICogRlJPTSB0MTsKIAogSU5TRVJUIElOVE8gdDEgVkFMVUVTICgxMjMpOwogCi1sZXQgJE1Z
U1FMRF9EQVRBRElSPSBgc2VsZWN0IEBAZGF0YWRpcmA7CitsZXQgTVlTUUxEX0RBVEFESVI9IGBz
ZWxlY3QgQEBkYXRhZGlyYDsKIGxldCBTRUFSQ0hfRklMRT0gJE1ZU1FMVEVTVF9WQVJESVIvbG9n
L215X3Jlc3RhcnQuZXJyOwotbGV0IGNyYXNoPS0tbG9vc2UtY29uc29sZSA+ICRTRUFSQ0hfRklM
RSAyPiYxIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoOworbGV0ICRhcmdzPS0tbG9vc2Ut
Y29uc29sZSA+ICRTRUFSQ0hfRklMRSAyPiYxOworbGV0IGNyYXNoPSRhcmdzIC0taW5ub2RiLWZv
cmNlLXJlY292ZXJ5LWNyYXNoOwogCiBTRVQgREVCVUc9JytkLGNyYXNoX2NvbW1pdF9iZWZvcmUn
OwogIyBXcml0ZSBmaWxlIHRvIG1ha2UgbXlzcWwtdGVzdC1ydW4ucGwgcmVzdGFydCB0aGUgc2Vy
dmVyCkBAIC01NSw4ICs1NiwxNyBAQCBTRVQgREVCVUc9JytkLGNyYXNoX2NvbW1pdF9iZWZvcmUn
OwogLS1lcnJvciAyMDEzCiBERUxFVEUgRlJPTSB0MTsKIAotLS1lcnJvciAwLDEKKy0tZXJyb3Ig
MQorLS1leGVjICRNWVNRTERfQ01EICRhcmdzIC0taW5ub2RiLWxvZy1ncm91cC1ob21lLWRpcj1m
b29cO2JhcgorbGV0IFNFQVJDSF9QQVRURVJOPSBzeW50YXggZXJyb3IgaW4gaW5ub2RiX2xvZ19n
cm91cF9ob21lX2Rpciwgb3IgYSB3cm9uZyBudW1iZXIgb2YgbWlycm9yZWQgbG9nIGdyb3VwczsK
Ky0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tcmVtb3ZlX2Zp
bGUgJFNFQVJDSF9GSUxFCisKKy0tZXJyb3IgMQorLS1leGVjICRNWVNRTERfQ01EICRhcmdzIC0t
aW5ub2RiLW1pcnJvcmVkLWxvZy1ncm91cHM9MgorLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0
dGVybl9pbl9maWxlLmluYworLS1yZW1vdmVfZmlsZSAkU0VBUkNIX0ZJTEUKKwogLS1lY2hvIC0t
aW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTEKIC0tZXJyb3IgMTM3CiAtLWV4ZWMgJE1ZU1FM
RF9DTUQgJGNyYXNoPTEKQEAgLTExMCw2ICsxMjAsMTMgQEAgbGV0IFNFQVJDSF9QQVRURVJOPSBJ
bm5vREI6IFJlc2l6aW5nIHJlZAogIyB0aGlzIGNyYXNoZXMgcmlnaHQgYWZ0ZXIgZGVsZXRpbmcg
YWxsIGxvZyBmaWxlcwogLS1saXN0X2ZpbGVzICRNWVNRTERfREFUQURJUgogLS1yZW1vdmVfZmls
ZSAkU0VBUkNIX0ZJTEUKKworLS1lcnJvciAxCistLWV4ZWMgJE1ZU1FMRF9DTUQgJGFyZ3MgLS1p
bm5vZGItcmVhZC1vbmx5CitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogQ2Fubm90IGNyZWF0
ZSBsb2cgZmlsZXMgaW4gcmVhZC1vbmx5IG1vZGU7CistLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9w
YXR0ZXJuX2luX2ZpbGUuaW5jCistLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQorCiAtLWVjaG8g
LS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9OAogLS1lcnJvciAxMzcKIC0tZXhlYyAkTVlT
UUxEX0NNRCAkY3Jhc2g9OApAQCAtMTI0LDYgKzE0MSw0NiBAQCBsZXQgU0VBUkNIX1BBVFRFUk49
IElubm9EQjogU2V0dGluZyBsb2cKIC0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5f
ZmlsZS5pbmMKIC0tbGlzdF9maWxlcyAkTVlTUUxEX0RBVEFESVIKIC0tcmVtb3ZlX2ZpbGUgJFNF
QVJDSF9GSUxFCisKKyMgV2Ugc2hvdWxkIGhhdmUgcGVyZmVjdGx5IHN5bmNlZCBmaWxlcyBoZXJl
LgorIyBSZW5hbWUgdGhlIGxvZyBmaWxlcywgYW5kIHRyaWdnZXIgYW4gZXJyb3IgaW4gcmVjb3Zl
cnkuCistLW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTEwMSAkTVlTUUxEX0RB
VEFESVIvaWJfbG9nZmlsZTAKKy0tbW92ZV9maWxlICRNWVNRTERfREFUQURJUi9pYl9sb2dmaWxl
MSAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTFfaGlkZGVuCistLWVycm9yIDEKKy0tZXhlYyAk
TVlTUUxEX0NNRCAkYXJncworbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IE9ubHkgb25lIGxv
ZyBmaWxlIGZvdW5kOworLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxlLmlu
YworLS1yZW1vdmVfZmlsZSAkU0VBUkNIX0ZJTEUKKy0tbW92ZV9maWxlICRNWVNRTERfREFUQURJ
Ui9pYl9sb2dmaWxlMCAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTEwMQorCitwZXJsOworZGll
IHVubGVzcyBvcGVuKEZJTEUsICI+JEVOVntNWVNRTERfREFUQURJUn0vaWJfbG9nZmlsZTAiKTsK
K3ByaW50IEZJTEUgImdhcmJhZ2UiOworY2xvc2UoRklMRSk7CitFT0YKKy0tZXJyb3IgMQorLS1l
eGVjICRNWVNRTERfQ01EICRhcmdzCitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogTG9nIGZp
bGUgLippYl9sb2dmaWxlMCBzaXplIDcgaXMgbm90IGEgbXVsdGlwbGUgb2YgaW5ub2RiX3BhZ2Vf
c2l6ZTsKKy0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKKy0tcmVt
b3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCistLXJlbW92ZV9maWxlICRNWVNRTERfREFUQURJUi9pYl9s
b2dmaWxlMAorLS1tb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxMDEgJE1ZU1FM
RF9EQVRBRElSL2liX2xvZ2ZpbGUwCisKK3Blcmw7CitkaWUgdW5sZXNzIG9wZW4oRklMRSwgIj4k
RU5We01ZU1FMRF9EQVRBRElSfS9pYl9sb2dmaWxlMSIpOworcHJpbnQgRklMRSAiZ2FyYmFnZVxu
IiB4IDEzMTA3MjsKK2Nsb3NlKEZJTEUpOworRU9GCisKKy0tZXJyb3IgMQorLS1leGVjICRNWVNR
TERfQ01EICRhcmdzCitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogTG9nIGZpbGUgLippYl9s
b2dmaWxlMSBpcyBvZiBkaWZmZXJlbnQgc2l6ZSAxMDQ4NTc2IGJ5dGVzIHRoYW4gb3RoZXIgbG9n
IGZpbGVzIDUyNDI4ODAgYnl0ZXMhOworLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9p
bl9maWxlLmluYworLS1yZW1vdmVfZmlsZSAkU0VBUkNIX0ZJTEUKKy0tcmVtb3ZlX2ZpbGUgJE1Z
U1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxCistLW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvaWJf
bG9nZmlsZTAgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxMDEKKy0tbW92ZV9maWxlICRNWVNR
TERfREFUQURJUi9pYl9sb2dmaWxlMV9oaWRkZW4gJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUx
CisKIC0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaD0xMAogLS1lcnJvciAxMzcK
IC0tZXhlYyAkTVlTUUxEX0NNRCAkY3Jhc2g9MTAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny
djBzdGFydC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNjA4MDkyNy13
OXc3aWd0ZWIyb2x3NGdxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNjEwMDk0Ny15anphdTJhcHQybHl5
ZW1wCkBAIC0yMDU3LDYgKzIwNTcsOCBAQCBpbm5vYmFzZV9zdGFydF9vcl9jcmVhdGVfZm9yX215
c3FsKHZvaWQpCiAJCQkJCWdvdG8gZmlsZXNfY2hlY2tlZDsKIAkJCQl9IGVsc2UgaWYgKGkgPCAy
KSB7CiAJCQkJCS8qIG11c3QgaGF2ZSBhdCBsZWFzdCAyIGxvZyBmaWxlcyAqLworCQkJCQlpYl9s
b2dmKElCX0xPR19MRVZFTF9FUlJPUiwKKwkJCQkJCSJPbmx5IG9uZSBsb2cgZmlsZSBmb3VuZC4i
KTsKIAkJCQkJcmV0dXJuKGVycik7CiAJCQkJfQogCkBAIC0yMDc4LDcgKzIwODAsNyBAQCBpbm5v
YmFzZV9zdGFydF9vcl9jcmVhdGVfZm9yX215c3FsKHZvaWQpCiAKIAkJCWlmIChzaXplICYgKCgx
IDw8IFVOSVZfUEFHRV9TSVpFX1NISUZUKSAtIDEpKSB7CiAJCQkJaWJfbG9nZihJQl9MT0dfTEVW
RUxfRVJST1IsCi0JCQkJCSJJbm5vREI6IEVycm9yOiBsb2cgZmlsZSAlcyBzaXplICIKKwkJCQkJ
IkxvZyBmaWxlICVzIHNpemUgIgogCQkJCQlVSU5UNjRQRiAiIGlzIG5vdCBhIG11bHRpcGxlIG9m
IgogCQkJCQkiIGlubm9kYl9wYWdlX3NpemVcbiIsCiAJCQkJCWxvZ2ZpbGVuYW1lLCBzaXplKTsK
QEAgLTIwOTMsNyArMjA5NSw3IEBAIGlubm9iYXNlX3N0YXJ0X29yX2NyZWF0ZV9mb3JfbXlzcWwo
dm9pZCkKIAkJCQlpYl9sb2dmKElCX0xPR19MRVZFTF9FUlJPUiwKIAkJCQkJIkxvZyBmaWxlICVz
IGlzIgogCQkJCQkiIG9mIGRpZmZlcmVudCBzaXplICJVSU5UNjRQRiIgYnl0ZXMiCi0JCQkJCSIg
dGhhbiBvdGhlciBsb2cgIgorCQkJCQkiIHRoYW4gb3RoZXIgbG9nIgogCQkJCQkiIGZpbGVzICJV
SU5UNjRQRiIgYnl0ZXMhXG4iLAogCQkJCQlsb2dmaWxlbmFtZSwKIAkJCQkJc2l6ZSA8PCBVTklW
X1BBR0VfU0laRV9TSElGVCwKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt
YWlscyku