From: marko.makela
Date: May 30 2012 8:14pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3911 to 3912) WL#6255
List-Archive: http://lists.mysql.com/commits/144042
Message-Id: <201205302014.q4UKEUmQ013416@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MTIgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0zMAogICAgICBXTCM2MjU1IGJvZ3VzIGFzc2Vy
dGlvbiBmaXguCiAgICAgIAogICAgICByb3dfbG9nX3RhYmxlX2FwcGx5X3VwZGF0ZSgpIGNhbiBz
cGVjaWZ5IEJUUl9LRUVQX1BPU19GTEFHIHdpdGggYWxsIHRoZQogICAgICB1c3VhbCBvbmxpbmUg
ZmxhZ3MuIEFsbG93IGl0IGluIHRoZSBhc3NlcnRpb25zIGluIGJ0cjBjdXIuY2MuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MKIDM5MTEgTWFya28g
TcOka2Vsw6QJMjAxMi0wNS0zMAogICAgICBXTCM2MjU1IE1WQ0MgYnVnIGZpeDogRW5zdXJlIHRo
YXQgb2xkZXIgdHJhbnNhY3Rpb25zIGFyZSBkZW5pZWQgYWNjZXNzCiAgICAgIHRvIGEgdGFibGUg
dGhhdCBoYXMgYmVlbiByZWJ1aWx0LCB3aGV0aGVyIG9yIG5vdCBpdCBoYXBwZW5lZCBpbi1wbGFj
ZQogICAgICAoQUxHT1JJVEhNPUlOUExBQ0UpIG9yIGluIHRoZSBvbGQgd2F5IChBTEdPUklUSE09
Q09QWSkuCiAgICAgIAogICAgICBXaGVuIGEgdGFibGUgaXMgY3JlYXRlZCwgd2UgcmVjb3JkIHRo
ZSB0cnhfaWQgb2YgdGhlIGNyZWF0aW5nIGRhdGEKICAgICAgZGljdGlvbmFyeSB0cmFuc2FjdGlv
biBpbiBlYWNoIGluZGV4IG9mIHRoZSB0YWJsZSBpbiB0aGUgZGF0YSBkaWN0aW9uYXJ5CiAgICAg
IGNhY2hlLiBJbiB0aGlzIHdheSwgdHJhbnNhY3Rpb25zIHRoYXQgd2VyZSBzdGFydGVkIGJlZm9y
ZSB0aGUgdGFibGUKICAgICAgY3JlYXRpb24gKG9yIGNvcHlpbmcpIGNhbiBiZSBkZW5pZWQgYWNj
ZXNzIHRvIHRoZSBuZXcgdGFibGUuCiAgICAgIAogICAgICBUbyBiZSBleGFjdCwgdGhlcmUgYXJl
IHR3byB0cmFuc2FjdGlvbnMgaW52b2x2ZWQgaW4gRERMLiBPbmUgaXMgdGhlCiAgICAgIHVzZXIg
dHJhbnNhY3Rpb24gYXNzb2NpYXRlZCB3aXRoIHRoZSBNeVNRTCBjbGllbnQgY29ubmVjdGlvbi4g
Rm9yCiAgICAgIElubm9EQiBkYXRhIGRpY3Rpb25hcnkgb3BlcmF0aW9ucywgd2UgY3JlYXRlIGEg
ZGF0YSBkaWN0aW9uYXJ5IHRyYW5zYWN0aW9uLgogICAgICBUaGVvcmV0aWNhbGx5LCBvdGhlciB0
cmFuc2FjdGlvbnMgY291bGQgc3RhcnQgYmV0d2VlbiB0aGUgcHJlYnVpbHQtPnRyeAogICAgICBh
bmQgdGhlIGRpY3Rpb25hcnkgdHJ4LiBIb3dldmVyLCB0aGUgdGFibGUgY2Fubm90IGJlIG1vZGlm
aWVkIGR1cmluZyB0aGlzCiAgICAgIHRpbWUgZnJhbWUsIHRoYW5rcyB0byBhIG1ldGEtZGF0YSBs
b2NrIChNREwpLiBJbiBDUkVBVEUgVEFCTEUsIHRoZSB0YWJsZQogICAgICBkb2VzIG5vdCBleGlz
dCBiZWZvcmUgSW5ub0RCIHJldHVybnMsIGFuZCBpbiBBTFRFUiBUQUJMRSwgb3RoZXIgdHJhbnNh
Y3Rpb25zCiAgICAgIGFyZSBibG9ja2VkIGZyb20gYWNjZXNzaW5nIHRoZSB0YWJsZSB3aGlsZSB0
aGUgdGFibGUgY29weSBpcyBiZWluZyBzZXQgdXAuCiAgICAgIAogICAgICBkaWN0X2NyZWF0ZV9p
bmRleF9zdGVwKCk6IEluaXRpYWxpemUgaW5kZXgtPnRyeF9pZCwgc28gdGhhdCBvbGRlcgogICAg
ICB0cmFuc2FjdGlvbnMgd2lsbCBiZSBkZW5pZWQgYWNjZXNzIHRvIGEgbmV3bHkgY3JlYXRlZCB0
YWJsZS4KICAgICAgCiAgICAgIGhhX2lubm9iYXNlOjpjb21taXRfaW5wbGFjZV9hbHRlcl90YWJs
ZSgpOiBSZW1vdmUgdGhlIGFkanVzdG1lbnQgb2YKICAgICAgaW5kZXgtPnRyeF9pZCBmb3IgQUxH
T1JJVEhNPUlOUExBQ0UuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYi1pbmRleC50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGNyZWEu
Y2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA1MzAxOTQ4MzctMTh0dG5tMm1vb2U3ZGwycAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0
ci9idHIwY3VyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTMwMjAwOTUx
LTNodGIxbjE5NThjNTkzY2MKQEAgLTE4ODksOCArMTg4OSw5IEBAIGJ0cl9jdXJfdXBkYXRlX2lu
X3BsYWNlKAogCXV0X2FkKGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbChpbmRleCkgPT0gISEoZmxh
Z3MgJiBCVFJfQ1JFQVRFX0ZMQUcpCiAJICAgICAgfHwgZGljdF9pbmRleF9pc19jbHVzdChpbmRl
eCkpOwogCXV0X2FkKCF0aHIgfHwgdGhyX2dldF90cngodGhyKS0+aWQgPT0gdHJ4X2lkKTsKLQl1
dF9hZCh0aHIgfHwgZmxhZ3MgPT0gKEJUUl9OT19VTkRPX0xPR19GTEFHIHwgQlRSX05PX0xPQ0tJ
TkdfRkxBRwotCQkJICAgICAgIHwgQlRSX0NSRUFURV9GTEFHIHwgQlRSX0tFRVBfU1lTX0ZMQUcp
KTsKKwl1dF9hZCh0aHIgfHwgKGZsYWdzICYgfkJUUl9LRUVQX1BPU19GTEFHKQorCSAgICAgID09
IChCVFJfTk9fVU5ET19MT0dfRkxBRyB8IEJUUl9OT19MT0NLSU5HX0ZMQUcKKwkJICB8IEJUUl9D
UkVBVEVfRkxBRyB8IEJUUl9LRUVQX1NZU19GTEFHKSk7CiAKICNpZmRlZiBVTklWX0RFQlVHCiAJ
aWYgKGJ0cl9jdXJfcHJpbnRfcmVjb3JkX29wcykgewpAQCAtMjAzMSw4ICsyMDMyLDkgQEAgYnRy
X2N1cl9vcHRpbWlzdGljX3VwZGF0ZSgKIAl1dF9hZChkaWN0X2luZGV4X2lzX29ubGluZV9kZGwo
aW5kZXgpID09ICEhKGZsYWdzICYgQlRSX0NSRUFURV9GTEFHKQogCSAgICAgIHx8IGRpY3RfaW5k
ZXhfaXNfY2x1c3QoaW5kZXgpKTsKIAl1dF9hZCghdGhyIHx8IHRocl9nZXRfdHJ4KHRociktPmlk
ID09IHRyeF9pZCk7Ci0JdXRfYWQodGhyIHx8IGZsYWdzID09IChCVFJfTk9fVU5ET19MT0dfRkxB
RyB8IEJUUl9OT19MT0NLSU5HX0ZMQUcKLQkJCSAgICAgICB8IEJUUl9DUkVBVEVfRkxBRyB8IEJU
Ul9LRUVQX1NZU19GTEFHKSk7CisJdXRfYWQodGhyIHx8IChmbGFncyAmIH5CVFJfS0VFUF9QT1Nf
RkxBRykKKwkgICAgICA9PSAoQlRSX05PX1VORE9fTE9HX0ZMQUcgfCBCVFJfTk9fTE9DS0lOR19G
TEFHCisJCSAgfCBCVFJfQ1JFQVRFX0ZMQUcgfCBCVFJfS0VFUF9TWVNfRkxBRykpOwogCiAJKm9m
ZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCwgKm9mZnNldHMsCiAJCQkJICAgVUxJ
TlRfVU5ERUZJTkVELCBoZWFwKTsKQEAgLTIzMDUsOCArMjMwNyw5IEBAIGJ0cl9jdXJfcGVzc2lt
aXN0aWNfdXBkYXRlKAogCXV0X2FkKGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbChpbmRleCkgPT0g
ISEoZmxhZ3MgJiBCVFJfQ1JFQVRFX0ZMQUcpCiAJICAgICAgfHwgZGljdF9pbmRleF9pc19jbHVz
dChpbmRleCkpOwogCXV0X2FkKCF0aHIgfHwgdGhyX2dldF90cngodGhyKS0+aWQgPT0gdHJ4X2lk
KTsKLQl1dF9hZCh0aHIgfHwgZmxhZ3MgPT0gKEJUUl9OT19VTkRPX0xPR19GTEFHIHwgQlRSX05P
X0xPQ0tJTkdfRkxBRwotCQkJICAgICAgIHwgQlRSX0NSRUFURV9GTEFHIHwgQlRSX0tFRVBfU1lT
X0ZMQUcpKTsKKwl1dF9hZCh0aHIgfHwgKGZsYWdzICYgfkJUUl9LRUVQX1BPU19GTEFHKQorCSAg
ICAgID09IChCVFJfTk9fVU5ET19MT0dfRkxBRyB8IEJUUl9OT19MT0NLSU5HX0ZMQUcKKwkJICB8
IEJUUl9DUkVBVEVfRkxBRyB8IEJUUl9LRUVQX1NZU19GTEFHKSk7CiAKIAlvcHRpbV9lcnIgPSBi
dHJfY3VyX29wdGltaXN0aWNfdXBkYXRlKAogCQlmbGFncywgY3Vyc29yLCBvZmZzZXRzLCBvZmZz
ZXRzX2hlYXAsIHVwZGF0ZSwKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt
YWlscyku