From: marko.makela
Date: September 25 2012 8:43am
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4315 to 4318)
List-Archive: http://lists.mysql.com/commits/144890
Message-Id: <20120925084317.9425.32857.4318@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzMTggTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBDb3JyZWN0IGEgdHlwbyBpbiBh
IGNvbW1lbnQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBz
dGFydC5jYwogNDMxNyBNYXJrbyBNw6RrZWzDpAkyMDEyLTA5LTI1CiAgICAgIFdMIzY0OTQgY2xl
YW4tdXAgc3VnZ2VzdGVkIGluIGNvZGUgcmV2aWV3CiAgICAgIAogICAgICBpbm5vYmFzZV9sb2df
ZmlsZXNfaW5fZ3JvdXA6IFJlbW92ZS4gQmluZCBzcnZfbl9sb2dfZmlsZXMgZGlyZWN0bHkKICAg
ICAgdG8gdGhlIHBhcmFtZXRlciBpbm5vZGJfbG9nX2ZpbGVzX2luX2dyb3VwLgogICAgICAKICAg
ICAgU1JWX05fTE9HX0ZJTEVTX01BWDogVGhlIG1heGltdW0gdmFsdWUgb2YgaW5ub2Jhc2VfbG9n
X2ZpbGVzX2luX2dyb3VwLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hh
bmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zcnYwc3J2
LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MKIDQzMTYgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQog
ICAgICBXTCM2NDk0IGNsZWFudXA6IFJlbW92ZSBhIGJvZ3VzIHJlY29tbWVuZGF0aW9uCiAgICAg
IGluIHRoZSBoZWxwIG1lc3NhZ2Ugb2YgaW5ub2RiX2xvZ19maWxlc19pbl9ncm91cC4KCiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwogNDMx
NSBNYXJrbyBNw6RrZWzDpAkyMDEyLTA5LTI1CiAgICAgIFdMIzY0OTQgdGVzdGluZzogQ2hlY2sg
dGhlIHNlcnZlciBlcnJvciBsb2cgbWVzc2FnZXMuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWxvZy1maWxlLXNpemUudGVzdAo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYycKLS0tIGEvc3Rv
cmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEyMDkyNTA4MTIyMC1icHhwenl2aXdmenBkeXg3CisrKyBiL3N0b3JhZ2UvaW5u
b2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA5MjUwODQyMTktbTc4ZjdpMnF0Yjdpb3V2dApAQCAtMTIxLDcgKzEyMSw2IEBAIHN0YXRp
YyBjb25zdCBsb25nIEFVVE9JTkNfTkVXX1NUWUxFX0xPQ0sKIHN0YXRpYyBjb25zdCBsb25nIEFV
VE9JTkNfTk9fTE9DS0lORyA9IDI7CiAKIHN0YXRpYyBsb25nIGlubm9iYXNlX21pcnJvcmVkX2xv
Z19ncm91cHM7Ci1zdGF0aWMgbG9uZyBpbm5vYmFzZV9sb2dfZmlsZXNfaW5fZ3JvdXA7CiBzdGF0
aWMgbG9uZyBpbm5vYmFzZV9sb2dfYnVmZmVyX3NpemU7CiBzdGF0aWMgbG9uZyBpbm5vYmFzZV9h
ZGRpdGlvbmFsX21lbV9wb29sX3NpemU7CiBzdGF0aWMgbG9uZyBpbm5vYmFzZV9maWxlX2lvX3Ro
cmVhZHM7CkBAIC0zMDcxLDcgKzMwNzAsNiBAQCBpbm5vYmFzZV9jaGFuZ2VfYnVmZmVyaW5nX2lu
aXRlZF9vazoKIAogCXNydl9maWxlX2ZsdXNoX21ldGhvZF9zdHIgPSBpbm5vYmFzZV9maWxlX2Zs
dXNoX21ldGhvZDsKIAotCXNydl9uX2xvZ19maWxlcyA9ICh1bGludCkgaW5ub2Jhc2VfbG9nX2Zp
bGVzX2luX2dyb3VwOwogCXNydl9sb2dfZmlsZV9zaXplID0gKGliX3VpbnQ2NF90KSBpbm5vYmFz
ZV9sb2dfZmlsZV9zaXplOwogCiAjaWZkZWYgVU5JVl9MT0dfQVJDSElWRQpAQCAtMTU3MDMsMTAg
KzE1NzAxLDEwIEBAIHN0YXRpYyBNWVNRTF9TWVNWQVJfTE9OR0xPTkcobG9nX2ZpbGVfc2kKICAg
IlNpemUgb2YgZWFjaCBsb2cgZmlsZSBpbiBhIGxvZyBncm91cC4iLAogICBOVUxMLCBOVUxMLCA0
OCoxMDI0KjEwMjRMLCAxKjEwMjQqMTAyNEwsIExPTkdMT05HX01BWCwgMTAyNCoxMDI0TCk7CiAK
LXN0YXRpYyBNWVNRTF9TWVNWQVJfTE9ORyhsb2dfZmlsZXNfaW5fZ3JvdXAsIGlubm9iYXNlX2xv
Z19maWxlc19pbl9ncm91cCwKK3N0YXRpYyBNWVNRTF9TWVNWQVJfVUxPTkcobG9nX2ZpbGVzX2lu
X2dyb3VwLCBzcnZfbl9sb2dfZmlsZXMsCiAgIFBMVUdJTl9WQVJfUlFDTURBUkcgfCBQTFVHSU5f
VkFSX1JFQURPTkxZLAotICAiTnVtYmVyIG9mIGxvZyBmaWxlcyBpbiB0aGUgbG9nIGdyb3VwLiBJ
bm5vREIgd3JpdGVzIHRvIHRoZSBmaWxlcyBpbiBhIGNpcmN1bGFyIGZhc2hpb24uIFZhbHVlIDMg
aXMgcmVjb21tZW5kZWQgaGVyZS4iLAotICBOVUxMLCBOVUxMLCAyLCAyLCAxMDAsIDApOworICAi
TnVtYmVyIG9mIGxvZyBmaWxlcyBpbiB0aGUgbG9nIGdyb3VwLiBJbm5vREIgd3JpdGVzIHRvIHRo
ZSBmaWxlcyBpbiBhIGNpcmN1bGFyIGZhc2hpb24uIiwKKyAgTlVMTCwgTlVMTCwgMiwgMiwgU1JW
X05fTE9HX0ZJTEVTX01BWCwgMCk7CiAKIHN0YXRpYyBNWVNRTF9TWVNWQVJfTE9ORyhtaXJyb3Jl
ZF9sb2dfZ3JvdXBzLCBpbm5vYmFzZV9taXJyb3JlZF9sb2dfZ3JvdXBzLAogICBQTFVHSU5fVkFS
X1JRQ01EQVJHIHwgUExVR0lOX1ZBUl9SRUFET05MWSwKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvc3J2MHNydi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI1MDgx
MjIwLWJweHB6eXZpd2Z6cGR5eDcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3NydjBz
cnYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyNTA4NDIxOS1tNzhmN2ky
cXRiN2lvdXZ0CkBAIC0yNDMsNyArMjQzLDkgQEAgZXh0ZXJuIHVsb25nCXNydl9hdXRvX2V4dGVu
ZF9pbmNyZW1lbnQ7CiAKIGV4dGVybiBpYm9vbAlzcnZfY3JlYXRlZF9uZXdfcmF3OwogCi1leHRl
cm4gdWxpbnQJc3J2X25fbG9nX2ZpbGVzOworLyoqIE1heGltdW0gbnVtYmVyIG9mIHNydl9uX2xv
Z19maWxlcywgb3IgaW5ub2RiX2xvZ19maWxlc19pbl9ncm91cCAqLworI2RlZmluZSBTUlZfTl9M
T0dfRklMRVNfTUFYIDEwMAorZXh0ZXJuIHVsb25nCXNydl9uX2xvZ19maWxlczsKIGV4dGVybiBp
Yl91aW50NjRfdAlzcnZfbG9nX2ZpbGVfc2l6ZTsKIGV4dGVybiBpYl91aW50NjRfdAlzcnZfbG9n
X2ZpbGVfc2l6ZV9yZXF1ZXN0ZWQ7CiBleHRlcm4gdWxpbnQJc3J2X2xvZ19idWZmZXJfc2l6ZTsK
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmNjJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIwOTI1MDgxMjIwLWJweHB6eXZpd2Z6cGR5eDcKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9zcnYvc3J2MHNydi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDky
NTA4NDIxOS1tNzhmN2kycXRiN2lvdXZ0CkBAIC0xNzgsNyArMTc4LDcgQEAgVU5JVl9JTlRFUk4g
aWJvb2wJc3J2X2NyZWF0ZWRfbmV3X3Jhdwk9CiAKIFVOSVZfSU5URVJOIGNoYXIqCXNydl9sb2df
Z3JvdXBfaG9tZV9kaXIJPSBOVUxMOwogCi1VTklWX0lOVEVSTiB1bGludAlzcnZfbl9sb2dfZmls
ZXMJCT0gVUxJTlRfTUFYOworVU5JVl9JTlRFUk4gdWxvbmcJc3J2X25fbG9nX2ZpbGVzCQk9IFNS
Vl9OX0xPR19GSUxFU19NQVg7CiAvKiBzaXplIGluIGRhdGFiYXNlIHBhZ2VzICovCiBVTklWX0lO
VEVSTiBpYl91aW50NjRfdAlzcnZfbG9nX2ZpbGVfc2l6ZQk9IElCX1VJTlQ2NF9NQVg7CiBVTklW
X0lOVEVSTiBpYl91aW50NjRfdAlzcnZfbG9nX2ZpbGVfc2l6ZV9yZXF1ZXN0ZWQ7Cgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMjA5MjUwODEyMjAtYnB4cHp5dml3ZnpwZHl4NworKysgYi9zdG9yYWdlL2lubm9iYXNl
L3Nydi9zcnYwc3RhcnQuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjUw
ODQyMTktbTc4ZjdpMnF0Yjdpb3V2dApAQCAtNTQxLDcgKzU0MSw3IEBAIGNyZWF0ZV9sb2dfZmls
ZSgKIH0KIAogLyoqIEluaXRpYWwgbnVtYmVyIG9mIHRoZSBmaXJzdCByZWRvIGxvZyBmaWxlICov
Ci0jZGVmaW5lIElOSVRfTE9HX0ZJTEUwCTEwMQorI2RlZmluZSBJTklUX0xPR19GSUxFMAkoU1JW
X05fTE9HX0ZJTEVTX01BWCArIDEpCiAKICNpZmRlZiBEQlVHX09GRgogIyBkZWZpbmUgUkVDT1ZF
UllfQ1JBU0goeCkgZG8ge30gd2hpbGUoMCkKQEAgLTY0MSw3ICs2NDEsNyBAQCBjcmVhdGVfbG9n
X2ZpbGVzKAogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotUmVuYW1lcyB0aGUgZmlyc3QgYWxsIGxv
ZyBmaWxlLiAqLworUmVuYW1lcyB0aGUgZmlyc3QgbG9nIGZpbGUuICovCiBzdGF0aWMKIHZvaWQK
IGNyZWF0ZV9sb2dfZmlsZXNfcmVuYW1lKApAQCAtMTk3MCw3ICsxOTcwLDcgQEAgY3JlYXRlX2xv
Z19maWxlczoKIAkJCQkJCW1heF9mbHVzaGVkX2xzbiwgbG9nZmlsZTApOwogCQl9CiAJfSBlbHNl
IHsKLQkJZm9yIChpID0gMDsgaSA8IDEwMC8qIG1heCBvZiBzcnZfbl9sb2dfZmlsZXMgKi87IGkr
KykgeworCQlmb3IgKGkgPSAwOyBpIDwgU1JWX05fTE9HX0ZJTEVTX01BWDsgaSsrKSB7CiAJCQlv
c19vZmZzZXRfdAlzaXplOwogCQkJb3NfZmlsZV9zdGF0X3QJc3RhdF9pbmZvOwogCkBAIC0xOTgy
LDcgKzE5ODIsOCBAQCBjcmVhdGVfbG9nX2ZpbGVzOgogCiAJCQlpZiAoZXJyID09IERCX05PVF9G
T1VORCkgewogCQkJCWlmIChpID09IDApIHsKLQkJCQkJaWYgKG1heF9mbHVzaGVkX2xzbiAhPSBt
aW5fZmx1c2hlZF9sc24pIHsKKwkJCQkJaWYgKG1heF9mbHVzaGVkX2xzbgorCQkJCQkgICAgIT0g
bWluX2ZsdXNoZWRfbHNuKSB7CiAJCQkJCQlpYl9sb2dmKElCX0xPR19MRVZFTF9FUlJPUiwKIAkJ
CQkJCQkiQ2Fubm90IGNyZWF0ZSIKIAkJCQkJCQkiIGxvZyBmaWxlcyBiZWNhdXNlIgoKTm8gYnVu
ZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=