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

IDM4MzkgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0xNgogICAgICByb3dfdW5kb19tb2RfcmVtb3Zl
X2NsdXN0X2xvdygpOiBUZW1wb3JhcmlseSBkaXNhYmxlCiAgICAgIHRoZSBmYWlsaW5nIGFzc2Vy
dGlvbnMgb24gcmVjX2dldF90cnhfaWQoKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHVtb2QuY2MKIDM4MzggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0xNgog
ICAgICBXTCM2MjU1IHByZXBhcmF0aW9uOiBBZGQgcm9sbGJhY2sgYXNzZXJ0aW9ucyBvbiBEQl9U
UlhfSUQgPT0gdHJ4LT5pZC4KICAgICAgCiAgICAgIHJlY19nZXRfdHJ4X2lkKCk6IE5ldyBmdW5j
dGlvbiwgYXZhaWxhYmxlIGluIGRlYnVnIGJ1aWxkcy4KICAgICAgCiAgICAgIHJvd191bmRvX2lu
c19yZW1vdmVfY2x1c3RfcmVjKCksIHJvd191bmRvX21vZF9jbHVzdF9sb3coKTogQXNzZXJ0IHRo
YXQKICAgICAgcmVjX2dldF90cnhfaWQoKSBtYXRjaGVzIHRyeC0+aWQuCiAgICAgIAogICAgICBy
b3dfdW5kb19tb2RfcmVtb3ZlX2NsdXN0X2xvdygpOiBBc3NlcnQgdGhhdCByZWNfZ2V0X3RyeF9p
ZCgpIG1hdGNoZXMKICAgICAgdHJ4LT5pZCBhbmQgdGhlIHJlY29yZCBpcyBub3QgZGVsZXRlLW1h
cmtlZCwgb3IgdGhlIHRyYW5zYWN0aW9uIGlzCiAgICAgIFRSWF9ESUNUX09QX1RBQkxFLiAgRm9y
IHNvbWUgcmVhc29uLCB0aGVzZSBhc3NlcnRpb25zIHdvdWxkIGZhaWwgZHVyaW5nCiAgICAgIGEg
cm9sbGJhY2sgaW4gQUREIEZPUkVJR04gS0VZIChpbm5vZGItaW5kZXgudGVzdCwgaW5ub2RiXzE2
ay50ZXN0KS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Jl
bTByZWMuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3JlbS9yZW0wcmVjLmNjCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzB1bW9kLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1v
ZC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuY2MJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MTYxMTIxMTktMGhubTg2cjg4N2Zjdmo1YworKysgYi9z
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1vZC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEyMDUxNjEzMjcyMy1rbjNidjF2djBlczAyMDVyCkBAIC0xOTQsMTYgKzE5NCwxMyBA
QCByb3dfdW5kb19tb2RfcmVtb3ZlX2NsdXN0X2xvdygKIAogCWJ0cl9jdXIgPSBidHJfcGN1cl9n
ZXRfYnRyX2N1cigmbm9kZS0+cGN1cik7CiAKKyNpZiAwIC8qIFRPRE86IGZpbmQgb3V0IHdoeSB0
aGVzZSBmYWlsICovCiAJdXRfYWQocmVjX2dldF90cnhfaWQoYnRyX2N1cl9nZXRfcmVjKGJ0cl9j
dXIpLAogCQkJICAgICBidHJfY3VyX2dldF9pbmRleChidHJfY3VyKSkKLQkgICAgICA9PSB0aHJf
Z2V0X3RyeCh0aHIpLT5pZAotCSAgICAgIC8qIFRPRE86IHdoeSBpcyB0aGUgYmVsb3cgbmVlZGVk
PwotCSAgICAgIGlubm9kYi5pbm5vZGItaW5kZXggaW5ub2RiLmlubm9kYl8xNmsgZmFpbHMgb3Ro
ZXJ3aXNlICovCi0JICAgICAgfHwgdGhyX2dldF90cngodGhyKS0+ZGljdF9vcGVyYXRpb24gPT0g
VFJYX0RJQ1RfT1BfVEFCTEUpOworCSAgICAgID09IHRocl9nZXRfdHJ4KHRociktPmlkKTsKIAl1
dF9hZCghcmVjX2dldF9kZWxldGVkX2ZsYWcoYnRyX2N1cl9nZXRfcmVjKGJ0cl9jdXIpLAotCQkJ
CSAgICBkaWN0X3RhYmxlX2lzX2NvbXAobm9kZS0+dGFibGUpKQotCSAgICAgIC8qIFRPRE86IHJl
bW92ZSB0aGUgYmVsb3cgKi8KLQkgICAgICB8fCB0aHJfZ2V0X3RyeCh0aHIpLT5kaWN0X29wZXJh
dGlvbiA9PSBUUlhfRElDVF9PUF9UQUJMRSk7CisJCQkJICAgIGRpY3RfdGFibGVfaXNfY29tcChu
b2RlLT50YWJsZSkpKTsKKyNlbmRpZgogCiAJaWYgKG1vZGUgPT0gQlRSX01PRElGWV9MRUFGKSB7
CiAJCWVyciA9IGJ0cl9jdXJfb3B0aW1pc3RpY19kZWxldGUoYnRyX2N1ciwgMCwgbXRyKQoKTm8g
YnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=