From: marko.makela
Date: March 29 2012 8:03am
Subject: bzr push into mysql-trunk-wl5854 branch (marko.makela:3867 to 3868) WL#5854
List-Archive: http://lists.mysql.com/commits/143342
Message-Id: <201203290803.q2T83FYo013323@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NjggTWFya28gTcOka2Vsw6QJMjAxMi0wMy0yOQogICAgICBXTCM1ODU0IGNsZWFudXA6IEV4
cGxhaW4gd2h5IGluc2VydCB1bmRvIGxvZ2dpbmcgZG9lcyB3aWxsIHdvcmsgYXMgaXMuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmNjCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuY2MKIDM4NjcgTWFya28gTcOka2Vsw6QJMjAxMi0w
My0yNwogICAgICBXTCM1ODU0IElubm9EQjogT25saW5lIHJvdyBmb3JtYXQgY2hhbmdlcwogICAg
ICAKICAgICAgVGhpcyBpcyBwcmVwYXJhdGlvbiBmb3IgZGF0YSBkaWN0aW9uYXJ5IGNoYW5nZXMu
IFdlIHdpbGwgYWxsb3cKICAgICAgbXVsdGlwbGUgdmVyc2lvbnMgb2YgdGhlIGNsdXN0ZXJlZCBp
bmRleCB0byBleGlzdCBpbiB0aGUgZGF0YQogICAgICBkaWN0aW9uYXJ5LiBUaGUgaGVhZCBvZiB0
YWJsZS0+aW5kZXhlcyB3aWxsIGJlIHRoZSBuZXdlc3QgY2x1c3RlcmVkCiAgICAgIGluZGV4LiBJ
dCBtYXkgYmUgZm9sbG93ZWQgYnkgb2xkZXIgY2x1c3RlcmVkIGluZGV4IHZlcnNpb25zIChpbgog
ICAgICBkZXNjZW5kaW5nIG9yZGVyIG9mIGluZGV4LT5pZCwgb3IgYWdlKSwgYW5kIGZpbmFsbHkg
YnkgYW55IHNlY29uZGFyeQogICAgICBpbmRleCBkZWZpbml0aW9ucy4KICAgICAgCiAgICAgIGRp
Y3RfdGFibGVfZ2V0X2NsdXN0ZXJlZF9pbmRleCgpOiBBbiBhbGlhcyBmb3IgZGljdF90YWJsZV9n
ZXRfZmlyc3RfaW5kZXgoKQogICAgICB3aGVuIHdlIG9ubHkgd2FudCB0aGUgY2x1c3RlcmVkIGlu
ZGV4LgogICAgICAKICAgICAgUmV2aWV3IGFsbCBsb29wcyB0aGF0IGxvb3Agb3ZlciB0YWJsZS0+
aW5kZXhlcyBhbmQgdHJ5IHRvIGVuc3VyZSB0aGF0CiAgICAgIHRoZXkgd2lsbCBza2lwIG9sZCBj
bHVzdGVyZWQgaW5kZXggdmVyc2lvbnMgd2hlbiBuZWNlc3NhcnkuCiAgICAgIAogICAgICBVc2Ug
ZGljdF9pbmRleF9pc19jbHVzdCgpIGluc3RlYWQgb2YgcG9pbnRlciBjb21wYXJpc29ucyB0byBk
ZXRlcm1pbmUKICAgICAgaWYgYW4gaW5kZXggaXMgY2x1c3RlcmVkLCBiZWNhdXNlIHRoZXJlIGNh
biBiZSBtdWx0aXBsZSBjbHVzdGVyZWQKICAgICAgaW5kZXggdmVyc2lvbnMgaW4gYSB0YWJsZS4K
ICAgICAgCiAgICAgIGRpY3RfaW5kZXhfaXNfb2xkX2NsdXN0KCk6IE5ldyBwcmVkaWNhdGUsIGZv
ciBkZXRlcm1pbmluZyBpZiBhbiBpbmRleAogICAgICBpcyBhbiBvbGQgdmVyc2lvbiBvZiBhIGNs
dXN0ZXJlZCBpbmRleC4KICAgICAgCiAgICAgIGRpY3RfaW5kZXhfaXNfbmV3ZXN0X2NsdXN0KCk6
IE5ldyBwcmVkaWNhdGUsIGZvciBkZXRlcm1pbmluZyBpZiBhbiBpbmRleAogICAgICBpcyB0aGUg
bmV3ZXN0IHZlcnNpb24gb2YgYSBjbHVzdGVyZWQgaW5kZXguCiAgICAgIAogICAgICBhcGkwYXBp
LmNjOiBJZiB0aGUgY2xpZW50IGhhbmRsZSBpcyB1c2luZyBhIHRvbyBvbGQgY2x1c3RlcmVkIGlu
ZGV4CiAgICAgIHZlcnNpb24sIGlzc3VlIGEgREJfREFUQV9NSVNNQVRDSCBlcnJvci4KICAgICAg
CiAgICAgIFRPRE86IEluIHVuZG8gbG9nIHJlY29yZHMsIGlkZW50aWZ5IHRoZSB0YWJsZSBieSB0
aGUgY2x1c3RlcmVkIGluZGV4CiAgICAgIGlkZW50aWZpZXIgaW5zdGVhZCBvZiB0aGUgdGFibGUg
aWRlbnRpZmllci4KICAgICAgCiAgICAgIFRPRE86IEluIGNvZGUgdGhhdCBmZXRjaGVzIHJlY29y
ZHMgZnJvbSB0aGUgY2x1c3RlcmVkIGluZGV4IG9yIGJ1aWxkcwogICAgICBwcmV2aW91cyB2ZXJz
aW9ucyBvZiByZWNvcmRzLCBjaG9vc2UgdGhlIGFwcHJvcHJpYXRlIGNsdXN0ZXJlZCBpbmRleAog
ICAgICB2ZXJzaW9uLgogICAgICAKICAgICAgVE9ETzogSW1wbGVtZW50IHRoZSBmb2xsb3dpbmcg
SEFfQUxURVJfRkxBR1M6CiAgICAgIAogICAgICBBRERfQ09MVU1OCiAgICAgIERST1BfQ09MVU1O
LCBBTFRFUl9DT0xVTU5fT1JERVIgKGZvciBjb2x1bW5zIG91dHNpZGUgdGhlIFBSSU1BUlkgS0VZ
KQogICAgICBBTFRFUl9DT0xVTU5fVFlQRSAoZm9yIG5vbi1pbmRleGVkIGNvbHVtbnMpCiAgICAg
IAogICAgICBUT0RPOiBJbXBsZW1lbnQgZ2FyYmFnZSBjb2xsZWN0aW9uIG9mIG9sZCBjbHVzdGVy
ZWQgaW5kZXggdmVyc2lvbnMuCiAgICAgIFRoYXQgaXMsIHJld3JpdGUgdGhlIGluZGV4X2lkIG9u
IG5vZGUgcG9pbnRlciBwYWdlcywgYW5kIHJld3JpdGUgYWxsCiAgICAgIGxlYWYgcGFnZXMgdG8g
dXNlIHRoZSBuZXdlc3QgY2x1c3RlcmVkIGluZGV4IHZlcnNpb24sIGFuZCBmaW5hbGx5IGRyb3AK
ICAgICAgYWxsIG9sZCBpbmRleGVzIGZyb20gYm90aCB0aGUgZGljdGlvbmFyeSBjYWNoZSBhbmQg
U1lTX0lOREVYRVMuIFRoaXMKICAgICAgY291bGQgYmUgc3BlZCB1cCBieSBzb21lIGRhdGEgc3Ry
dWN0dXJlIHRoYXQga2VlcHMgdHJhY2sgb2YgdGhlIHBhZ2UKICAgICAgbnVtYmVycyB0aGF0IGhh
dmUgbm90IHlldCBiZWVuIHVwZGF0ZWQsIG9yIHBhZ2UgbnVtYmVycyB0aGF0IGhhdmUKICAgICAg
YWxyZWFkeSBiZWVuIHVwZGF0ZWQuCgogICAgbW9kaWZpZWQ6CiAgICAgIC5ienItbXlzcWwvZGVm
YXVsdC5jb25mCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYXBpL2FwaTBhcGkuY2MKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2RpY3Qv
ZGljdDBkaWN0LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuY2MKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3Qwc3RhdHMuY2MKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9mdHMvZnRzMGZ0cy5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5u
b2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaAogICAgICBz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9yb3cwbXlzcWwuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93
MG15c3FsLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcGFycy9wYXJzMG9wdC5jYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL3BhcnMvcGFyczBwYXJzLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBpbnMuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jYwogICAgICBzdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwcHVyZ2UuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5j
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmNjCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzB1aW5zLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9k
LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bmRvLmNjCiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2Uvcm93L3JvdzB1cGQuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZl
cnMuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmNj
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdWlucy5jYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEyMDMyNzA4MzIwMy1kaXN4OTBoczQ2N2ZoZWdyCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5zLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTIwMzI5MDgwMTU0LWpmZzBhcnlhNWd0cm00OGcKQEAgLTI3NCwzNyArMjc0LDMxIEBAIHJv
d191bmRvX2luc19wYXJzZV91bmRvX3JlYygKIAlub2RlLT50YWJsZSA9IGRpY3RfdGFibGVfb3Bl
bl9vbl9pZCh0YWJsZV9pZCwgZGljdF9sb2NrZWQsIEZBTFNFKTsKIAogCS8qIFNraXAgdGhlIFVO
RE8gaWYgd2UgY2FuJ3QgZmluZCB0aGUgdGFibGUgb3IgdGhlIC5pYmQgZmlsZS4gKi8KLQlpZiAo
VU5JVl9VTkxJS0VMWShub2RlLT50YWJsZSA9PSBOVUxMKSkgewotCX0gZWxzZSBpZiAoVU5JVl9V
TkxJS0VMWShub2RlLT50YWJsZS0+aWJkX2ZpbGVfbWlzc2luZykpIHsKLQkJZGljdF90YWJsZV9j
bG9zZShub2RlLT50YWJsZSwgZGljdF9sb2NrZWQsIEZBTFNFKTsKLQkJbm9kZS0+dGFibGUgPSBO
VUxMOwotCX0gZWxzZSB7Ci0JCWNsdXN0X2luZGV4ID0gZGljdF90YWJsZV9nZXRfY2x1c3RlcmVk
X2luZGV4KG5vZGUtPnRhYmxlKTsKLQotCQlpZiAoY2x1c3RfaW5kZXggIT0gTlVMTCkgewotCQkJ
dHJ4X3VuZG9fcmVjX2dldF9yb3dfcmVmKAotCQkJCXB0ciwgY2x1c3RfaW5kZXgsICZub2RlLT5y
ZWYsIG5vZGUtPmhlYXApOwotCi0JCQlpZiAoIXJvd191bmRvX3NlYXJjaF9jbHVzdF90b19wY3Vy
KG5vZGUpKSB7Ci0KLQkJCQlkaWN0X3RhYmxlX2Nsb3NlKAotCQkJCQlub2RlLT50YWJsZSwgZGlj
dF9sb2NrZWQsIEZBTFNFKTsKLQotCQkJCW5vZGUtPnRhYmxlID0gTlVMTDsKLQkJCX0KKwlpZiAo
bm9kZS0+dGFibGUgPT0gTlVMTCkgeworCQlyZXR1cm47CisJfSBlbHNlIGlmIChub2RlLT50YWJs
ZS0+aWJkX2ZpbGVfbWlzc2luZykgeworCQlnb3RvIGVycl9leGl0OworCX0KIAotCQl9IGVsc2Ug
ewotCQkJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7Ci0JCQlmcHJpbnRmKHN0ZGVyciwgIiAg
SW5ub0RCOiB0YWJsZSAiKTsKLQkJCXV0X3ByaW50X25hbWUoc3RkZXJyLCBub2RlLT50cngsIFRS
VUUsCi0JCQkJICAgICAgbm9kZS0+dGFibGUtPm5hbWUpOwotCQkJZnByaW50ZihzdGRlcnIsICIg
aGFzIG5vIGluZGV4ZXMsICIKLQkJCQkiaWdub3JpbmcgdGhlIHRhYmxlXG4iKTsKKwljbHVzdF9p
bmRleCA9IGRpY3RfdGFibGVfZ2V0X2NsdXN0ZXJlZF9pbmRleChub2RlLT50YWJsZSk7CiAKLQkJ
CWRpY3RfdGFibGVfY2xvc2Uobm9kZS0+dGFibGUsIGRpY3RfbG9ja2VkLCBGQUxTRSk7CisJaWYg
KGNsdXN0X2luZGV4ICE9IE5VTEwpIHsKKwkJdHJ4X3VuZG9fcmVjX2dldF9yb3dfcmVmKAorCQkJ
cHRyLCBjbHVzdF9pbmRleCwgJm5vZGUtPnJlZiwgbm9kZS0+aGVhcCk7CiAKLQkJCW5vZGUtPnRh
YmxlID0gTlVMTDsKKwkJaWYgKCFyb3dfdW5kb19zZWFyY2hfY2x1c3RfdG9fcGN1cihub2RlKSkg
eworCQkJZ290byBlcnJfZXhpdDsKIAkJfQorCX0gZWxzZSB7CisJCXV0X3ByaW50X3RpbWVzdGFt
cChzdGRlcnIpOworCQlmcHJpbnRmKHN0ZGVyciwgIiAgSW5ub0RCOiB0YWJsZSAiKTsKKwkJdXRf
cHJpbnRfbmFtZShzdGRlcnIsIG5vZGUtPnRyeCwgVFJVRSwKKwkJCSAgICAgIG5vZGUtPnRhYmxl
LT5uYW1lKTsKKwkJZnByaW50ZihzdGRlcnIsICIgaGFzIG5vIGluZGV4ZXMsICIKKwkJCSJpZ25v
cmluZyB0aGUgdGFibGVcbiIpOworZXJyX2V4aXQ6CisJCWRpY3RfdGFibGVfY2xvc2Uobm9kZS0+
dGFibGUsIGRpY3RfbG9ja2VkLCBGQUxTRSk7CisJCW5vZGUtPnRhYmxlID0gTlVMTDsKIAl9CiB9
CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmNjJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTIwMzI3MDgzMjAzLWRpc3g5MGhzNDY3ZmhlZ3IKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS90cngvdHJ4MHJlYy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEy
MDMyOTA4MDE1NC1qZmcwYXJ5YTVndHJtNDhnCkBAIC0yNDYsOCArMjQ2LDEwIEBAIHRyeF91bmRv
X3BhZ2VfcmVwb3J0X2luc2VydCgKIAlwdHIgKz0gbWFjaF91bGxfd3JpdGVfbXVjaF9jb21wcmVz
c2VkKHB0ciwgdHJ4LT51bmRvX25vKTsKIAlwdHIgKz0gbWFjaF91bGxfd3JpdGVfbXVjaF9jb21w
cmVzc2VkKHB0ciwgaW5kZXgtPnRhYmxlLT5pZCk7CiAJLyotLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tKi8KLQkvKiBTdG9yZSB0aGVuIHRoZSBmaWVsZHMgcmVxdWlyZWQg
dG8gdW5pcXVlbHkgZGV0ZXJtaW5lIHRoZSByZWNvcmQKLQl0byBiZSBpbnNlcnRlZCBpbiB0aGUg
Y2x1c3RlcmVkIGluZGV4ICovCisJLyogU3RvcmUgdGhlbiB0aGUgZmllbGRzIHJlcXVpcmVkIHRv
IHVuaXF1ZWx5IGRldGVybWluZSB0aGUKKwlyZWNvcmQgdG8gYmUgaW5zZXJ0ZWQgaW4gdGhlIGNs
dXN0ZXJlZCBpbmRleC4gVGhpcyB3aWxsIHdvcmsKKwlldmVuIHdpdGggb25saW5lIHJvdyBmb3Jt
YXQgY2hhbmdlcywgYmVjYXVzZSB3ZSBkbyBub3QgYWxsb3cKKwlhbnkgY2hhbmdlcyB0byBQUklN
QVJZIEtFWSBjb2x1bW5zLiAqLwogCiAJZm9yIChpID0gMDsgaSA8IGRpY3RfaW5kZXhfZ2V0X25f
dW5pcXVlKGluZGV4KTsgaSsrKSB7CiAKQEAgLTMwMiw3ICszMDQsNyBAQCB0cnhfdW5kb19yZWNf
Z2V0X3BhcnMoCiAKIAlpZiAodHlwZV9jbXBsICYgVFJYX1VORE9fVVBEX0VYVEVSTikgewogCQkq
dXBkYXRlZF9leHRlcm4gPSBUUlVFOwotCQl0eXBlX2NtcGwgLT0gVFJYX1VORE9fVVBEX0VYVEVS
TjsKKwkJdHlwZV9jbXBsICY9IH5UUlhfVU5ET19VUERfRVhURVJOOwogCX0gZWxzZSB7CiAJCSp1
cGRhdGVkX2V4dGVybiA9IEZBTFNFOwogCX0KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZv
ciBwdXNoIGVtYWlscyku