From: marko.makela
Date: May 29 2012 7:06pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3896 to 3898) WL#6255
List-Archive: http://lists.mysql.com/commits/144014
Message-Id: <201205291906.q4TJ6RiY003083@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4OTggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1IGJ1ZyBmaXguCiAg
ICAgIAogICAgICBoYV9pbm5vYmFzZTo6aW5wbGFjZV9hbHRlcl90YWJsZSgpOiBSZW1vdmUgYSBi
b2d1cyBkZWJ1ZyBhc3NlcnRpb24gb24KICAgICAgcHJlYnVpbHQtPnRhYmxlLT5uX3JlZl9jb3Vu
dCBhbmQgZXhwbGFpbiB3aHkgaXQgYmVjYW1lIGJvZ3VzLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwogMzg5NyBNYXJrbyBNw6Rr
ZWzDpAkyMDEyLTA1LTI5CiAgICAgIFdMIzYyNTUgYnVnIGZpeGVzLgogICAgICAKICAgICAgcm93
X2xvZ190YWJsZV9hcHBseV91cGRhdGUoKTogQ29ycmVjdCBhc3NlcnRpb25zIGFuZCBkb2N1bWVu
dGF0aW9uIG9uIG9sZF9way4KICAgICAgCiAgICAgIHJvd19sb2dfdGFibGVfYXBwbHlfb3AoKTog
UGFyc2UgYW5kIGluaXRpYWxpemUgb2xkX3BrIGluIHRoZSBzYW1lIHdheSBhcyBpbgogICAgICBy
b3dfbG9nX3RhYmxlX3VwZGF0ZSgpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwbG9nLmNjCiAzODk2IE1hcmtvIE3DpGtlbMOkCTIwMTItMDUtMjkKICAgICAg
V0wjNjI1NSBidWcgZml4ZXMuCiAgICAgIAogICAgICBwcmVwYXJlX2lucGxhY2VfYWx0ZXJfdGFi
bGVfZGljdCgpOiBQYXNzIHRoZSBzYW1lX3BrIGZsYWcgY29ycmVjdGx5IHRvCiAgICAgIHJvd19s
b2dfYWxsb2NhdGUoKS4KICAgICAgCiAgICAgIGhhX2lubm9iYXNlOjppbnBsYWNlX2FsdGVyX3Rh
YmxlKCk6IFJlbGF4IGFuIGFzc2VydGlvbiBvbgogICAgICB0YWJsZS0+bl9yZWZfY291bnQuIEEg
dGFibGUgdGhhdCBpcyBiZWluZyByZWJ1aWx0IG9ubGluZSBjYW4gYmUgYWNjZXNzZWQuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNj
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRl
ci5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjkxODM2MjctY3UzeWtnejllaWYwNWh2
eAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyOTE5MDUxMy1jZG93MTExbDUweDZrdDYxCkBA
IC0yNTU5LDExICsyNTU5LDggQEAgb29tOgogCQkJCXByZWJ1aWx0LT50YWJsZS0+ZmxhZ3MpOwog
CX0KIAotCS8qIG5fcmVmX2NvdW50IG11c3QgYmUgMSwgb3IgMiB3aGVuIHB1cmdlCi0JaGFwcGVu
cyB0byBiZSBleGVjdXRpbmcgb24gdGhpcyB2ZXJ5IHRhYmxlLiAqLwotCURCVUdfQVNTRVJUKGN0
eC0+b25saW5lCi0JCSAgICB8fCBjdHgtPmluZGV4ZWRfdGFibGUgPT0gcHJlYnVpbHQtPnRhYmxl
Ci0JCSAgICB8fCBwcmVidWlsdC0+dGFibGUtPm5fcmVmX2NvdW50IC0gMSA8PSAxKTsKKwkvKiBw
cmVidWlsdC0+dGFibGUtPm5fcmVmX2NvdW50IGNhbiBiZSBhbnl0aGluZyBoZXJlLCBnaXZlbgor
CXRoYXQgd2UgaG9sZCBhdCBtb3N0IGEgc2hhcmVkIGxvY2sgb24gdGhlIHRhYmxlLiAqLwogCXBy
ZWJ1aWx0LT50cngtPmVycm9yX2luZm8gPSBOVUxMOwogCWN0eC0+dHJ4LT5lcnJvcl9zdGF0ZSA9
IERCX1NVQ0NFU1M7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9y
b3cwbG9nLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI5MTgzNjI3LWN1M3lrZ3o5ZWlmMDVodngKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEyMDUyOTE5MDUxMy1jZG93MTExbDUweDZrdDYxCkBAIC0xMjE4LDcgKzEyMTgs
NyBAQCBhbGxfZG9uZToKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCiBSZXBsYXlzIGFuIHVwZGF0ZSBvcGVyYXRpb24gb24gYSB0YWJs
ZSB0aGF0IHdhcyByZWJ1aWx0LgogQHJldHVybiBEQl9TVUNDRVNTIG9yIGVycm9yIGNvZGUgKi8K
LXN0YXRpYyBfX2F0dHJpYnV0ZV9fKChub25udWxsKDEsMyw0LDUsNiw3LDgpLCB3YXJuX3VudXNl
ZF9yZXN1bHQpKQorc3RhdGljIF9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jl
c3VsdCkpCiBkYmVycl90CiByb3dfbG9nX3RhYmxlX2FwcGx5X3VwZGF0ZSgKIC8qPT09PT09PT09
PT09PT09PT09PT09PT0qLwpAQCAtMTI0MCw3ICsxMjQwLDcgQEAgcm93X2xvZ190YWJsZV9hcHBs
eV91cGRhdGUoCiAJY29uc3QgZHR1cGxlX3QqCQlvbGRfcGspCQkvKiE8IGluOiBQUklNQVJZIEtF
WSBhbmQKIAkJCQkJCURCX1RSWF9JRCxEQl9ST0xMX1BUUgogCQkJCQkJb2YgdGhlIG9sZCB2YWx1
ZSwKLQkJCQkJCW9yIE5VTEwgaWYgc2FtZV9wayAqLworCQkJCQkJb3IgUFJJTUFSWSBLRVkgaWYg
c2FtZV9wayAqLwogewogCWNvbnN0IGR0dXBsZV90Kglyb3c7CiAJZGljdF9pbmRleF90KglpbmRl
eCA9IGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KG5ld190YWJsZSk7CkBAIC0xMjUwLDggKzEy
NTAsOCBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X3VwZGF0ZSgKIAl1dF9hZChkdHVwbGVfZ2V0X25f
ZmllbGRzX2NtcChvbGRfcGspCiAJICAgICAgPT0gZGljdF9pbmRleF9nZXRfbl91bmlxdWUoaW5k
ZXgpKTsKIAl1dF9hZChkdHVwbGVfZ2V0X25fZmllbGRzKG9sZF9waykKLQkgICAgICA9PSBkaWN0
X2luZGV4X2dldF9uX3VuaXF1ZShpbmRleCkgKyAxKTsKLQl1dF9hZCghIW9sZF9wayA9PSBkdXAt
PmluZGV4LT5vbmxpbmVfbG9nLT5zYW1lX3BrKTsKKwkgICAgICA9PSBkaWN0X2luZGV4X2dldF9u
X3VuaXF1ZShpbmRleCkKKwkgICAgICArIChkdXAtPmluZGV4LT5vbmxpbmVfbG9nLT5zYW1lX3Br
ID8gMCA6IDIpKTsKIAogCXJvdyA9IHJvd19sb2dfdGFibGVfYXBwbHlfY29udmVydF9tcmVjKAog
CQltcmVjLCBvZmZzZXRzLCBoZWFwLCBuZXdfdGFibGUsIGFsdGVyZWRfdGFibGUsIGR1cCk7CkBA
IC0xNTY1LDIzICsxNTY1LDkgQEAgcm93X2xvZ190YWJsZV9hcHBseV9vcCgKIAkJaXMgbm90IGNo
YW5nZWQsIHRoZSBsb2cgd2lsbCBvbmx5IGNvbnRhaW4KIAkJREJfVFJYX0lELG5ld19yb3cuICov
CiAKLQkJb2xkX3BrID0gZHR1cGxlX2NyZWF0ZShoZWFwLCBuZXdfaW5kZXgtPm5fdW5pcSArIDEp
OwotCiAJCWlmIChkdXAtPmluZGV4LT5vbmxpbmVfbG9nLT5zYW1lX3BrKSB7CiAJCQl1dF9hZChu
ZXdfaW5kZXgtPm5fdW5pcSA9PSBkdXAtPmluZGV4LT5uX3VuaXEpOwogCi0JCQlpZiAoREFUQV9U
UlhfSURfTEVOICsgMiArIG1yZWMgPiBtcmVjX2VuZCkgewotCQkJCXJldHVybihOVUxMKTsKLQkJ
CX0KLQotCQkJLyogU2V0IERCX1RSWF9JRCAqLwotCQkJZGZpZWxkX3NldF9kYXRhKAotCQkJCWR0
dXBsZV9nZXRfbnRoX2ZpZWxkKG9sZF9waywKLQkJCQkJCSAgICAgbmV3X2luZGV4LT5uX3VuaXEp
LAotCQkJCW1yZWMsIERBVEFfVFJYX0lEX0xFTik7Ci0KLQkJCW1yZWMgKz0gREFUQV9UUlhfSURf
TEVOOwotCiAJCQlleHRyYV9zaXplID0gKm1yZWMrKzsKIAogCQkJaWYgKGV4dHJhX3NpemUgPj0g
MHg4MCkgewpAQCAtMTYwOCw2ICsxNTk0LDkgQEAgcm93X2xvZ190YWJsZV9hcHBseV9vcCgKIAkJ
CQlyZXR1cm4oTlVMTCk7CiAJCQl9CiAKKwkJCW9sZF9wayA9IGR0dXBsZV9jcmVhdGUoaGVhcCwg
bmV3X2luZGV4LT5uX3VuaXEpOworCQkJZGljdF90YWJsZV9jb3B5X3R5cGVzKG9sZF9waywgbmV3
X3RhYmxlKTsKKwogCQkJLyogQ29weSB0aGUgUFJJTUFSWSBLRVkgZmllbGRzIGZyb20gbXJlYyB0
byBvbGRfcGsuICovCiAJCQlmb3IgKHVsaW50IGkgPSAwOyBpIDwgbmV3X2luZGV4LT5uX3VuaXE7
IGkrKykgewogCQkJCWNvbnN0IHZvaWQqCWZpZWxkOwpAQCAtMTYzMiw3ICsxNjIxLDcgQEAgcm93
X2xvZ190YWJsZV9hcHBseV9vcCgKIAkJCQlyZXR1cm4oTlVMTCk7CiAJCQl9CiAKLQkJCXJlY19v
ZmZzX3NldF9uX2ZpZWxkcyhvZmZzZXRzLCBuZXdfaW5kZXgtPm5fdW5pcSArIDEpOworCQkJcmVj
X29mZnNfc2V0X25fZmllbGRzKG9mZnNldHMsIG5ld19pbmRleC0+bl91bmlxICsgMik7CiAJCQly
ZWNfaW5pdF9vZmZzZXRzX2NvbXBfb3JkaW5hcnkoCiAJCQkJbXJlYywgMCwgbmV3X2luZGV4LCAw
LCBvZmZzZXRzKTsKIApAQCAtMTY0MSw5ICsxNjMwLDE0IEBAIHJvd19sb2dfdGFibGVfYXBwbHlf
b3AoCiAJCQkJcmV0dXJuKE5VTEwpOwogCQkJfQogCi0JCQkvKiBDb3B5IHRoZSBQUklNQVJZIEtF
WSBmaWVsZHMgYW5kIERCX1RSWF9JRAotCQkJZnJvbSBtcmVjIHRvIG9sZF9way4gKi8KLQkJCWZv
ciAodWxpbnQgaSA9IDA7IGkgPD0gbmV3X2luZGV4LT5uX3VuaXE7IGkrKykgeworCQkJLyogQ29w
eSB0aGUgUFJJTUFSWSBLRVkgZmllbGRzIGFuZAorCQkJREJfVFJYX0lELCBEQl9ST0xMX1BUUiBm
cm9tIG1yZWMgdG8gb2xkX3BrLiAqLworCQkJb2xkX3BrID0gZHR1cGxlX2NyZWF0ZShoZWFwLCBu
ZXdfaW5kZXgtPm5fdW5pcSArIDIpOworCQkJZGljdF90YWJsZV9jb3B5X3R5cGVzKG9sZF9waywg
bmV3X3RhYmxlKTsKKworCQkJZm9yICh1bGludCBpID0gMDsKKwkJCSAgICAgaSA8IGRpY3RfaW5k
ZXhfZ2V0X25fdW5pcXVlKG5ld19pbmRleCkgKyAyOworCQkJICAgICBpKyspIHsKIAkJCQljb25z
dCB2b2lkKglmaWVsZDsKIAkJCQl1bGludAkJbGVuOwogCQkJCWRmaWVsZF90KglkZmllbGQ7CkBA
IC0xNjg4LDYgKzE2ODIsNyBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X29wKAogCQl9CiAKIAkJdXRf
YWQobmV4dF9tcmVjIDw9IG1yZWNfZW5kKTsKKwkJZHR1cGxlX3NldF9uX2ZpZWxkc19jbXAob2xk
X3BrLCBuZXdfaW5kZXgtPm5fdW5pcSk7CiAKIAkJewogCQkJdWxpbnQJCWxlbjsKCk5vIGJ1bmRs
ZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku