From: marko.makela
Date: May 16 2012 1:58pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3839 to 3840)
List-Archive: http://lists.mysql.com/commits/143836
Message-Id: <201205161358.q4GDweaD022789@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NDAgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0xNgogICAgICByb3dfbG9nX2FwcGx5KCk6IEFz
c2VydCB0aGF0IHRoZSBpbmRleCBpcyBhIHNlY29uZGFyeSBpbmRleC4KCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBsb2cuaAogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwbG9nLmNjCiAzODM5IE1hcmtvIE3DpGtlbMOkCTIwMTItMDUtMTYKICAg
ICAgcm93X3VuZG9fbW9kX3JlbW92ZV9jbHVzdF9sb3coKTogVGVtcG9yYXJpbHkgZGlzYWJsZQog
ICAgICB0aGUgZmFpbGluZyBhc3NlcnRpb25zIG9uIHJlY19nZXRfdHJ4X2lkKCkuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9kLmNjCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MGxvZy5oJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvcm93MGxvZy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTIwNTE2MTMyNzIzLWtuM2J2MXZ2MGVzMDIwNXIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL3JvdzBsb2cuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUxNjEz
NTcyOC1hNHBhYXBoaWZzcGVib3g3CkBAIC04Myw3ICs4Myw3IEBAIHJvd19sb2dfYXBwbHkoCiAv
Kj09PT09PT09PT0qLwogCXRyeF90KgkJdHJ4LAkvKiE8IGluOiB0cmFuc2FjdGlvbiAoZm9yIGNo
ZWNraW5nIGlmCiAJCQkJdGhlIG9wZXJhdGlvbiB3YXMgaW50ZXJydXB0ZWQpICovCi0JZGljdF9p
bmRleF90KglpbmRleCwJLyohPCBpbi9vdXQ6IGluZGV4ICovCisJZGljdF9pbmRleF90KglpbmRl
eCwJLyohPCBpbi9vdXQ6IHNlY29uZGFyeSBpbmRleCAqLwogCXN0cnVjdCBUQUJMRSoJdGFibGUp
CS8qITwgaW4vb3V0OiBNeVNRTCB0YWJsZQogCQkJCShmb3IgcmVwb3J0aW5nIGR1cGxpY2F0ZXMp
ICovCiAJX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fybl91bnVzZWRfcmVzdWx0KSk7Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYycKLS0tIGEvc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEyMDUxNjEzMjcyMy1rbjNidjF2djBlczAyMDVyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBsb2cuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MTYxMzU3
MjgtYTRwYWFwaGlmc3BlYm94NwpAQCAtMTAzMyw3ICsxMDMzLDcgQEAgcm93X2xvZ19hcHBseSgK
IC8qPT09PT09PT09PSovCiAJdHJ4X3QqCQl0cngsCS8qITwgaW46IHRyYW5zYWN0aW9uIChmb3Ig
Y2hlY2tpbmcgaWYKIAkJCQl0aGUgb3BlcmF0aW9uIHdhcyBpbnRlcnJ1cHRlZCkgKi8KLQlkaWN0
X2luZGV4X3QqCWluZGV4LAkvKiE8IGluL291dDogaW5kZXggKi8KKwlkaWN0X2luZGV4X3QqCWlu
ZGV4LAkvKiE8IGluL291dDogc2Vjb25kYXJ5IGluZGV4ICovCiAJc3RydWN0IFRBQkxFKgl0YWJs
ZSkJLyohPCBpbi9vdXQ6IE15U1FMIHRhYmxlCiAJCQkJKGZvciByZXBvcnRpbmcgZHVwbGljYXRl
cykgKi8KIHsKQEAgLTEwNDUsNiArMTA0NSw3IEBAIHJvd19sb2dfYXBwbHkoCiAJZHVwLm5fZHVw
ID0gMDsKIAogCXV0X2FkKGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbChpbmRleCkpOworCXV0X2Fk
KCFkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSk7CiAKIAlsb2dfZnJlZV9jaGVjaygpOwogCgpO
byBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==