From: marko.makela
Date: October 15 2012 7:50am
Subject: bzr push into mysql-trunk branch (marko.makela:4722 to 4723)
List-Archive: http://lists.mysql.com/commits/145038
Message-Id: <20121015075025.28517.91739.4723@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQ3MjMgTWFya28gTcOka2Vsw6QJMjAxMi0xMC0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2RpY3QwbG9hZC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cu
Y2MKIDQ3MjIgVGF0amFuYSBBenVuZHJpcyBOdWVybmJlcmcJMjAxMi0xMC0xNSBbbWVyZ2VdCiAg
ICAgIEJ1ZyMxMTc2NDU1OTogVU1BU0sgSVMgSUdOT1JFRCBCWSBFUlJPUiBMT0cKICAgICAgCiAg
ICAgIG15c3FsZF9zYWZlIHNjcmlwdCBkaWQgbm90IGhlZWQgTXlTUUwgc3BlY2lmaWMgZW52aXJv
bm1lbnQgdmFyaWFibGUKICAgICAgJFVNQVNLLCBsZWFkaW5nIHRvIGRpdmVyZ2VudCBiZWhhdmlv
ciBiZXR3ZWVuIG15c3FsZCBhbmQgbXlzcWxkX3NhZmUuCiAgICAgIAogICAgICBQYXRjaCBhZGRz
IGFuIGFwcHJveGltYXRpb24gb2YgbXlzcWxkJ3MgYmVoYXZpb3IgdG8gbXlzcWxkX3NhZmUsCiAg
ICAgIHdpdGhpbiB0aGUgYm91bmRzIGRpY3RhdGVkIGJ5IGF0dGVtcHQgdG8gaGF2ZSBteXNxbGRf
c2FmZSBydW4gb24KICAgICAgZXZlbiB0aGUgbW9zdCBiYXNpYyBvZiBzaGVsbHMgKHByb3BlciAn
NzBzIHNoLCBub3QganVzdCBiYXNoCiAgICAgIHdpdGggYSBmYW5jeSBzeW1saW5rKS4KICAgICAg
CiAgICAgIFBhdGNoIGFsc28gYWRkcyBhcHByb3hpbWF0aW9uIG9mIHNhaWQgYmVoYXZpb3IgdG8g
bXlzcWxkX211bHRpCiAgICAgIChpbiBwZXJsKS4KCiAgICBtb2RpZmllZDoKICAgICAgc2NyaXB0
cy9teXNxbGRfbXVsdGkuc2gKICAgICAgc2NyaXB0cy9teXNxbGRfc2FmZS5zaAo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgJcmV2aWQ6dGF0amFuYS5udWVybmJlcmdA
b3JhY2xlLmNvbS0yMDEyMTAxNTA3MTEzNC1mMXc5ZjlvMWNnenIzd2VsCisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGxvYWQuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEyMTAxNTA3NDg1OS05dndiOGJxdmJja3NseGJ5CkBAIC01NCw3ICs1NCw3IEBAIGVudW0g
ZGljdF90YWJsZV9pbmZvX3QgewogCURJQ1RfVEFCTEVfTE9BRF9GUk9NX1JFQ09SRCA9IDAsLyoh
PCBEaXJlY3RseSBwb3B1bGF0ZSBhIGRpY3RfdGFibGVfdAogCQkJCQlzdHJ1Y3R1cmUgd2l0aCBp
bmZvcm1hdGlvbiBmcm9tCiAJCQkJCWEgU1lTX1RBQkxFUyByZWNvcmQgKi8KLQlESUNUX1RBQkxF
X0xPQURfRlJPTV9DQUNIRSA9IDEsCS8qITwgQ2hlY2sgZmlyc3Qgd2hldGhlciBkaWN0X3RhYmxl
X3QKKwlESUNUX1RBQkxFX0xPQURfRlJPTV9DQUNIRSA9IDEJLyohPCBDaGVjayBmaXJzdCB3aGV0
aGVyIGRpY3RfdGFibGVfdAogCQkJCQlpcyBpbiB0aGUgY2FjaGUsIGlmIHNvLCByZXR1cm4gaXQg
Ki8KIH07CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9n
LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOnRhdGphbmEu
bnVlcm5iZXJnQG9yYWNsZS5jb20tMjAxMjEwMTUwNzExMzQtZjF3OWY5bzFjZ3pyM3dlbAorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTIxMDE1MDc0ODU5LTl2d2I4YnF2YmNrc2x4YnkKQEAgLTEyMjksOCArMTIyOSw5
IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfaW5zZXJ0X2xvdygKIAogI2lmZGVmIFJPV19MT0dfQVBQ
TFlfUFJJTlQKIAlpZiAocm93X2xvZ19hcHBseV9wcmludCkgewotCQlmcHJpbnRmKHN0ZGVyciwg
InRhYmxlIGFwcGx5IGluc2VydCAiIElCX0lEX0ZNVCwKLQkJCWR1cC0+aW5kZXgtPmlkKTsKKwkJ
ZnByaW50ZihzdGRlcnIsICJ0YWJsZSBhcHBseSBpbnNlcnQgIgorCQkJSUJfSURfRk1UICIgIiBJ
Ql9JRF9GTVQgIlxuIiwKKwkJCWluZGV4LT50YWJsZS0+aWQsIGluZGV4LT5pZCk7CiAJCWR0dXBs
ZV9wcmludChzdGRlcnIsIHJvdyk7CiAJfQogI2VuZGlmIC8qIFJPV19MT0dfQVBQTFlfUFJJTlQg
Ki8KQEAgLTEzNDUsNiArMTM0NiwxNCBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X2RlbGV0ZV9sb3co
CiAKIAl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7CiAKKyNpZmRlZiBST1dfTE9H
X0FQUExZX1BSSU5UCisJaWYgKHJvd19sb2dfYXBwbHlfcHJpbnQpIHsKKwkJZnByaW50ZihzdGRl
cnIsICJ0YWJsZSBhcHBseSBkZWxldGUgIgorCQkJSUJfSURfRk1UICIgIiBJQl9JRF9GTVQgIlxu
IiwKKwkJCWluZGV4LT50YWJsZS0+aWQsIGluZGV4LT5pZCk7CisJCXJlY19wcmludF9uZXcoc3Rk
ZXJyLCBidHJfcGN1cl9nZXRfcmVjKHBjdXIpLCBvZmZzZXRzKTsKKwl9CisjZW5kaWYgLyogUk9X
X0xPR19BUFBMWV9QUklOVCAqLwogCWlmIChkaWN0X3RhYmxlX2dldF9uZXh0X2luZGV4KGluZGV4
KSkgewogCQkvKiBCdWlsZCBhIHJvdyB0ZW1wbGF0ZSBmb3IgcHVyZ2luZyBzZWNvbmRhcnkgaW5k
ZXggZW50cmllcy4gKi8KIAkJcm93ID0gcm93X2J1aWxkKApAQCAtMTY5NCw2ICsxNzAzLDE1IEBA
IGRlbGV0ZV9pbnNlcnQ6CiAJCQlST1dfQ09QWV9EQVRBLCBpbmRleCwgYnRyX3BjdXJfZ2V0X3Jl
YygmcGN1ciksCiAJCQljdXJfb2Zmc2V0cywgTlVMTCwgTlVMTCwgTlVMTCwgJm9sZF9leHQsIGhl
YXApOwogCQl1dF9hZChvbGRfcm93KTsKKyNpZmRlZiBST1dfTE9HX0FQUExZX1BSSU5UCisJCWlm
IChyb3dfbG9nX2FwcGx5X3ByaW50KSB7CisJCQlmcHJpbnRmKHN0ZGVyciwgInRhYmxlIGFwcGx5
IHVwZGF0ZSAiCisJCQkJSUJfSURfRk1UICIgIiBJQl9JRF9GTVQgIlxuIiwKKwkJCQlpbmRleC0+
dGFibGUtPmlkLCBpbmRleC0+aWQpOworCQkJZHR1cGxlX3ByaW50KHN0ZGVyciwgb2xkX3Jvdyk7
CisJCQlkdHVwbGVfcHJpbnQoc3RkZXJyLCByb3cpOworCQl9CisjZW5kaWYgLyogUk9XX0xPR19B
UFBMWV9QUklOVCAqLwogCX0gZWxzZSB7CiAJCW9sZF9yb3cgPSBOVUxMOwogCQlvbGRfZXh0ID0g
TlVMTDsKQEAgLTE3MzAsNyArMTc0OCw3IEBAIGRlbGV0ZV9pbnNlcnQ6CiAJCX0KIAogCQlpZiAo
IXJvd191cGRfY2hhbmdlc19vcmRfZmllbGRfYmluYXJ5KAotCQkJICAgIGluZGV4LCB1cGRhdGUs
IHRociwgcm93LCBOVUxMKSkgeworCQkJICAgIGluZGV4LCB1cGRhdGUsIHRociwgb2xkX3Jvdywg
TlVMTCkpIHsKIAkJCWNvbnRpbnVlOwogCQl9CiAKQEAgLTE3NTMsOSArMTc3MSw3IEBAIGRlbGV0
ZV9pbnNlcnQ6CiAKIAkJYnRyX2N1cl9wZXNzaW1pc3RpY19kZWxldGUoCiAJCQkmZXJyb3IsIEZB
TFNFLCBidHJfcGN1cl9nZXRfYnRyX2N1cigmcGN1ciksCi0JCQlCVFJfQ1JFQVRFX0ZMQUcgfCBC
VFJfTk9fTE9DS0lOR19GTEFHCi0JCQl8IEJUUl9OT19VTkRPX0xPR19GTEFHIHwgQlRSX0tFRVBf
U1lTX0ZMQUcsCi0JCQlSQl9OT05FLCAmbXRyKTsKKwkJCUJUUl9DUkVBVEVfRkxBRywgUkJfTk9O
RSwgJm10cik7CiAKIAkJaWYgKGVycm9yICE9IERCX1NVQ0NFU1MpIHsKIAkJCWJyZWFrOwoKTm8g
YnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=