From: marko.makela
Date: May 28 2012 9:42am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3876 to 3877) WL#6255
List-Archive: http://lists.mysql.com/commits/143976
Message-Id: <201205280942.q4S9gI4x012566@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NzcgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOAogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
OiByb3dfaW5zX2R1cGxpY2F0ZV9lcnJvcl9pbl9jbHVzdCgpOgogICAgICBJbml0aWFsaXplIGVy
ciB3aGVuIHN1cHByZXNzaW5nIGxvY2tpbmcuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MKIDM4NzYgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOAog
ICAgICBXTCM2MjU1OiBJbXBsZW1lbnQgaW4tcGxhY2UgRFJPUCBQUklNQVJZIEtFWSAoRFJPUF9Q
S19JTkRFWCkKICAgICAgd2hlbiBBREQgUFJJTUFSWSBLRVkgaXMgc3BlY2lmaWVkIGF0IHRoZSBz
YW1lIHRpbWUuCiAgICAgIAogICAgICBpbm5vYmFzZV9mdHNfY2hlY2tfZG9jX2lkX2luZGV4X2lu
X2RlZigpOiBBZGQgYW4gb3B0aW9uYWwgb3V0cHV0IHBhcmFtZXRlcgogICAgICBmb3IgdGhlIEZU
U19ET0NfSUQgY29sdW1uIG51bWJlci4KICAgICAgCiAgICAgIGhhX2lubm9iYXNlOjpjaGVja19p
Zl9zdXBwb3J0ZWRfaW5wbGFjZV9hbHRlcigpOiBBbGxvdyBEUk9QX1BLX0lOREVYCiAgICAgIG9u
bHkgaWYgQUREX1BLX0lOREVYIGlzIHNwZWNpZmllZCBhdCB0aGUgc2FtZSB0aW1lLgogICAgICAK
ICAgICAgaGFfaW5ub2Jhc2U6OnByZXBhcmVfaW5wbGFjZV9hbHRlcl90YWJsZSgpOiBGb3IgRFJP
UF9QS19JTkRFWCwgZG8gbm90CiAgICAgIGNvbGxlY3QgdGhlIGNsdXN0ZXJlZCBpbmRleCBpbiBk
cm9wX2luZGV4W10uCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9ncm91cF9taW5f
bWF4X2lubm9kYi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJf
bXlzcWwucmVzdWx0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVy
LmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTIwNTI4MDg1NzI0LWQ4em42bmczODJ2MDFzZDIKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MGlucy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEy
MDUyODA5MzkzNC14a250dzRwcnE1c2lrbHpiCkBAIC0yMDA2LDYgKzIwMDYsNyBAQCByb3dfaW5z
X2R1cGxpY2F0ZV9lcnJvcl9pbl9jbHVzdCgKIAkJCWlmIChmbGFncyAmIEJUUl9OT19MT0NLSU5H
X0ZMQUcpIHsKIAkJCQkvKiBTZXQgbm8gbG9ja3Mgd2hlbiBhcHBseWluZyBsb2cKIAkJCQlpbiBv
bmxpbmUgdGFibGUgcmVidWlsZC4gKi8KKwkJCQllcnIgPSBEQl9TVUNDRVNTOwogCQkJfSBlbHNl
IGlmICh0cngtPmR1cGxpY2F0ZXMpIHsKIAogCQkJCS8qIElmIHRoZSBTUUwtcXVlcnkgd2lsbCB1
cGRhdGUgb3IgcmVwbGFjZQpAQCAtMjA1Myw2ICsyMDU0LDcgQEAgcm93X2luc19kdXBsaWNhdGVf
ZXJyb3JfaW5fY2x1c3QoCiAJCQlpZiAoZmxhZ3MgJiBCVFJfTk9fTE9DS0lOR19GTEFHKSB7CiAJ
CQkJLyogU2V0IG5vIGxvY2tzIHdoZW4gYXBwbHlpbmcgbG9nCiAJCQkJaW4gb25saW5lIHRhYmxl
IHJlYnVpbGQuICovCisJCQkJZXJyID0gREJfU1VDQ0VTUzsKIAkJCX0gZWxzZSBpZiAodHJ4LT5k
dXBsaWNhdGVzKSB7CiAKIAkJCQkvKiBJZiB0aGUgU1FMLXF1ZXJ5IHdpbGwgdXBkYXRlIG9yIHJl
cGxhY2UKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku