From: marko.makela
Date: May 24 2012 12:41pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3863 to 3864)
List-Archive: http://lists.mysql.com/commits/143942
Message-Id: <201205241241.q4OCfAYk007436@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NjQgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNAogICAgICByb3dfdW5kb19tb2RfcmVtb3Zl
X2NsdXN0X2xvdygpOiBFbmFibGUgYSBkZWJ1ZyBhc3NlcnRpb24gYW5kCiAgICAgIGFkZCBjb21t
ZW50cyBvbiBEQl9UUlhfSUQgYW5kIHRoZSBkZWxldGUtbWFyayBmbGFnLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1vZC5jYwogMzg2MyBNYXJrbyBNw6Rr
ZWzDpAkyMDEyLTA1LTI0CiAgICAgIFdMIzYyNTUgcHJlcGFyYXRpb24sIHRvIGFsbG93IGNyZWF0
aW9uIG9mIGEgZHVtbXkgcXVlX3Rocl90IG9iamVjdC4KICAgICAgCiAgICAgIHBhcnNfY29tcGxl
dGVfZ3JhcGhfZm9yX2V4ZWMoKTogQWxsb3cgbm9kZT1OVUxMLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcGFyczBwYXJzLmgKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9wYXJzL3BhcnMwcGFycy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHVtb2QuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9kLmNj
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI0MTIxMjI4LTV4MXM1czc0bjhw
M2V5Z28KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuY2MJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjQxMjM4NTAteWNycTBmdXp3aWtzajR5eApAQCAtMTk0
LDEzICsxOTQsMTEgQEAgcm93X3VuZG9fbW9kX3JlbW92ZV9jbHVzdF9sb3coCiAKIAlidHJfY3Vy
ID0gYnRyX3BjdXJfZ2V0X2J0cl9jdXIoJm5vZGUtPnBjdXIpOwogCi0jaWYgMCAvKiBUT0RPOiBm
aW5kIG91dCB3aHkgdGhlc2UgZmFpbCAqLwotCXV0X2FkKHJlY19nZXRfdHJ4X2lkKGJ0cl9jdXJf
Z2V0X3JlYyhidHJfY3VyKSwKLQkJCSAgICAgYnRyX2N1cl9nZXRfaW5kZXgoYnRyX2N1cikpCi0J
ICAgICAgPT0gdGhyX2dldF90cngodGhyKS0+aWQpOwotCXV0X2FkKCFyZWNfZ2V0X2RlbGV0ZWRf
ZmxhZyhidHJfY3VyX2dldF9yZWMoYnRyX2N1ciksCi0JCQkJICAgIGRpY3RfdGFibGVfaXNfY29t
cChub2RlLT50YWJsZSkpKTsKLSNlbmRpZgorCS8qIFdlIGFyZSBhYm91dCB0byByZW1vdmUgYW4g
b2xkLCBkZWxldGUtbWFya2VkIHZlcnNpb24gb2YgdGhlCisJcmVjb3JkIHRoYXQgbWF5IGhhdmUg
YmVlbiBkZWxldGUtbWFya2VkIGJ5IGEgZGlmZmVyZW50IHRyYW5zYWN0aW9uCisJdGhhbiB0aGUg
cm9sbGluZy1iYWNrIG9uZS4gKi8KKwl1dF9hZChyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhidHJfY3Vy
X2dldF9yZWMoYnRyX2N1ciksCisJCQkJICAgZGljdF90YWJsZV9pc19jb21wKG5vZGUtPnRhYmxl
KSkpOwogCiAJaWYgKG1vZGUgPT0gQlRSX01PRElGWV9MRUFGKSB7CiAJCWVyciA9IGJ0cl9jdXJf
b3B0aW1pc3RpY19kZWxldGUoYnRyX2N1ciwgMCwgbXRyKQoKTm8gYnVuZGxlIChyZWFzb246IHVz
ZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=