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

IDQzMzkgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNwogICAgICBXTCM2NDk0IHRlc3QgZW5oYW5j
ZW1lbnQuCiAgICAgIAogICAgICBSZW1vdmUgcmVkbyBsb2cgZmlsZXMgYWZ0ZXIgYSBjbGVhbiBz
aHV0ZG93biwgYW5kIGVuc3VyZSB0aGF0CiAgICAgIHRoZSBkYXRhYmFzZSBpcyBhY2Nlc3NpYmxl
IGFmdGVyIGEgcmVzdGFydC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnRlc3QKIDQzMzggTWFya28gTcOka2Vsw6QJ
MjAxMi0wOS0yNwogICAgICBXTCM2NDk0OiBTdXBwcmVzcyBhIGJvZ3VzIGxvZyBhcHBseSBtZXNz
YWdlIGFmdGVyIGNyZWF0aW5nIGxvZyBmaWxlcwogICAgICB3aGVuIHRoZSBsb2cgZmlsZXMgd2Vy
ZSBtaXNzaW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYw
c3RhcnQuY2MKIDQzMzcgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNwogICAgICBXTCM2NDk0IHRl
c3QgY2FzZSBmYWlsdXJlIGZpeC4KICAgICAgCiAgICAgIFVzZSBpYl9sb2dmKCkgdG8gaXNzdWUg
YSByZWNvdmVyeSBtZXNzYWdlLgogICAgICBGb3Igc29tZSByZWFzb24sIHRoZSBmcHV0cyguLi4s
IHN0ZGVycikgd2FzIGFwcGFyZW50bHkgbG9zdCBpbiBhIGdjb3YgdGVzdC4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuY2MKIDQzMzYgVmluYXkgRmlz
cmVrYXIJMjAxMi0wOS0yNwogICAgICBGaXgobWFya28ncyBjaGFuZ2UpIEJ1ZyMxNDY4MTc5OSBD
UkFTSCBSRUNPVkVSWSBXQVJOSU5HUyBPTiBNQUMgT1MgWCAgYW5kIHRlc3QgZmFpbHVyZSAKICAg
ICAgKG9mIGdyZXAgb24gZXJyb3IgbG9nIGFuZCAgQWRkZWQgc2l6ZSBjaGVjayBmb3Jpbm5vZGJf
bG9nX2ZpbGVzX2luX2dyb3VwIGluIHRlc3QpCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWxvZy1maWxlLXNpemUtMS5yZXN1bHQKICAgICAgbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS0xLnRlc3QKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWxvZy1maWxlLXNpemUtMS50ZXN0JwotLS0gYS9t
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1sb2ctZmlsZS1zaXplLTEudGVzdAlyZXZp
ZDp2aW5heS5maXNyZWthckBvcmFjbGUuY29tLTIwMTIwOTI3MDcwNjExLTQ3M2p1cGNzc2ozdnFt
a3YKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItbG9nLWZpbGUtc2l6ZS0x
LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjcxNTQ5MTYtNW43NWd1
dTFrMnBkaGxkbQpAQCAtMTYxLDcgKzE2MSw3IEBAIFNFTEVDVCBpZCxMRUZUKGJmaWVsZCwyMCkg
RlJPTSB0MTsKICMgRG8gc29tZXRoaW5nIHdoaWxlIHNlcnZlciBpcyBkb3duCiAtLWVuYWJsZV9y
ZWNvbm5lY3QKICMgV3JpdGUgZmlsZSB0byBtYWtlIG15c3FsLXRlc3QtcnVuLnBsIHN0YXJ0IHVw
IHRoZSBzZXJ2ZXIgYWdhaW4KLSMgc2V0IGxvZyBzaXplIGZyb20gMTVNIHRvIDEwTQorIyBzZXQg
bG9nIHNpemUgZnJvbSAyKjVNIHRvIDIqMTBNCiAtLWV4ZWMgZWNobyAicmVzdGFydDogLS1pbm5v
ZGItbG9nLWZpbGUtc2l6ZT0xME0gLS1pbm5vZGJfbG9nX2ZpbGVzX2luX2dyb3VwPTIgIC0tbG9n
LWVycm9yPSRNWVNRTFRFU1RfVkFSRElSL2xvZy9jYXNlMi5lcnIiID4gJE1ZU1FMVEVTVF9WQVJE
SVIvdG1wL215c3FsZC4xLmV4cGVjdAogLS1zb3VyY2UgaW5jbHVkZS93YWl0X3VudGlsX2Nvbm5l
Y3RlZF9hZ2Fpbi5pbmMKIApAQCAtMjU1LDEwICsyNTUsOSBAQCBsZXQgU0VBUkNIX1BBVFRFUk49
IElubm9EQjogLippYl9sb2dmaWxlCiAtLXNvdXJjZSBpbmNsdWRlL3NlYXJjaF9wYXR0ZXJuX2lu
X2ZpbGUuaW5jCiAtLXJlbW92ZV9maWxlICRTRUFSQ0hfRklMRQogLS1yZW1vdmVfZmlsZSAkTVlT
UUxEX0RBVEFESVIvaWJfbG9nZmlsZTEKLSMtLW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvaWJf
bG9nZmlsZTAgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUxMDEKLS0tbW92ZV9maWxlICRNWVNR
TERfREFUQURJUi9pYl9sb2dmaWxlMV9oaWRkZW4gJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUx
CistLW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvaWJfbG9nZmlsZTAgJE1ZU1FMRF9EQVRBRElS
L2liX2xvZ2ZpbGUwX2hpZGRlbgogCi0jIHJlc3RhcnQgc2VydmVyIAorIyByZXN0YXJ0IHNlcnZl
cgogLS1leGVjIGVjaG8gInJlc3RhcnQiID4gJE1ZU1FMVEVTVF9WQVJESVIvdG1wL215c3FsZC4x
LmV4cGVjdAogLS1lbmFibGVfcmVjb25uZWN0CiAtLXNvdXJjZSBpbmNsdWRlL3dhaXRfdW50aWxf
Y29ubmVjdGVkX2FnYWluLmluYwpAQCAtMjY5LDcgKzI2OCw3IEBAIFNFTEVDVCBpZCxMRUZUKGJm
aWVsZCwyMCkgRlJPTSB0MTsKIElOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMSxyZXBlYXQoJ2EnLDIw
MDApKSwoMixyZXBlYXQoJ2InLDIwMDApKSwKICgzLHJlcGVhdCgnYycsMjAwMCkpOwogCi0jIGNs
ZWFudXAgYW5kIHNldCBvcmlnaW5hbCB2YWx1ZXMgCisjIGNsZWFudXAgYW5kIHNldCBvcmlnaW5h
bCB2YWx1ZXMKIERST1AgVEFCTEUgdDE7CiBEUk9QIERBVEFCQVNFIGRiX3dsNjQ5NDsKIC0tZXJy
b3IgMCwxCkBAIC0yNzgsNiArMjc3LDggQEAgRFJPUCBEQVRBQkFTRSBkYl93bDY0OTQ7CiAtLXJl
bW92ZV9maWxlICRNWVNRTFRFU1RfVkFSRElSL2xvZy9jYXNlMS5lcnIKIC0tZXJyb3IgMCwxCiAt
LXJlbW92ZV9maWxlICRNWVNRTFRFU1RfVkFSRElSL2xvZy9jYXNlMi5lcnIKKy0tcmVtb3ZlX2Zp
bGUgJE1ZU1FMRF9EQVRBRElSL2liX2xvZ2ZpbGUwX2hpZGRlbgorLS1yZW1vdmVfZmlsZSAkTVlT
UUxEX0RBVEFESVIvaWJfbG9nZmlsZTFfaGlkZGVuCiAtLWRpc2FibGVfcXVlcnlfbG9nCiBldmFs
IFNFVCBHTE9CQUwgSU5OT0RCX0ZJTEVfRk9STUFUPSRpbm5vZGJfZmlsZV9mb3JtYXQ7CiBldmFs
IFNFVCBHTE9CQUwgSU5OT0RCX0ZJTEVfUEVSX1RBQkxFPSRpbm5vZGJfZmlsZV9wZXJfdGFibGU7
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuY2MnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzByZWN2LmNjCXJldmlkOnZpbmF5LmZpc3Jla2Fy
QG9yYWNsZS5jb20tMjAxMjA5MjcwNzA2MTEtNDczanVwY3NzajN2cW1rdgorKysgYi9zdG9yYWdl
L2lubm9iYXNlL2xvZy9sb2cwcmVjdi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDkyNzE1NDkxNi01bjc1Z3V1MWsycGRobGRtCkBAIC0xNzg5LDExICsxNzg5LDExIEBAIGxv
b3A6CiAKIAkJCWlmIChyZWN2X2FkZHItPnN0YXRlID09IFJFQ1ZfTk9UX1BST0NFU1NFRCkgewog
CQkJCWlmICghaGFzX3ByaW50ZWQpIHsKLQkJCQkJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7
Ci0JCQkJCWZwdXRzKCIgIElubm9EQjogU3RhcnRpbmcgYW4iCi0JCQkJCSAgICAgICIgYXBwbHkg
YmF0Y2ggb2YgbG9nIHJlY29yZHMiCi0JCQkJCSAgICAgICIgdG8gdGhlIGRhdGFiYXNlLi4uXG4i
Ci0JCQkJCSAgICAgICJJbm5vREI6IFByb2dyZXNzIGluIHBlcmNlbnRzOiAiLAorCQkJCQlpYl9s
b2dmKElCX0xPR19MRVZFTF9JTkZPLAorCQkJCQkJIlN0YXJ0aW5nIGFuIGFwcGx5IGJhdGNoIgor
CQkJCQkJIiBvZiBsb2cgcmVjb3JkcyIKKwkJCQkJCSIgdG8gdGhlIGRhdGFiYXNlLi4uIik7CisJ
CQkJCWZwdXRzKCJJbm5vREI6IFByb2dyZXNzIGluIHBlcmNlbnQ6ICIsCiAJCQkJCSAgICAgIHN0
ZGVycik7CiAJCQkJCWhhc19wcmludGVkID0gVFJVRTsKIAkJCQl9CkBAIC0xOTA2LDkgKzE5MDYs
MTAgQEAgcmVjdl9hcHBseV9sb2dfcmVjc19mb3JfYmFja3VwKHZvaWQpCiAKIAlibG9jayA9IGJh
Y2tfYmxvY2sxOwogCi0JZnB1dHMoIklubm9EQjogU3RhcnRpbmcgYW4gYXBwbHkgYmF0Y2ggb2Yg
bG9nIHJlY29yZHMiCi0JICAgICAgIiB0byB0aGUgZGF0YWJhc2UuLi5cbiIKLQkgICAgICAiSW5u
b0RCOiBQcm9ncmVzcyBpbiBwZXJjZW50czogIiwgc3RkZXJyKTsKKwlpYl9sb2dmKElCX0xPR19M
RVZFTF9JTkZPLAorCQkiU3RhcnRpbmcgYW4gYXBwbHkgYmF0Y2ggb2YgbG9nIHJlY29yZHMgdG8g
dGhlIGRhdGFiYXNlLi4uIik7CisKKwlmcHV0cygiSW5ub0RCOiBQcm9ncmVzcyBpbiBwZXJjZW50
OiAiLCBzdGRlcnIpOwogCiAJbl9oYXNoX2NlbGxzID0gaGFzaF9nZXRfbl9jZWxscyhyZWN2X3N5
cy0+YWRkcl9oYXNoKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2
L3NydjBzdGFydC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjCXJl
dmlkOnZpbmF5LmZpc3Jla2FyQG9yYWNsZS5jb20tMjAxMjA5MjcwNzA2MTEtNDczanVwY3NzajN2
cW1rdgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjcxNTQ5MTYtNW43NWd1dTFrMnBkaGxkbQpAQCAtMjA1
NCw2ICsyMDU0LDEwIEBAIGlubm9iYXNlX3N0YXJ0X29yX2NyZWF0ZV9mb3JfbXlzcWwodm9pZCkK
IAkJCQkJCWxvZ2ZpbGVuYW1lLCBkaXJuYW1lbGVuLAogCQkJCQkJbWF4X2ZsdXNoZWRfbHNuLCBs
b2dmaWxlMCk7CiAKKwkJCQkJLyogU3VwcHJlc3MgdGhlIG1lc3NhZ2UgYWJvdXQKKwkJCQkJY3Jh
c2ggcmVjb3ZlcnkuICovCisJCQkJCW1heF9mbHVzaGVkX2xzbiA9IG1pbl9mbHVzaGVkX2xzbgor
CQkJCQkJPSBsb2dfZ2V0X2xzbigpOwogCQkJCQlnb3RvIGZpbGVzX2NoZWNrZWQ7CiAJCQkJfSBl
bHNlIGlmIChpIDwgMikgewogCQkJCQkvKiBtdXN0IGhhdmUgYXQgbGVhc3QgMiBsb2cgZmlsZXMg
Ki8KQEAgLTI2OTksNyArMjcwMyw3IEBAIGZpbGVzX2NoZWNrZWQ6CiAKIAlpZiAoc3J2X3ByaW50
X3ZlcmJvc2VfbG9nKSB7CiAJCWliX2xvZ2YoSUJfTE9HX0xFVkVMX0lORk8sCi0JCQkiJXMgc3Rh
cnRlZDsgIiAibG9nIHNlcXVlbmNlIG51bWJlciAiIExTTl9QRiAiIiwKKwkJCSIlcyBzdGFydGVk
OyBsb2cgc2VxdWVuY2UgbnVtYmVyICIgTFNOX1BGICIiLAogCQkJSU5OT0RCX1ZFUlNJT05fU1RS
LCBzcnZfc3RhcnRfbHNuKTsKIAl9CiAKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBw
dXNoIGVtYWlscyku