From: marko.makela
Date: June 20 2012 12:24pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:4008 to 4009) WL#6255
List-Archive: http://lists.mysql.com/commits/144277
Message-Id: <20120620122422.16286.22979.4009@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQwMDkgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0yMAogICAgICBBZGp1c3QgaW5kZXggY2FyZGlu
YWxpdHkgc3RhdGlzdGljcyBjYWxjdWxhdGlvbiBmb3IgV0wjNjI1NS4KICAgICAgCiAgICAgIERv
IG5vdCBza2lwIHN0YXRpc3RpY3MgY2FsY3VsYXRpb24gaWYgdGhlIHRhYmxlIGlzIGJlaW5nIHJl
YnVpbHQgb25saW5lLgogICAgICBUaGUgb3V0Y29tZSBvZiB0aGUgZnVuY3Rpb24gZGljdF9pbmRl
eF9pc19vbmxpbmVfZGRsKCkgY2hhbmdlcyBhIGJpdCBpbgogICAgICBXTCM2MjU1LiBCZWZvcmUg
V0wjNjI1NSwgaXQgY291bGQgb25seSBob2xkIGZvciBzZWNvbmRhcnkgaW5kZXhlcy4KICAgICAg
QWZ0ZXIgV0wjNjI1NSwgaWYgZGljdF9pbmRleF9pc19vbmxpbmVfZGRsKCkgaG9sZHMgZm9yIGEg
Y2x1c3RlcmVkIGluZGV4LAogICAgICBpdCBtZWFucyB0aGF0IHRoZSB0YWJsZSBpcyBmdWxseSBh
Y2Nlc3NpYmxlLCBidXQgaXQgaXMgbWVyZWx5IGJlaW5nIHJlYnVpbHQKICAgICAgb25saW5lIGFu
ZCBhbGwgY2hhbmdlcyB0byB0aGUgdGFibGUgbXVzdCBiZSBsb2dnZWQuCiAgICAgIAogICAgICBJ
bmRleCBjYXJkaW5hbGl0eSBzdGF0aXN0aWNzIGNhbGN1bGF0aW9uIGRvZXMgbm90IG1vZGlmeSB0
aGUgdGFibGUuCiAgICAgIFRoZXJlZm9yZSwgaXQgbXVzdCBjb250aW51ZSAiYnVzaW5lc3MgYXMg
dXN1YWwiIGZvciB0YWJsZXMgdGhhdCBoYXBwZW4KICAgICAgdG8gYmUgc3ViamVjdGVkIHRvIG9u
bGluZSByZWJ1aWxkLgogICAgICAKICAgICAgVGhpcyBtaWdodCBoYXZlIGNhdXNlZCBWYWxncmlu
ZCB3YXJuaW5ncyBhYm91dCByZWFkaW5nIHVuaW5pdGlhbGl6ZWQgbWVtb3J5CiAgICAgIGluIG1h
aW4uaW5ub2RiX2ljcF9hbGwuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
ZGljdC9kaWN0MHN0YXRzLmNjCiA0MDA4IE1hcmtvIE3DpGtlbMOkCTIwMTItMDYtMjAKICAgICAg
V0wjNjI1NTogQWRkIGEgdGVzdCBjYXNlIHN1Z2dlc3RlZCBieSBKaW1teSBZYW5nLgoKICAgIG1v
ZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9mdHMvci9pbm5vZGItZnRzLWRk
bC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfZnRzL3QvaW5ub2RiLWZ0cy1k
ZGwudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3Qwc3Rh
dHMuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MHN0YXRzLmNjCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjIwMTAwMjIxLTc5dHNtOHhydmZwNzlrbWQKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3Qwc3RhdHMuY2MJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMjA2MjAxMjA5MjYtM2RtamsxaTI3NTdsZWhoagpAQCAtMzUyLDEwICsz
NTIsMTEgQEAgZGljdF9zdGF0c19zbmFwc2hvdF9jcmVhdGUoCiAJICAgICBpbmRleCAhPSBOVUxM
OwogCSAgICAgaW5kZXggPSBkaWN0X3RhYmxlX2dldF9uZXh0X2luZGV4KGluZGV4KSkgewogCi0J
CWlmIChpbmRleC0+dHlwZSAmIERJQ1RfRlRTCi0JCSAgICB8fCBkaWN0X2luZGV4X2lzX29ubGlu
ZV9kZGwoaW5kZXgpCisJCWlmICgoaW5kZXgtPnR5cGUgJiBESUNUX0ZUUykKIAkJICAgIHx8IGRp
Y3RfaW5kZXhfaXNfY29ycnVwdGVkKGluZGV4KQotCQkgICAgfHwgaW5kZXgtPnRvX2JlX2Ryb3Bw
ZWQpIHsKKwkJICAgIHx8IGluZGV4LT50b19iZV9kcm9wcGVkCisJCSAgICB8fCAoIWRpY3RfaW5k
ZXhfaXNfY2x1c3QoaW5kZXgpCisJCQkmJiBkaWN0X2luZGV4X2lzX29ubGluZV9kZGwoaW5kZXgp
KSkgewogCQkJY29udGludWU7CiAJCX0KIApAQCAtNDA0LDEwICs0MDUsMTEgQEAgZGljdF9zdGF0
c19zbmFwc2hvdF9jcmVhdGUoCiAJICAgICBpbmRleCAhPSBOVUxMOwogCSAgICAgaW5kZXggPSBk
aWN0X3RhYmxlX2dldF9uZXh0X2luZGV4KGluZGV4KSkgewogCi0JCWlmIChpbmRleC0+dHlwZSAm
IERJQ1RfRlRTCi0JCSAgICB8fCBkaWN0X2luZGV4X2lzX29ubGluZV9kZGwoaW5kZXgpCisJCWlm
ICgoaW5kZXgtPnR5cGUgJiBESUNUX0ZUUykKIAkJICAgIHx8IGRpY3RfaW5kZXhfaXNfY29ycnVw
dGVkKGluZGV4KQotCQkgICAgfHwgaW5kZXgtPnRvX2JlX2Ryb3BwZWQpIHsKKwkJICAgIHx8IGlu
ZGV4LT50b19iZV9kcm9wcGVkCisJCSAgICB8fCAoIWRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgp
CisJCQkmJiBkaWN0X2luZGV4X2lzX29ubGluZV9kZGwoaW5kZXgpKSkgewogCQkJY29udGludWU7
CiAJCX0KIApAQCAtNjA2LDggKzYwOCwxMCBAQCBkaWN0X3N0YXRzX3VwZGF0ZV90cmFuc2llbnRf
Zm9yX2luZGV4KAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KIAlkaWN0
X2luZGV4X3QqCWluZGV4KQkvKiE8IGluL291dDogaW5kZXggKi8KIHsKLQlpZiAoZGljdF9pbmRl
eF9pc19vbmxpbmVfZGRsKGluZGV4KSB8fCAoaW5kZXgtPnR5cGUgJiBESUNUX0ZUUykKLQkgICAg
fHwgZGljdF9pbmRleF9pc19jb3JydXB0ZWQoaW5kZXgpKSB7CisJaWYgKChpbmRleC0+dHlwZSAm
IERJQ1RfRlRTKQorCSAgICB8fCBkaWN0X2luZGV4X2lzX2NvcnJ1cHRlZChpbmRleCkKKwkgICAg
fHwgKCFkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KQorCQkmJiBkaWN0X2luZGV4X2lzX29ubGlu
ZV9kZGwoaW5kZXgpKSkgewogCQlyZXR1cm4oMCk7CiAJfQogCkBAIC0xOTYxLDcgKzE5NjUsNiBA
QCBkaWN0X3N0YXRzX3VwZGF0ZV9wZXJzaXN0ZW50KAogCWluZGV4ID0gZGljdF90YWJsZV9nZXRf
Zmlyc3RfaW5kZXgodGFibGUpOwogCiAJaWYgKGluZGV4ID09IE5VTEwKLQkgICAgfHwgZGljdF9p
bmRleF9pc19vbmxpbmVfZGRsKGluZGV4KQogCSAgICB8fCBkaWN0X2luZGV4X2lzX2NvcnJ1cHRl
ZChpbmRleCkKIAkgICAgfHwgKGluZGV4LT50eXBlIHwgRElDVF9VTklRVUUpICE9IChESUNUX0NM
VVNURVJFRCB8IERJQ1RfVU5JUVVFKSkgewogCkBAIC0yMjQ2LDEwICsyMjQ5LDExIEBAIGRpY3Rf
c3RhdHNfc2F2ZSgKIAkgICAgIGluZGV4ICE9IE5VTEw7CiAJICAgICBpbmRleCA9IGRpY3RfdGFi
bGVfZ2V0X25leHRfaW5kZXgoaW5kZXgpKSB7CiAKLQkJaWYgKGluZGV4LT50eXBlICYgRElDVF9G
VFMKLQkJICAgIHx8IGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbChpbmRleCkKKwkJaWYgKChpbmRl
eC0+dHlwZSAmIERJQ1RfRlRTKQogCQkgICAgfHwgZGljdF9pbmRleF9pc19jb3JydXB0ZWQoaW5k
ZXgpCi0JCSAgICB8fCBpbmRleC0+dG9fYmVfZHJvcHBlZCkgeworCQkgICAgfHwgaW5kZXgtPnRv
X2JlX2Ryb3BwZWQKKwkJICAgIHx8ICghZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkKKwkJCSYm
IGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbChpbmRleCkpKSB7CiAJCQljb250aW51ZTsKIAkJfQog
CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==