From: marko.makela
Date: November 14 2011 11:06am
Subject: bzr push into mysql-trunk branch (marko.makela:3604 to 3605) Bug#12682554
List-Archive: http://lists.mysql.com/commits/141921
X-Bug: 12682554
Message-Id: <201111141106.pAEB6epg015538@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MDUgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0xNAogICAgICBCdWcjMTI2ODI1NTQgRkFJTEVE
IEFTU0VSVCBBVCBIQU5ETEVSMEFMVEVSLkNDIElOIE1BTlkgVEVTVFMKICAgICAgCiAgICAgIGhh
X2lubm9iYXNlOjphZGRfaW5kZXgoKTogTG9jayB0aGUgZGF0YSBkaWN0aW9uYXJ5IGV2ZW4gd2hl
biBkcm9wcGluZwogICAgICBhIGNyZWF0ZWQgUFJJTUFSWSBLRVkgdGFibGUgKG5ld19wcmltYXJ5
PVRSVUUpLiBUaGlzIHNob3VsZCBmaXggdGhlIGFzc2VydGlvbgogICAgICB1dF9hKCFuZXdfcHJp
bWFyeSB8fCBwcmVidWlsdC0+dGFibGUtPm5fcmVmX2NvdW50ID09IDEpOwogICAgICAKICAgICAg
QXBwcm92ZWQgb24gSU0gYnkgSmltbXkgWWFuZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKIDM2MDQgY2h1Y2suYmVsbEBvcmFj
bGUuY29tCTIwMTEtMTEtMTEgW21lcmdlXQogICAgICBCVUcjMTI5MjkwMjggbWVyZ2UgZnJvbSBt
eXNxbC01LjUKCiAgICBtb2RpZmllZDoKICAgICAgY2xpZW50L215c3FsX3BsdWdpbi5jCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYycK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2aWQ6Y2h1
Y2suYmVsbEBvcmFjbGUuY29tLTIwMTExMTExMTk1OTM2LWpmZzZhNTYxdWhiOGUwbjgKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTExMTQxMTA1MzQtdGhyd3B4djVoZHJvOTl5dgpAQCAtOTYzLDE3
ICs5NjMsMTcgQEAgZXJyb3I6CiAKIAkJdHJ4LT5lcnJvcl9zdGF0ZSA9IERCX1NVQ0NFU1M7CiAK
KwkJaWYgKCFkaWN0X2xvY2tlZCkgeworCQkJcm93X215c3FsX2xvY2tfZGF0YV9kaWN0aW9uYXJ5
KHRyeCk7CisJCQlkaWN0X2xvY2tlZCA9IFRSVUU7CisJCX0KKwogCQlpZiAobmV3X3ByaW1hcnkp
IHsKIAkJCWlmIChpbmRleGVkX3RhYmxlICE9IHByZWJ1aWx0LT50YWJsZSkgewogCQkJCWRpY3Rf
dGFibGVfY2xvc2UoaW5kZXhlZF90YWJsZSwgZGljdF9sb2NrZWQpOwogCQkJCXJvd19tZXJnZV9k
cm9wX3RhYmxlKHRyeCwgaW5kZXhlZF90YWJsZSk7CiAJCQl9CiAJCX0gZWxzZSB7Ci0JCQlpZiAo
IWRpY3RfbG9ja2VkKSB7Ci0JCQkJcm93X215c3FsX2xvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7
Ci0JCQkJZGljdF9sb2NrZWQgPSBUUlVFOwotCQkJfQotCiAJCQlyb3dfbWVyZ2VfZHJvcF9pbmRl
eGVzKHRyeCwgaW5kZXhlZF90YWJsZSwKIAkJCQkJICAgICAgIGluZGV4LCBudW1fY3JlYXRlZCk7
CiAJCX0KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku