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

IDQzMjQgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBXTCM2NDk0IHJldmlldyBjbGVh
bnVwOiBFbGltaW5hdGUgYSBnb3RvLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL3Nydi9zcnYwc3RhcnQuY2MKIDQzMjMgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAg
ICBXTCM2NDk0IHJldmlldyBjbGVhbnVwOiBBZGQgYSBjb21tZW50IGFib3V0IHJlY3Zfbm9fbG9n
X3dyaXRlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3Rh
cnQuY2MKIDQzMjIgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yNQogICAgICBXcml0ZSBhIHByb3Bl
ciBoZWxwIHN0cmluZyBmb3IgaW5ub2RiX2ZvcmNlX3JlY292ZXJ5X2NyYXNoLgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiA0MzIxIE1h
cmtvIE3DpGtlbMOkCTIwMTItMDktMjUKICAgICAgU3VwcHJlc3MgYSB3YXJuaW5nIHRoYXQgaXMg
c29tZXRpbWVzIGlzc3VlZCBhYm91dCBjcmFzaCByZWNvdmVyeS4KCiAgICBtb2RpZmllZDoKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9yL3BhcnRpdGlvbl9kZWJ1Zy5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy90L3BhcnRpdGlvbl9kZWJ1Zy50ZXN0Cj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIwOTI1MTI0MTQ4LXZmb3MzeW52aWR5b2sybTgKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDkyNTIwMDkxMC1icGtxcGE5eW5iNW5yeGV6CkBAIC0xNTY4MSw3ICsxNTY4MSw3IEBAIHN0
YXRpYyBNWVNRTF9TWVNWQVJfVUxPTkcoZm9yY2VfcmVjb3ZlcnkKICNpZm5kZWYgREJVR19PRkYK
IHN0YXRpYyBNWVNRTF9TWVNWQVJfVUxPTkcoZm9yY2VfcmVjb3ZlcnlfY3Jhc2gsIHNydl9mb3Jj
ZV9yZWNvdmVyeV9jcmFzaCwKICAgUExVR0lOX1ZBUl9SUUNNREFSRyB8IFBMVUdJTl9WQVJfUkVB
RE9OTFksCi0gICJIZWxwcyB0byBzYXZlIHlvdXIgZGF0YSBpbiBjYXNlIHRoZSBkaXNrIGltYWdl
IG9mIHRoZSBkYXRhYmFzZSBiZWNvbWVzIGNvcnJ1cHQuIiwKKyAgIktpbGxzIHRoZSBzZXJ2ZXIg
ZHVyaW5nIGNyYXNoIHJlY292ZXJ5LiIsCiAgIE5VTEwsIE5VTEwsIDAsIDAsIDEwLCAwKTsKICNl
bmRpZiAvKiAhREJVR19PRkYgKi8KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2Uvc3J2L3NydjBzdGFydC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI1MTI0MTQ4LXZmb3MzeW52
aWR5b2sybTgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTI1MjAwOTEwLWJwa3FwYTl5bmI1bnJ4ZXoKQEAg
LTE5NDgsMjcgKzE5NDgsMTkgQEAgaW5ub2Jhc2Vfc3RhcnRfb3JfY3JlYXRlX2Zvcl9teXNxbCh2
b2lkKQogCXNydl9sb2dfZmlsZV9zaXplX3JlcXVlc3RlZCA9IHNydl9sb2dfZmlsZV9zaXplOwog
CiAJaWYgKGNyZWF0ZV9uZXdfZGIpIHsKLQkJewotCQkJYm9vbCBzdWNjZXNzID0gYnVmX2ZsdXNo
X2xpc3QoCi0JCQkJVUxJTlRfTUFYLCBMU05fTUFYLCBOVUxMKTsKLQkJCXV0X2Eoc3VjY2Vzcyk7
Ci0JCX0KKwkJYm9vbCBzdWNjZXNzID0gYnVmX2ZsdXNoX2xpc3QoVUxJTlRfTUFYLCBMU05fTUFY
LCBOVUxMKTsKKwkJdXRfYShzdWNjZXNzKTsKIAogCQltaW5fZmx1c2hlZF9sc24gPSBtYXhfZmx1
c2hlZF9sc24gPSBsb2dfZ2V0X2xzbigpOwogCiAJCWJ1Zl9mbHVzaF93YWl0X2JhdGNoX2VuZChO
VUxMLCBCVUZfRkxVU0hfTElTVCk7Ci1jcmVhdGVfbG9nX2ZpbGVzOgorCiAJCWVyciA9IGNyZWF0
ZV9sb2dfZmlsZXMobG9nZmlsZW5hbWUsIGRpcm5hbWVsZW4sCiAJCQkJICAgICAgIG1heF9mbHVz
aGVkX2xzbiwgbG9nZmlsZTApOwogCiAJCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewogCQkJcmV0
dXJuKGVycik7CiAJCX0KLQotCQlpZiAoIWNyZWF0ZV9uZXdfZGIpIHsKLQkJCWNyZWF0ZV9sb2df
ZmlsZXNfcmVuYW1lKGxvZ2ZpbGVuYW1lLCBkaXJuYW1lbGVuLAotCQkJCQkJbWF4X2ZsdXNoZWRf
bHNuLCBsb2dmaWxlMCk7Ci0JCX0KIAl9IGVsc2UgewogCQlmb3IgKGkgPSAwOyBpIDwgU1JWX05f
TE9HX0ZJTEVTX01BWDsgaSsrKSB7CiAJCQlvc19vZmZzZXRfdAlzaXplOwpAQCAtMjAwNyw3ICsx
OTk5LDE3IEBAIGNyZWF0ZV9sb2dfZmlsZXM6CiAJCQkJCQlyZXR1cm4oREJfRVJST1IpOwogCQkJ
CQl9CiAKLQkJCQkJZ290byBjcmVhdGVfbG9nX2ZpbGVzOworCQkJCQllcnIgPSBjcmVhdGVfbG9n
X2ZpbGVzKAorCQkJCQkJbG9nZmlsZW5hbWUsIGRpcm5hbWVsZW4sCisJCQkJCQltYXhfZmx1c2hl
ZF9sc24sIGxvZ2ZpbGUwKTsKKworCQkJCQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKKwkJCQkJ
CXJldHVybihlcnIpOworCQkJCQl9CisKKwkJCQkJY3JlYXRlX2xvZ19maWxlc19yZW5hbWUoCisJ
CQkJCQlsb2dmaWxlbmFtZSwgZGlybmFtZWxlbiwKKwkJCQkJCW1heF9mbHVzaGVkX2xzbiwgbG9n
ZmlsZTApOwogCQkJCX0gZWxzZSBpZiAoaSA8IDIpIHsKIAkJCQkJLyogbXVzdCBoYXZlIGF0IGxl
YXN0IDIgbG9nIGZpbGVzICovCiAJCQkJCXJldHVybihlcnIpOwpAQCAtMjMwNiw2ICsyMzA4LDkg
QEAgY3JlYXRlX2xvZ19maWxlczoKIAogCQkJdXRfYWQobWF4X2ZsdXNoZWRfbHNuID09IGxvZ19n
ZXRfbHNuKCkpOwogCisJCQkvKiBQcm9oaWJpdCByZWRvIGxvZyB3cml0ZXMgZnJvbSBhbnkgb3Ro
ZXIKKwkJCXRocmVhZHMgdW50aWwgY3JlYXRpbmcgYSBsb2cgY2hlY2twb2ludCBhdCB0aGUKKwkJ
CWVuZCBvZiBjcmVhdGVfbG9nX2ZpbGVzKCkuICovCiAJCQl1dF9kKHJlY3Zfbm9fbG9nX3dyaXRl
ID0gVFJVRSk7CiAJCQl1dF9hZCghYnVmX3Bvb2xfY2hlY2tfbm9fcGVuZGluZ19pbygpKTsKIAoK
Tm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=