From: marko.makela
Date: April 18 2012 10:50am
Subject: bzr push into mysql-trunk-wl5522 branch (marko.makela:4077 to 4079)
List-Archive: http://lists.mysql.com/commits/143537
Message-Id: <201204181050.q3IAo7ec013236@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQwNzkgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0xOAogICAgICBVc2UgdGFibGVfaWRfdCBpbnN0
ZWFkIG9mIGliX2lkX3QgZm9yIHRhYmxlX2lkLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmNjCiA0MDc4IE1hcmtvIE3DpGtlbMOkCTIwMTItMDQt
MTgKICAgICAgUmVtb3ZlIGFuIHVubmVjZXNhcnkgdHlwZSBjYXN0LgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcm9sbC5jYwogNDA3NyBNYXJrbyBNw6RrZWzD
pAkyMDEyLTA0LTE4CiAgICAgIFdoaXRlIHNwYWNlIGNsZWFudXAuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX215c3FsLnRlc3QKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9maWwvZmlsMGZpbC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwbXlzcWwuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVm
MGlidWYuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuY2MJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA0MTgwOTQ4NTAtNDRvMHVleWF0N2VqdTJ6dAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmNjCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTIwNDE4MTA0OTEyLTJiMWRkZHQ1bjBuZXp6cDEKQEAgLTI2MTcsMTIg
KzI2MTcsMTIgQEAgaWJ1Zl9tZXJnZV9wYWdlcygKIAogLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIEdldCB0
aGUgdGFibGUgaW5zdGFuY2UgZnJvbSB0aGUgdGFibGUgaWQuCi1AcmV0dXJuIHRhYmxlIGluc3Rh
bmNlLiAqLwotc3RhdGljCitAcmV0dXJuIHRhYmxlIGluc3RhbmNlICovCitzdGF0aWMgX19hdHRy
aWJ1dGVfXygod2Fybl91bnVzZWRfcmVzdWx0KSkKIGRpY3RfdGFibGVfdCoKIGlidWZfZ2V0X3Rh
YmxlKAogLyo9PT09PT09PT09PSovCi0JaWJfaWRfdAl0YWJsZV9pZCkJLyohPCBpbjogdmFsaWQg
dGFibGUgaWQgKi8KKwl0YWJsZV9pZF90CXRhYmxlX2lkKQkvKiE8IGluOiB2YWxpZCB0YWJsZSBp
ZCAqLwogewogCXJ3X2xvY2tfc19sb2NrX2Z1bmMoJmRpY3Rfb3BlcmF0aW9uX2xvY2ssIDAsIF9f
RklMRV9fLCBfX0xJTkVfXyk7CiAKQEAgLTI3MTYsMTcgKzI3MTYsMjAgQEAgQ29udHJhY3RzIGlu
c2VydCBidWZmZXIgdHJlZXMgYnkgcmVhZGluZwogQHJldHVybiBhIGxvd2VyIGxpbWl0IGZvciB0
aGUgY29tYmluZWQgc2l6ZSBpbiBieXRlcyBvZiBlbnRyaWVzIHdoaWNoCiB3aWxsIGJlIG1lcmdl
ZCBmcm9tIGlidWYgdHJlZXMgdG8gdGhlIHBhZ2VzIHJlYWQsIDAgaWYgaWJ1ZiBpcwogZW1wdHkg
Ki8KLXN0YXRpYworc3RhdGljIF9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jl
c3VsdCkpCiB1bGludAogaWJ1Zl9tZXJnZSgKIC8qPT09PT09PSovCi0JaWJfaWRfdAl0YWJsZV9p
ZCwJLyohPCBpbjogaWYgbWVyZ2Ugc2hvdWxkIGJlIGRvbmUgb25seSBmb3IKLQkJCQlhIHNwZWNp
ZmljIHRhYmxlLCBmb3IgYWxsIHRhYmxlcyB0aGlzIHNob3VsZAotCQkJCWJlIDAgKi8KLQl1bGlu
dCoJbl9wYWdlcywJLyohPCBvdXQ6IG51bWJlciBvZiBwYWdlcyB0byB3aGljaCBtZXJnZWQgKi8K
LQlib29sCXN5bmMpCQkvKiE8IGluOiBUUlVFIGlmIHRoZSBjYWxsZXIgd2FudHMgdG8gd2FpdCBm
b3IKLQkJCQl0aGUgaXNzdWVkIHJlYWQgd2l0aCB0aGUgaGlnaGVzdCB0YWJsZXNwYWNlCi0JCQkJ
YWRkcmVzcyB0byBjb21wbGV0ZSAqLworCXRhYmxlX2lkX3QJdGFibGVfaWQsCS8qITwgaW46IGlm
IG1lcmdlIHNob3VsZCBiZQorCQkJCQlkb25lIG9ubHkgZm9yIGEgc3BlY2lmaWMKKwkJCQkJdGFi
bGUsIGZvciBhbGwgdGFibGVzIHRoaXMKKwkJCQkJc2hvdWxkIGJlIDAgKi8KKwl1bGludCoJCW5f
cGFnZXMsCS8qITwgb3V0OiBudW1iZXIgb2YgcGFnZXMgdG8KKwkJCQkJd2hpY2ggbWVyZ2VkICov
CisJYm9vbAkJc3luYykJCS8qITwgaW46IFRSVUUgaWYgdGhlIGNhbGxlcgorCQkJCQl3YW50cyB0
byB3YWl0IGZvciB0aGUgaXNzdWVkCisJCQkJCXJlYWQgd2l0aCB0aGUgaGlnaGVzdAorCQkJCQl0
YWJsZXNwYWNlIGFkZHJlc3MgdG8gY29tcGxldGUgKi8KIHsKIAlkaWN0X3RhYmxlX3QqCXRhYmxl
OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJvbGwuY2Mn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByb2xsLmNjCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTIwNDE4MDk0ODUwLTQ0bzB1ZXlhdDdlanUyenQKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS90cngvdHJ4MHJvbGwuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA0MTgxMDQ5MTItMmIxZGRkdDVuMG5lenpwMQpAQCAtNjQ2LDggKzY0Niw3IEBAIHRyeF9y
b2xsYmFja19hY3RpdmUoCiAJCQlpYl9sb2dmKElCX0xPR19MRVZFTF9XQVJOLAogCQkJCSJEcm9w
cGluZyB0YWJsZSAnJXMnLCB3aXRoIGlkICIgVUlOVDY0UEYgIiAiCiAJCQkJImluIHJlY292ZXJ5
IiwKLQkJCQl0YWJsZS0+bmFtZSwKLQkJCQkoaWJfdWludDY0X3QpIHRyeC0+dGFibGVfaWQpOwor
CQkJCXRhYmxlLT5uYW1lLCB0cngtPnRhYmxlX2lkKTsKIAogCQkJZXJyID0gcm93X2Ryb3BfdGFi
bGVfZm9yX215c3FsKHRhYmxlLT5uYW1lLCB0cngsIFRSVUUpOwogCQkJdHJ4X2NvbW1pdF9mb3Jf
bXlzcWwodHJ4KTsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku