From: marko.makela
Date: November 28 2012 7:18am
Subject: bzr push into mysql-trunk branch (marko.makela:5107 to 5108)
List-Archive: http://lists.mysql.com/commits/145397
Message-Id: <20121128071842.26834.62121.5108@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDUxMDggTWFya28gTcOka2Vsw6QJMjAxMi0xMS0yOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGJ1Zi5jYwogNTEwNyBrZXZpbi5sZXdpc0BvcmFjbGUuY29tCTIwMTItMTEtMjcg
W21lcmdlXQogICAgICBtZXJnZQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
YnVmL2J1ZjBidWYuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuY2MJcmV2
aWQ6a2V2aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDEyMTEyNzE1NTg0NS13MnM3NWJnNjJ5eWJ1ZHFl
CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuY2MJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMjExMjgwNzE3MTAtdGlrOWNoODRtaGpnZWt4NgpAQCAtMjY5OCwxNyAr
MjY5OCwyOSBAQCB3YWl0X3VudGlsX3VuZml4ZWQ6CiAKIAkJYnVmX3BhZ2VfZnJlZV9kZXNjcmlw
dG9yKGJwYWdlKTsKIAotCQkvKiBEZWNvbXByZXNzIHRoZSBwYWdlIGFuZCBhcHBseSBidWZmZXJl
ZCBvcGVyYXRpb25zCi0JCXdoaWxlIG5vdCBob2xkaW5nIGJ1Zl9wb29sLT5tdXRleCBvciBibG9j
ay0+bXV0ZXguICovCisJCS8qIERlY29tcHJlc3MgdGhlIHBhZ2Ugd2hpbGUgbm90IGhvbGRpbmcK
KwkJYnVmX3Bvb2wtPm11dGV4IG9yIGJsb2NrLT5tdXRleC4gKi8KIAogCQkvKiBQYWdlIGNoZWNr
c3VtIHZlcmlmaWNhdGlvbiBpcyBhbHJlYWR5IGRvbmUgd2hlbgogCQl0aGUgcGFnZSBpcyByZWFk
IGZyb20gZGlzay4gSGVuY2UgcGFnZSBjaGVja3N1bQotCQl2ZXJpZmljYXRpb24gaXMgbm90IG5l
Y2VzYXJ5IHdoZW4gZGVjb21wcmVzc2luZyB0aGUgcGFnZS4gKi8KKwkJdmVyaWZpY2F0aW9uIGlz
IG5vdCBuZWNlc3Nhcnkgd2hlbiBkZWNvbXByZXNzaW5nIHRoZSBwYWdlLiAqLwogCQl1dF9hKGJ1
Zl96aXBfZGVjb21wcmVzcyhibG9jaywgRkFMU0UpKTsKIAogCQlpZiAoVU5JVl9MSUtFTFkoIXJl
Y3Zfbm9faWJ1Zl9vcGVyYXRpb25zKSkgewotCQkJaWJ1Zl9tZXJnZV9vcl9kZWxldGVfZm9yX3Bh
Z2UoYmxvY2ssIHNwYWNlLCBvZmZzZXQsCi0JCQkJCQkgICAgICB6aXBfc2l6ZSwgVFJVRSk7CisJ
CQl1bnNpZ25lZAlhY2Nlc3NlZDsKKworCQkJbXV0ZXhfZW50ZXIoJmJsb2NrLT5tdXRleCk7CisJ
CQlhY2Nlc3NlZCA9IGJ1Zl9wYWdlX2lzX2FjY2Vzc2VkKCZibG9jay0+cGFnZSk7CisJCQltdXRl
eF9leGl0KCZibG9jay0+bXV0ZXgpOworCisJCQlpZiAoYWNjZXNzZWQpIHsKKyNpZmRlZiBVTklW
X0lCVUZfQ09VTlRfREVCVUcKKwkJCQl1dF9hKGlidWZfY291bnRfZ2V0KHNwYWNlLCBvZmZzZXQp
ID09IDApOworI2VuZGlmIC8qIFVOSVZfSUJVRl9DT1VOVF9ERUJVRyAqLworCQkJfSBlbHNlIHsK
KwkJCQlpYnVmX21lcmdlX29yX2RlbGV0ZV9mb3JfcGFnZSgKKwkJCQkJYmxvY2ssIHNwYWNlLCBv
ZmZzZXQsIHppcF9zaXplLCBUUlVFKTsKKwkJCX0KIAkJfQogCiAJCS8qIFVuZml4IGFuZCB1bmxh
dGNoIHRoZSBibG9jay4gKi8KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt
YWlscyku