From: marko.makela
Date: October 1 2012 7:38am
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4347 to 4348) WL#6494
List-Archive: http://lists.mysql.com/commits/144939
Message-Id: <20121001073815.27725.84363.4348@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzNDggTWFya28gTcOka2Vsw6QJMjAxMi0xMC0wMQogICAgICBXTCM2NDk0IFNvbGFyaXMgREJV
R19TVUlDSURFIGZpeC4KICAgICAgCiAgICAgIE9uIFNvbGFyaXMsIERCVUdfU1VJQ0lERSByZXR1
cm5zIDAgaW5zdGVhZCBvZiAxMjgrU0lHS0lMTC4KICAgICAgUkVDT1ZFUllfQ1JBU0goKTogVXNl
IGV4aXQoMykgaW5zdGVhZCBvZiBEQlVHX1NVSUNJREUuCiAgICAgIChUaGUgV2luZG93cyB2ZXJz
aW9uIG9mIERCVUdfU1VJQ0lERSBkb2VzIGV4aXQoMykuKQoKICAgIG1vZGlmaWVkOgogICAgICBt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLnRlc3QKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjCiA0MzQ3IE1hcmtvIE3DpGtlbMOkCTIw
MTItMDktMjgKICAgICAgV0wjNjQ5NCB0ZXN0IGNhc2UgZml4OiBTdXBwcmVzcyBnY292IGZhaWx1
cmUsIHNraXAgdGVzdCB3aXRoIDJNIGxvZyBzaXplLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLTEudGVzdAo9PT0gbW9k
aWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6
ZS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1z
aXplLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjgxMDQ0MjgtNTds
dTZlbTR2MjU2amIyMworKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ct
ZmlsZS1zaXplLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjEwMDEwNzM0
NTAtaHBmazZuMXRjNm01d2UxdwpAQCAtNzMsMTggKzczLDE4IEBAIGxldCBTRUFSQ0hfUEFUVEVS
Tj0gc3ludGF4IGVycm9yIGluIGlubm8KIAogIyBPbiBXaW5kb3dzLCBEQlVHX1NVSUNJREUoKSBk
b2VzIGV4aXQoMykgaW5zdGVhZCBvZiBTSUdLSUxMICgxMjgrOSkuCiAtLWVjaG8gLS1pbm5vZGIt
Zm9yY2UtcmVjb3ZlcnktY3Jhc2g9MQotLS1lcnJvciAzLDEzNworLS1lcnJvciAzCiAtLWV4ZWMg
JE1ZU1FMRF9DTUQgJGNyYXNoPTEKIGxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBTdGFydGlu
ZyBhbiBhcHBseSBiYXRjaCBvZiBsb2cgcmVjb3JkczsKIC0tc291cmNlIGluY2x1ZGUvc2VhcmNo
X3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCiAtLWVjaG8g
LS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9MgotLS1lcnJvciAzLDEzNworLS1lcnJvciAz
CiAtLWV4ZWMgJE1ZU1FMRF9DTUQgJGNyYXNoPTIKIGxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RC
OiBTdGFydGluZyBhbiBhcHBseSBiYXRjaCBvZiBsb2cgcmVjb3JkczsKIC0tc291cmNlIGluY2x1
ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKIC0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNv
dmVyeS1jcmFzaD0zCi0tLWVycm9yIDMsMTM3CistLWVycm9yIDMKIC0tZXhlYyAkTVlTUUxEX0NN
RCAkY3Jhc2g9MwogbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFN0YXJ0aW5nIGFuIGFwcGx5
IGJhdGNoIG9mIGxvZyByZWNvcmRzOwogLS1zb3VyY2UgaW5jbHVkZS9zZWFyY2hfcGF0dGVybl9p
bl9maWxlLmluYwpAQCAtOTksNyArOTksNyBAQCBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjog
Q2FuLnQgaW5pdGlhCiAtLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQogCiAtLWVjaG8gLS1pbm5v
ZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9NAotLS1lcnJvciAzLDEzNworLS1lcnJvciAzCiAtLWV4
ZWMgJE1ZU1FMRF9DTUQgJGNyYXNoPTQKIGxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBTdGFy
dGluZyBhbiBhcHBseSBiYXRjaCBvZiBsb2cgcmVjb3JkczsKIC0tc291cmNlIGluY2x1ZGUvc2Vh
cmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKQEAgLTEwNyw3ICsxMDcsNyBAQCBsZXQgU0VBUkNIX1BB
VFRFUk49IElubm9EQjogUmVzaXppbmcgcmVkCiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0
ZXJuX2luX2ZpbGUuaW5jCiAtLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQogLS1lY2hvIC0taW5u
b2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTUKLS0tZXJyb3IgMywxMzcKKy0tZXJyb3IgMwogLS1l
eGVjICRNWVNRTERfQ01EICRjcmFzaD01CiBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogU3Rh
cnRpbmcgYW4gYXBwbHkgYmF0Y2ggb2YgbG9nIHJlY29yZHM7CiAtLXNvdXJjZSBpbmNsdWRlL3Nl
YXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCkBAIC0xMjIsNyArMTIyLDcgQEAgbGV0IFNFQVJDSF9Q
QVRURVJOPSBJbm5vREI6IENhbi50IGluaXRpYQogLS1yZW1vdmVfZmlsZSAkU0VBUkNIX0ZJTEUK
IAogLS1lY2hvIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTYKLS0tZXJyb3IgMywxMzcK
Ky0tZXJyb3IgMwogLS1leGVjICRNWVNRTERfQ01EICRjcmFzaD02CiBsZXQgU0VBUkNIX1BBVFRF
Uk49IElubm9EQjogU3RhcnRpbmcgYW4gYXBwbHkgYmF0Y2ggb2YgbG9nIHJlY29yZHM7CiAtLXNv
dXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCkBAIC0xMzAsNyArMTMwLDcg
QEAgbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFJlc2l6aW5nIHJlZAogLS1zb3VyY2UgaW5j
bHVkZS9zZWFyY2hfcGF0dGVybl9pbl9maWxlLmluYwogLS1yZW1vdmVfZmlsZSAkU0VBUkNIX0ZJ
TEUKIC0tZWNobyAtLWlubm9kYi1mb3JjZS1yZWNvdmVyeS1jcmFzaD03Ci0tLWVycm9yIDMsMTM3
CistLWVycm9yIDMKIC0tZXhlYyAkTVlTUUxEX0NNRCAkY3Jhc2g9NwogIyB0aGlzIGNyYXNoZXMg
cmlnaHQgYWZ0ZXIgZGVsZXRpbmcgYWxsIGxvZyBmaWxlcwogLS1yZW1vdmVfZmlsZSAkU0VBUkNI
X0ZJTEUKQEAgLTE0MiwxMyArMTQyLDEzIEBAIGxldCBTRUFSQ0hfUEFUVEVSTj0gSW5ub0RCOiBD
YW5ub3QgY3JlYXQKIC0tcmVtb3ZlX2ZpbGUgJFNFQVJDSF9GSUxFCiAKIC0tZWNobyAtLWlubm9k
Yi1mb3JjZS1yZWNvdmVyeS1jcmFzaD04Ci0tLWVycm9yIDMsMTM3CistLWVycm9yIDMKIC0tZXhl
YyAkTVlTUUxEX0NNRCAkY3Jhc2g9OAogbGV0IFNFQVJDSF9QQVRURVJOPSBJbm5vREI6IFNldHRp
bmcgbG9nIGZpbGUgLippYl9sb2dmaWxlWzAtOV0rIHNpemUgdG87CiAtLXNvdXJjZSBpbmNsdWRl
L3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCiAtLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQog
LS1lY2hvIC0taW5ub2RiLWZvcmNlLXJlY292ZXJ5LWNyYXNoPTkKLS0tZXJyb3IgMywxMzcKKy0t
ZXJyb3IgMwogLS1leGVjICRNWVNRTERfQ01EICRjcmFzaD05CiBsZXQgU0VBUkNIX1BBVFRFUk49
IElubm9EQjogU2V0dGluZyBsb2cgZmlsZSAuKmliX2xvZ2ZpbGVbMC05XSsgc2l6ZSB0bzsKIC0t
c291cmNlIGluY2x1ZGUvc2VhcmNoX3BhdHRlcm5faW5fZmlsZS5pbmMKQEAgLTE5NCw3ICsxOTQs
NyBAQCBsZXQgU0VBUkNIX1BBVFRFUk49IElubm9EQjogTG9nIGZpbGUgLippCiAtLW1vdmVfZmls
ZSAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTFfaGlkZGVuICRNWVNRTERfREFUQURJUi9pYl9s
b2dmaWxlMQogCiAtLWVjaG8gLS1pbm5vZGItZm9yY2UtcmVjb3ZlcnktY3Jhc2g9MTAKLS0tZXJy
b3IgMywxMzcKKy0tZXJyb3IgMwogLS1leGVjICRNWVNRTERfQ01EICRjcmFzaD0xMAogbGV0IFNF
QVJDSF9QQVRURVJOPSBJbm5vREI6IFNldHRpbmcgbG9nIGZpbGUgLippYl9sb2dmaWxlWzAtOV0r
IHNpemUgdG87CiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2luX2ZpbGUuaW5jCgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMjA5MjgxMDQ0MjgtNTdsdTZlbTR2MjU2amIyMworKysgYi9zdG9yYWdlL2lu
bm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MjEwMDEwNzM0NTAtaHBmazZuMXRjNm01d2UxdwpAQCAtNTQ5LDcgKzU0OSwxNCBAQCBjcmVhdGVf
bG9nX2ZpbGUoCiAjaWZkZWYgREJVR19PRkYKICMgZGVmaW5lIFJFQ09WRVJZX0NSQVNIKHgpIGRv
IHt9IHdoaWxlKDApCiAjZWxzZQotIyBkZWZpbmUgUkVDT1ZFUllfQ1JBU0goeCkgaWYgKHNydl9m
b3JjZV9yZWNvdmVyeV9jcmFzaCA9PSB4KSBEQlVHX1NVSUNJREUoKQorIyBkZWZpbmUgUkVDT1ZF
UllfQ1JBU0goeCkgZG8gewkJCQkJCVwKKwlpZiAoc3J2X2ZvcmNlX3JlY292ZXJ5X2NyYXNoID09
IHgpIHsJCQkJXAorCQlmcHJpbnRmKHN0ZGVyciwgImlubm9kYl9mb3JjZV9yZWNvdmVyeV9jcmFz
aD0lbHVcbiIsCVwKKwkJCXNydl9mb3JjZV9yZWNvdmVyeV9jcmFzaCk7CQkJXAorCQlmZmx1c2go
c3RkZXJyKTsJCQkJCQlcCisJCWV4aXQoMyk7CQkJCQkJXAorCX0JCQkJCQkJCVwKK30gd2hpbGUg
KDApCiAjZW5kaWYKIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2Vs
ZXNzIGZvciBwdXNoIGVtYWlscyku