From: marko.makela
Date: May 31 2012 1:13pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3917 to 3918) WL#5223
List-Archive: http://lists.mysql.com/commits/144049
Message-Id: <201205311313.q4VDD7ZA022536@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MTggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0zMQogICAgICBXTCM1MjIzIGJ1ZyBmaXguCiAg
ICAgIAogICAgICB0cnhfY29tbWl0X2NvbXBsZXRlX2Zvcl9teXNxbCgpOiBSZWFkIHNydl9mbHVz
aF9sb2dfYXRfdHJ4X2NvbW1pdCBvbmx5IG9uY2UKICAgICAgaW4gdGhlIGZ1bmN0aW9uLCBiZWNh
dXNlIGl0IG1heSBjaGFuZ2Ugd2hpbGUgdGhlIGZ1bmN0aW9uIGlzIGV4ZWN1dGluZy4KCiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jYwogMzkxNyBNYXJr
byBNw6RrZWzDpAkyMDEyLTA1LTMxCiAgICAgIFdMIzYyNTUgZHVwbGljYXRlIGtleSBlcnJvciBy
ZXBvcnRpbmcKICAgICAgCiAgICAgIFdoZW4gYW4gZXJyb3Igb2NjdXJzIGR1cmluZyBvbmxpbmUg
cmVidWlsZCBhcHBseSwgY29udmVydCB0aGUgYnVmZmVyZWQgcm93CiAgICAgIGludG8gdGhlIE15
U1FMIHJlY29yZCBidWZmZXIsIHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgaW4gZXJyb3IgbWVzc2Fn
ZXMsCiAgICAgIHN1Y2ggYXMgZHVwbGljYXRlIGtleSBlcnJvci4KICAgICAgCiAgICAgIHJvd19s
b2dfdGFibGVfYXBwbHlfaW5zZXJ0KCksIHJvd19sb2dfdGFibGVfYXBwbHlfdXBkYXRlKCk6IElu
dm9rZQogICAgICBpbm5vYmFzZV9yZWNfdG9fbXlzcWwoKSBvbiBlcnJvci4KICAgICAgCiAgICAg
IFdoZW4gZGVsZXRlIGZhaWxzLCB3ZSB3aWxsIG5vdCBpbnZva2UgdGhlIGNvbnZlcnNpb24sIGJl
Y2F1c2UgdGhlIGJ1ZmZlcmVkCiAgICAgIHJlY29yZCBjb250YWlucyB0aGUgUFJJTUFSWSBLRVkg
aW4gdGhlIG5ldyB0YWJsZSwgd2hpY2ggY291bGQgZGlmZmVyIGZyb20KICAgICAgdGhlIG9sZCB0
YWJsZSAoZGlmZmVyZW50IGNvbHVtbnMpLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0
L3N1aXRlL2lubm9kYi9yL2lubm9kYi10YWJsZS1vbmxpbmUucmVzdWx0CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvdHJ4L3RyeDB0cnguY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguY2MJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MzExMjQyNDAtZmVlYTVnMm4yeDVn
anNlaQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmNjCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTIwNTMxMTMxMTU1LWZneW1vdXJyOXZtbm15enEKQEAgLTE0NDIs
MTUgKzE0NDIsMjIgQEAgdHJ4X2NvbW1pdF9jb21wbGV0ZV9mb3JfbXlzcWwoCiAKIAl1dF9hKHRy
eCk7CiAKKwlpZiAoIXRyeC0+bXVzdF9mbHVzaF9sb2dfbGF0ZXIpIHsKKwkJcmV0dXJuKDApOwor
CX0KKwogCXRyeC0+b3BfaW5mbyA9ICJmbHVzaGluZyBsb2ciOwogCi0JaWYgKCF0cngtPm11c3Rf
Zmx1c2hfbG9nX2xhdGVyKSB7Ci0JCS8qIERvIG5vdGhpbmcgKi8KLQl9IGVsc2UgaWYgKHNydl9m
bHVzaF9sb2dfYXRfdHJ4X2NvbW1pdCA9PSAwCi0JCSAgIHx8IHRoZF9yZXF1ZXN0ZWRfZHVyYWJp
bGl0eSh0cngtPm15c3FsX3RoZCkKLQkJICAgPT0gSEFfSUdOT1JFX0RVUkFCSUxJVFkpIHsKKwlz
d2l0Y2ggKHNydl9mbHVzaF9sb2dfYXRfdHJ4X2NvbW1pdCkgeworCWNhc2UgMDoKIAkJLyogRG8g
bm90aGluZyAqLwotCX0gZWxzZSBpZiAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0ID09IDEp
IHsKKwkJYnJlYWs7CisJY2FzZSAxOgorCQlpZiAodGhkX3JlcXVlc3RlZF9kdXJhYmlsaXR5KHRy
eC0+bXlzcWxfdGhkKQorCQkgICAgPT0gSEFfSUdOT1JFX0RVUkFCSUxJVFkpIHsKKwkJCWJyZWFr
OworCQl9CisKIAkJaWYgKHNydl91bml4X2ZpbGVfZmx1c2hfbWV0aG9kID09IFNSVl9VTklYX05P
U1lOQykgewogCQkJLyogV3JpdGUgdGhlIGxvZyBidXQgZG8gbm90IGZsdXNoIGl0IHRvIGRpc2sg
Ki8KIApAQCAtMTQ2MSwxMiArMTQ2OCwxNyBAQCB0cnhfY29tbWl0X2NvbXBsZXRlX2Zvcl9teXNx
bCgKIAogCQkJbG9nX3dyaXRlX3VwX3RvKGxzbiwgTE9HX1dBSVRfT05FX0dST1VQLCBUUlVFKTsK
IAkJfQotCX0gZWxzZSBpZiAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0ID09IDIpIHsKIAot
CQkvKiBXcml0ZSB0aGUgbG9nIGJ1dCBkbyBub3QgZmx1c2ggaXQgdG8gZGlzayAqLworCQlicmVh
azsKKwljYXNlIDI6CisJCWlmICh0aGRfcmVxdWVzdGVkX2R1cmFiaWxpdHkodHJ4LT5teXNxbF90
aGQpCisJCSAgICA9PSBIQV9JR05PUkVfRFVSQUJJTElUWSkgeworCQkJYnJlYWs7CisJCX0KIAor
CQkvKiBXcml0ZSB0aGUgbG9nIGJ1dCBkbyBub3QgZmx1c2ggaXQgdG8gZGlzayAqLwogCQlsb2df
d3JpdGVfdXBfdG8obHNuLCBMT0dfV0FJVF9PTkVfR1JPVVAsIEZBTFNFKTsKLQl9IGVsc2Ugewor
CWRlZmF1bHQ6CiAJCXV0X2Vycm9yOwogCX0KIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3Mg
Zm9yIHB1c2ggZW1haWxzKS4=