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

IDQzMzUgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNgogICAgICBXTCM2NDk0OiBFbmFibGUgYSB0
ZXN0LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9k
Yi1sb2ctZmlsZS1zaXplLTEudGVzdAogNDMzNCBNYXJrbyBNw6RrZWzDpAkyMDEyLTA5LTI2CiAg
ICAgIFdMIzY0OTQ6IFJlZnVzZSB0byByZXNpemUgbG9ncyBpbiByZWFkLW9ubHkgbW9kZS4KCiAg
ICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9nLWZp
bGUtc2l6ZS0xLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1s
b2ctZmlsZS1zaXplLTEudGVzdAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQu
Y2MKIDQzMzMgVmluYXkgRmlzcmVrYXIJMjAxMi0wOS0yNwogICAgICBBZGQgdGVzdCAobm9uIGRl
cGVuZGVudCBvbiBkZWJ1ZyBidWlsZCkgdG8gaGFuZGxlIHJlZG8gbG9nIHNpemUgbWlzbWF0Y2gg
CiAgICAgICh0b29rIG5lZ2F0aXZlIGNhc2VzIGZyb20gaW5ub2RiLWxvZy1maWxlLXNpemUgd2hp
Y2ggb25seSBydW5zIGZvciBkZWJ1ZyBidWlsZCkKCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnJlc3VsdAogICAgICBteXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLTEudGVzdAo9PT0gbW9k
aWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9nLWZpbGUtc2l6
ZS0xLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9nLWZp
bGUtc2l6ZS0xLnJlc3VsdAlyZXZpZDp2aW5heS5maXNyZWthckBvcmFjbGUuY29tLTIwMTIwOTI2
MTkzNzAzLXUwdmIzdWdxNmwwNmFtajUKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9p
bm5vZGItbG9nLWZpbGUtc2l6ZS0xLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEyMDkyNjIwMzgyMi1ubWxtYjc3OTBxZ3RoN2ozCkBAIC0xMzUsNiArMTM1LDcgQEAgaWQJ
TEVGVChiZmllbGQsMjApCiAyMwljY2NjY2NjY2NjY2NjY2NjY2NjYwogInRlc3QgbWlzYyAxIgog
InRlc3QgbWlzYyAyIgorInRlc3QgbWlzYyAzIgogInRlc3QgbWlzYyA0IgogInRlc3QgbWlzYyA1
IgogInRlc3QgbWlzYyA2IgoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiLWxvZy1maWxlLXNpemUtMS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRl
L2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLTEudGVzdAlyZXZpZDp2aW5heS5maXNyZWth
ckBvcmFjbGUuY29tLTIwMTIwOTI2MTkzNzAzLXUwdmIzdWdxNmwwNmFtajUKKysrIGIvbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnRlc3QJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjYyMDM4MjItbm1sbWI3NzkwcWd0aDdqMwpAQCAt
MTgzLDI4ICsxODMsMjUgQEAgbGV0IFNFQVJDSF9QQVRURVJOPSBzeW50YXggZXJyb3IgaW4gaW5u
bwogLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxlLmluYwogLS1yZW1vdmVf
ZmlsZSAkU0VBUkNIX0ZJTEUKIAotIy0tZWNobyAidGVzdCBtaXNjIDMiCi0jLS1lcnJvciAxCi0j
LS1leGVjICRNWVNRTERfQ01EICRhcmdzIC0taW5ub2RiLXJlYWQtb25seQotI2xldCBTRUFSQ0hf
UEFUVEVSTj0gSW5ub0RCOiBSZWNvdmVyeSBza2lwcGVkLCAtLWlubm9kYi1yZWFkLW9ubHkgc2V0
ITsKLSMtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCi0jbGV0IFNF
QVJDSF9QQVRURVJOPSBJbm5vREI6IENhbi50IGluaXRpYXRlIGRhdGFiYXNlIHJlY292ZXJ5LCBy
dW5uaW5nIGluIHJlYWQtb25seS1tb2RlOwotIy0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRl
cm5faW5fZmlsZS5pbmMKLSMtLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQotCistLWVjaG8gInRl
c3QgbWlzYyAzIgorLS1lcnJvciAxCistLWV4ZWMgJE1ZU1FMRF9DTUQgJGFyZ3MgLS1pbm5vZGIt
cmVhZC1vbmx5CitsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogQ2Fubm90IHJlc2l6ZSBsb2cg
ZmlsZXMgaW4gcmVhZC1vbmx5IG1vZGU7CistLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJu
X2luX2ZpbGUuaW5jCistLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQogCiAtLWVjaG8gInRlc3Qg
bWlzYyA0IgogIyBXZSBzaG91bGQgaGF2ZSBwZXJmZWN0bHkgc3luY2VkIGZpbGVzIGhlcmUuCiAj
IFJlbmFtZSB0aGUgbG9nIGZpbGVzLCBhbmQgdHJpZ2dlciBhbiBlcnJvciBpbiByZWNvdmVyeS4K
LSMjLS1tb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxMDEgJE1ZU1FMRF9EQVRB
RElSL2liX2xvZ2ZpbGUwCi0jLS1tb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUx
ICRNWVNRTERfREFUQURJUi9pYl9sb2dmaWxlMV9oaWRkZW4KLSMtLWVycm9yIDEKLSMtLWV4ZWMg
JE1ZU1FMRF9DTUQgJGFyZ3MKLSNsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogT25seSBvbmUg
bG9nIGZpbGUgZm91bmQ7Ci0jLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxl
LmluYwotIy0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCi0jIy0tbW92ZV9maWxlICRNWVNRTERf
REFUQURJUi9pYl9sb2dmaWxlMCAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTEwMQotIy0tbW92
ZV9maWxlICRNWVNRTERfREFUQURJUi9pYl9sb2dmaWxlMV9oaWRkZW4gJE1ZU1FMRF9EQVRBRElS
L2liX2xvZ2ZpbGUxCisjLS1tb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxMDEg
JE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUwCistLW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIv
aWJfbG9nZmlsZTEgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxX2hpZGRlbgorLS1lcnJvciAx
CistLWV4ZWMgJE1ZU1FMRF9DTUQgJGFyZ3MKK2xldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBP
bmx5IG9uZSBsb2cgZmlsZSBmb3VuZDsKKy0tc291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5f
aW5fZmlsZS5pbmMKKy0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCisjLS1tb3ZlX2ZpbGUgJE1Z
U1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUwICRNWVNRTERfREFUQURJUi9pYl9sb2dmaWxlMTAxCist
LW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTFfaGlkZGVuICRNWVNRTERfREFU
QURJUi9pYl9sb2dmaWxlMQogCiAtLWVjaG8gInRlc3QgbWlzYyA1IgogIyBtYWtlIGNvcHkgb2Yg
aWJfbG9nZmlsZTAgYmVmb3JlIGVkaXRpbmcKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBz
dGFydC5jYwlyZXZpZDp2aW5heS5maXNyZWthckBvcmFjbGUuY29tLTIwMTIwOTI2MTkzNzAzLXUw
dmIzdWdxNmwwNmFtajUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI2MjAzODIyLW5tbG1iNzc5MHFndGg3
ajMKQEAgLTIzNDMsNiArMjM0MywxMyBAQCBmaWxlc19jaGVja2VkOgogCQkJfHwgc3J2X25fbG9n
X2ZpbGVzX2ZvdW5kICE9IHNydl9uX2xvZ19maWxlcykpIHsKIAkJCS8qIFByZXBhcmUgdG8gcmVw
bGFjZSB0aGUgcmVkbyBsb2cgZmlsZXMuICovCiAKKwkJCWlmIChzcnZfcmVhZF9vbmx5X21vZGUp
IHsKKwkJCQlpYl9sb2dmKElCX0xPR19MRVZFTF9FUlJPUiwKKwkJCQkJIkNhbm5vdCByZXNpemUg
bG9nIGZpbGVzICIKKwkJCQkJImluIHJlYWQtb25seSBtb2RlLiIpOworCQkJCXJldHVybihEQl9S
RUFEX09OTFkpOworCQkJfQorCiAJCQkvKiBDbGVhbiB0aGUgYnVmZmVyIHBvb2wuICovCiAJCQli
b29sIHN1Y2Nlc3MgPSBidWZfZmx1c2hfbGlzdCgKIAkJCQlVTElOVF9NQVgsIExTTl9NQVgsIE5V
TEwpOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=