From: marko.makela
Date: June 14 2012 6:51am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3977 to 3978) WL#6255
List-Archive: http://lists.mysql.com/commits/144226
Message-Id: <20120614065145.11680.7528.3978@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NzggTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xNAogICAgICBXTCM2MjU1IHJiOjExMDUgUHJv
YmxlbSAyNSAobWVtb3J5IGNvcnJ1cHRpb24pIGZpeC4KICAgICAgCiAgICAgIHJvd19pbnNfc2Vj
X2luZGV4X2VudHJ5X2xvdygpOiBQYXNzIG9mZnNldHNfaGVhcCB0byB0aGUgQi10cmVlIGZ1bmN0
aW9ucy4KICAgICAgT3RoZXJ3aXNlLCB0aGUgZHR1cGxlX3QqIGVudHJ5IGNvdWxkIGJlIGZyZWVk
IGFuZCBvdmVyd3JpdHRlbiBpbgogICAgICBidHJfcGFnZV9zcGxpdF9hbmRfaW5zZXJ0KCksIHdo
aWNoIGludm9rZXMgbWVtX2hlYXBfZW1wdHkoKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jYwogMzk3NyBNYXJrbyBNw6RrZWzDpAkyMDEyLTA2LTEz
CiAgICAgIFdMIzU1MjYgcmI6MTEwNSBQcm9ibGVtIDI0IGZpeC4KICAgICAgCiAgICAgIGlubm9i
YXNlX3JlY190b19teXNxbCgpOiBJZiBjb2xfbWFwW10gbWFwcyBhIGNvbHVtbiBvdXRzaWRlIDAu
Lm5fZmllbGRzLTEsCiAgICAgIHNraXAgdGhlIGNvbHVtbi4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzBpbnMuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTMy
MDIyNDQtcmRzZWtraDI5aWR1dmx3egorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5z
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjE0MDY0OTI4LXY5ZjZhaXdz
bGRlY3BtdHQKQEAgLTI0ODEsNyArMjQ4MSw3IEBAIHJvd19pbnNfc2VjX2luZGV4X2VudHJ5X2xv
dygKIAkJZXhpc3RpbmcgcmVjb3JkICovCiAJCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMoCiAJ
CQlidHJfY3VyX2dldF9yZWMoJmN1cnNvciksIGluZGV4LCBvZmZzZXRzLAotCQkJVUxJTlRfVU5E
RUZJTkVELCAmaGVhcCk7CisJCQlVTElOVF9VTkRFRklORUQsICZvZmZzZXRzX2hlYXApOwogCiAJ
CWVyciA9IHJvd19pbnNfc2VjX2luZGV4X2VudHJ5X2J5X21vZGlmeSgKIAkJCWZsYWdzLCBtb2Rl
LCAmY3Vyc29yLCAmb2Zmc2V0cywKQEAgLTI0OTIsNyArMjQ5Miw3IEBAIHJvd19pbnNfc2VjX2lu
ZGV4X2VudHJ5X2xvdygKIAogCQlpZiAobW9kZSA9PSBCVFJfTU9ESUZZX0xFQUYpIHsKIAkJCWVy
ciA9IGJ0cl9jdXJfb3B0aW1pc3RpY19pbnNlcnQoCi0JCQkJZmxhZ3MsICZjdXJzb3IsICZvZmZz
ZXRzLCAmaGVhcCwKKwkJCQlmbGFncywgJmN1cnNvciwgJm9mZnNldHMsICZvZmZzZXRzX2hlYXAs
CiAJCQkJZW50cnksICZpbnNlcnRfcmVjLAogCQkJCSZiaWdfcmVjLCAwLCB0aHIsICZtdHIpOwog
CQl9IGVsc2UgewpAQCAtMjUwMiw3ICsyNTAyLDggQEAgcm93X2luc19zZWNfaW5kZXhfZW50cnlf
bG93KAogCQkJCWVyciA9IERCX0xPQ0tfVEFCTEVfRlVMTDsKIAkJCX0gZWxzZSB7CiAJCQkJZXJy
ID0gYnRyX2N1cl9wZXNzaW1pc3RpY19pbnNlcnQoCi0JCQkJCWZsYWdzLCAmY3Vyc29yLCAmb2Zm
c2V0cywgJmhlYXAsCisJCQkJCWZsYWdzLCAmY3Vyc29yLAorCQkJCQkmb2Zmc2V0cywgJm9mZnNl
dHNfaGVhcCwKIAkJCQkJZW50cnksICZpbnNlcnRfcmVjLAogCQkJCQkmYmlnX3JlYywgMCwgdGhy
LCAmbXRyKTsKIAkJCX0KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWls
cyku