From: marko.makela
Date: May 31 2012 6:23pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3919 to 3920)
List-Archive: http://lists.mysql.com/commits/144060
Message-Id: <201205311823.q4VINMp9027972@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MjAgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0zMQogICAgICBGaXggcmFjZSBjb25kaXRpb24g
aW4gSW5ub0RCIHRyYW5zYWN0aW9uIGNvbW1pdCBmbHVzaGluZy4KICAgICAgCiAgICAgIHRyeF9m
bHVzaF9sb2dfaWZfbmVlZGVkX2xvdygpLCB0cnhfZmx1c2hfbG9nX2lmX25lZWRlZCgpOgogICAg
ICBSZWZhY3RvcmVkIGNvbW1vbiBjb2RlLiBSZWFkIHNydl9mbHVzaF9sb2dfYXRfdHJ4X2NvbW1p
dCBvbmx5IG9uY2UuCiAgICAgIFByZXZpb3VzbHksIGEgcmFjZSBjb25kaXRpb24gY291bGQgb2Nj
dXIgaWYgc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0CiAgICAgIGNoYW5nZWQgZHVyaW5nIHRo
ZSBjaGVja3MuCiAgICAgIAogICAgICB0cnhfY29tbWl0KCksIHRyeF9wcmVwYXJlKCksIHRyeF9j
b21taXRfY29tcGxldGVfZm9yX215c3FsKCk6CiAgICAgIEludm9rZSB0cnhfZmx1c2hfbG9nX2lm
X25lZWRlZCgpIGluc3RlYWQgb2YgZHVwbGljYXRpbmcgdGhlIGNvZGUuCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4LmgKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS90cngvdHJ4MHRyeC5jYwogMzkxOSBNYXJrbyBNw6RrZWzDpAkyMDEyLTA1LTMxCiAg
ICAgIFdMIzYyNTU6IEZpeCBhIGJ1ZyB0aGF0IGFmZmVjdGVkIFJPV19GT1JNQVQgY29udmVyc2lv
bnMKICAgICAgb2YgdGFibGVzIHRoYXQgY29udGFpbiBmdWxsdGV4dCBpbmRleGVzLgogICAgICAK
ICAgICAgaW5ub2Jhc2VfY3JlYXRlX2tleV9kZWZzKCk6IFRlc3QgZm9yICJyZWJ1aWxkIiBpbnN0
ZWFkIG9mICJuZXdfcHJpbWFyeSIuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
dHJ4MHRyeC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTMxMTMyNzIzLWli
bHdxdzdxaHltNTFtYWYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUzMTE4MjIxMi11MWwzNzJveTc3Z2d2
bDZhCkBAIC0yMjQsMTMgKzIyNCwxMyBAQCB0cnhfZ2V0X3RyeF9ieV94aWQoCiAJY29uc3QgWElE
Kgl4aWQpOwkvKiE8IGluOiBYL09wZW4gWEEgdHJhbnNhY3Rpb24gaWRlbnRpZmllciAqLwogLyoq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCiBJZiByZXF1aXJlZCwgZmx1c2hlcyB0aGUgbG9nIHRvIGRpc2sgaWYg
d2UgY2FsbGVkIHRyeF9jb21taXRfZm9yX215c3FsKCkKLXdpdGggdHJ4LT5mbHVzaF9sb2dfbGF0
ZXIgPT0gVFJVRS4KLUByZXR1cm4JMCBvciBlcnJvciBudW1iZXIgKi8KK3dpdGggdHJ4LT5mbHVz
aF9sb2dfbGF0ZXIgPT0gVFJVRS4gKi8KIFVOSVZfSU5URVJOCi11bGludAordm9pZAogdHJ4X2Nv
bW1pdF9jb21wbGV0ZV9mb3JfbXlzcWwoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09Ki8K
LQl0cnhfdCoJdHJ4KTsJLyohPCBpbjogdHJ4IGhhbmRsZSAqLworCXRyeF90Kgl0cngpCS8qITwg
aW4vb3V0OiB0cmFuc2FjdGlvbiAqLworCV9fYXR0cmlidXRlX18oKG5vbm51bGwpKTsKIC8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgogTWFya3MgdGhlIGxhdGVzdCBTUUwgc3RhdGVtZW50IGVuZGVkLiAqLwog
VU5JVl9JTlRFUk4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngw
dHJ4LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmNjCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTMxMTMyNzIzLWlibHdxdzdxaHltNTFtYWYKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEyMDUzMTE4MjIxMi11MWwzNzJveTc3Z2d2bDZhCkBAIC05ODcsNiArOTg3LDUxIEBA
IHRyeF9maW5hbGl6ZV9mb3JfZnRzKAogCXRyeC0+ZnRzX3RyeCA9IE5VTEw7CiB9CiAKKy8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgorSWYgcmVxdWlyZWQsIGZsdXNoZXMgdGhlIGxvZyB0byBkaXNrIGJhc2Vk
IG9uIHRoZSB2YWx1ZSBvZgoraW5ub2RiX2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0LiAqLworc3Rh
dGljIF9fYXR0cmlidXRlX18oKG5vbm51bGwpKQordm9pZAordHJ4X2ZsdXNoX2xvZ19pZl9uZWVk
ZWRfbG93KAorLyo9PT09PT09PT09PT09PT09PT09PT09PT0qLworCWxzbl90CWxzbikJLyohPCBp
bjogbHNuIHVwIHRvIHdoaWNoIGxvZ3MgYXJlIHRvIGJlCisJCQlmbHVzaGVkLiAqLworeworCXN3
aXRjaCAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0KSB7CisJY2FzZSAwOgorCQkvKiBEbyBu
b3RoaW5nICovCisJCWJyZWFrOworCWNhc2UgMToKKwkJLyogV3JpdGUgdGhlIGxvZyBhbmQgb3B0
aW9uYWxseSBmbHVzaCBpdCB0byBkaXNrICovCisJCWxvZ193cml0ZV91cF90byhsc24sIExPR19X
QUlUX09ORV9HUk9VUCwKKwkJCQlzcnZfdW5peF9maWxlX2ZsdXNoX21ldGhvZCAhPSBTUlZfVU5J
WF9OT1NZTkMpOworCQlicmVhazsKKwljYXNlIDI6CisJCS8qIFdyaXRlIHRoZSBsb2cgYnV0IGRv
IG5vdCBmbHVzaCBpdCB0byBkaXNrICovCisJCWxvZ193cml0ZV91cF90byhsc24sIExPR19XQUlU
X09ORV9HUk9VUCwgRkFMU0UpOworCisJCWJyZWFrOworCWRlZmF1bHQ6CisJCXV0X2Vycm9yOwor
CX0KK30KKworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovLyoqCitJZiByZXF1aXJlZCwgZmx1c2hlcyB0aGUgbG9n
IHRvIGRpc2sgYmFzZWQgb24gdGhlIHZhbHVlIG9mCitpbm5vZGJfZmx1c2hfbG9nX2F0X3RyeF9j
b21taXQuICovCitzdGF0aWMgX19hdHRyaWJ1dGVfXygobm9ubnVsbCkpCit2b2lkCit0cnhfZmx1
c2hfbG9nX2lmX25lZWRlZCgKKy8qPT09PT09PT09PT09PT09PT09PT0qLworCWxzbl90CWxzbiwJ
LyohPCBpbjogbHNuIHVwIHRvIHdoaWNoIGxvZ3MgYXJlIHRvIGJlCisJCQlmbHVzaGVkLiAqLwor
CXRyeF90Kgl0cngpCS8qITwgaW4vb3V0OiB0cmFuc2FjdGlvbiAqLworeworCXRyeC0+b3BfaW5m
byA9ICJmbHVzaGluZyBsb2ciOworCXRyeF9mbHVzaF9sb2dfaWZfbmVlZGVkX2xvdyhsc24pOwor
CXRyeC0+b3BfaW5mbyA9ICIiOworfQorCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIENvbW1pdHMgYSB0cmFuc2Fj
dGlvbi4gKi8KIFVOSVZfSU5URVJOCkBAIC0xMTUxLDI1ICsxMTk2LDggQEAgdHJ4X2NvbW1pdCgK
IAkJCSAgIHx8IHRoZF9yZXF1ZXN0ZWRfZHVyYWJpbGl0eSh0cngtPm15c3FsX3RoZCkKIAkJCSAg
ID09IEhBX0lHTk9SRV9EVVJBQklMSVRZKSB7CiAJCQkvKiBEbyBub3RoaW5nICovCi0JCX0gZWxz
ZSBpZiAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0ID09IDEpIHsKLQkJCWlmIChzcnZfdW5p
eF9maWxlX2ZsdXNoX21ldGhvZCA9PSBTUlZfVU5JWF9OT1NZTkMpIHsKLQkJCQkvKiBXcml0ZSB0
aGUgbG9nIGJ1dCBkbyBub3QgZmx1c2ggaXQgdG8gZGlzayAqLwotCi0JCQkJbG9nX3dyaXRlX3Vw
X3RvKGxzbiwgTE9HX1dBSVRfT05FX0dST1VQLAotCQkJCQkJRkFMU0UpOwotCQkJfSBlbHNlIHsK
LQkJCQkvKiBXcml0ZSB0aGUgbG9nIHRvIHRoZSBsb2cgZmlsZXMgQU5EIGZsdXNoCi0JCQkJdGhl
bSB0byBkaXNrICovCi0KLQkJCQlsb2dfd3JpdGVfdXBfdG8obHNuLCBMT0dfV0FJVF9PTkVfR1JP
VVAsIFRSVUUpOwotCQkJfQotCQl9IGVsc2UgaWYgKHNydl9mbHVzaF9sb2dfYXRfdHJ4X2NvbW1p
dCA9PSAyKSB7Ci0KLQkJCS8qIFdyaXRlIHRoZSBsb2cgYnV0IGRvIG5vdCBmbHVzaCBpdCB0byBk
aXNrICovCi0KLQkJCWxvZ193cml0ZV91cF90byhsc24sIExPR19XQUlUX09ORV9HUk9VUCwgRkFM
U0UpOwogCQl9IGVsc2UgewotCQkJdXRfZXJyb3I7CisJCQl0cnhfZmx1c2hfbG9nX2lmX25lZWRl
ZChsc24sIHRyeCk7CiAJCX0KIAogCQl0cngtPmNvbW1pdF9sc24gPSBsc247CkBAIC0xNDMwLDYz
ICsxNDU4LDI0IEBAIHRyeF9jb21taXRfZm9yX215c3FsKAogCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
IElmIHJlcXVpcmVkLCBmbHVzaGVzIHRoZSBsb2cgdG8gZGlzayBpZiB3ZSBjYWxsZWQgdHJ4X2Nv
bW1pdF9mb3JfbXlzcWwoKQotd2l0aCB0cngtPmZsdXNoX2xvZ19sYXRlciA9PSBUUlVFLgotQHJl
dHVybgkwIG9yIGVycm9yIG51bWJlciAqLword2l0aCB0cngtPmZsdXNoX2xvZ19sYXRlciA9PSBU
UlVFLiAqLwogVU5JVl9JTlRFUk4KLXVsaW50Cit2b2lkCiB0cnhfY29tbWl0X2NvbXBsZXRlX2Zv
cl9teXNxbCgKIC8qPT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCXRyeF90Kgl0cngpCS8q
ITwgaW46IHRyeCBoYW5kbGUgKi8KKwl0cnhfdCoJdHJ4KQkvKiE8IGluL291dDogdHJhbnNhY3Rp
b24gKi8KIHsKLQlsc25fdAlsc24JPSB0cngtPmNvbW1pdF9sc247Ci0KIAl1dF9hKHRyeCk7CiAK
LQlpZiAoIXRyeC0+bXVzdF9mbHVzaF9sb2dfbGF0ZXIpIHsKLQkJcmV0dXJuKDApOworCWlmICgh
dHJ4LT5tdXN0X2ZsdXNoX2xvZ19sYXRlcgorCSAgICB8fCB0aGRfcmVxdWVzdGVkX2R1cmFiaWxp
dHkodHJ4LT5teXNxbF90aGQpCisJICAgICAgID09IEhBX0lHTk9SRV9EVVJBQklMSVRZKSB7CisJ
CXJldHVybjsKIAl9CiAKLQl0cngtPm9wX2luZm8gPSAiZmx1c2hpbmcgbG9nIjsKLQotCXN3aXRj
aCAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0KSB7Ci0JY2FzZSAwOgotCQkvKiBEbyBub3Ro
aW5nICovCi0JCWJyZWFrOwotCWNhc2UgMToKLQkJaWYgKHRoZF9yZXF1ZXN0ZWRfZHVyYWJpbGl0
eSh0cngtPm15c3FsX3RoZCkKLQkJICAgID09IEhBX0lHTk9SRV9EVVJBQklMSVRZKSB7Ci0JCQli
cmVhazsKLQkJfQotCi0JCWlmIChzcnZfdW5peF9maWxlX2ZsdXNoX21ldGhvZCA9PSBTUlZfVU5J
WF9OT1NZTkMpIHsKLQkJCS8qIFdyaXRlIHRoZSBsb2cgYnV0IGRvIG5vdCBmbHVzaCBpdCB0byBk
aXNrICovCi0KLQkJCWxvZ193cml0ZV91cF90byhsc24sIExPR19XQUlUX09ORV9HUk9VUCwgRkFM
U0UpOwotCQl9IGVsc2UgewotCQkJLyogV3JpdGUgdGhlIGxvZyB0byB0aGUgbG9nIGZpbGVzIEFO
RCBmbHVzaCB0aGVtIHRvCi0JCQlkaXNrICovCi0KLQkJCWxvZ193cml0ZV91cF90byhsc24sIExP
R19XQUlUX09ORV9HUk9VUCwgVFJVRSk7Ci0JCX0KLQotCQlicmVhazsKLQljYXNlIDI6Ci0JCWlm
ICh0aGRfcmVxdWVzdGVkX2R1cmFiaWxpdHkodHJ4LT5teXNxbF90aGQpCi0JCSAgICA9PSBIQV9J
R05PUkVfRFVSQUJJTElUWSkgewotCQkJYnJlYWs7Ci0JCX0KLQotCQkvKiBXcml0ZSB0aGUgbG9n
IGJ1dCBkbyBub3QgZmx1c2ggaXQgdG8gZGlzayAqLwotCQlsb2dfd3JpdGVfdXBfdG8obHNuLCBM
T0dfV0FJVF9PTkVfR1JPVVAsIEZBTFNFKTsKLQlkZWZhdWx0OgotCQl1dF9lcnJvcjsKLQl9CisJ
dHJ4X2ZsdXNoX2xvZ19pZl9uZWVkZWQodHJ4LT5jb21taXRfbHNuLCB0cngpOwogCiAJdHJ4LT5t
dXN0X2ZsdXNoX2xvZ19sYXRlciA9IEZBTFNFOwotCi0JdHJ4LT5vcF9pbmZvID0gIiI7Ci0KLQly
ZXR1cm4oMCk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtMTg1OSwyOCArMTg0OCw3IEBA
IHRyeF9wcmVwYXJlKAogCQlUT0RPOiBmaW5kIG91dCBpZiBNeVNRTCBob2xkcyBzb21lIG11dGV4
IHdoZW4gY2FsbGluZyB0aGlzLgogCQlUaGF0IHdvdWxkIHNwb2lsIG91ciBncm91cCBwcmVwYXJl
IGFsZ29yaXRobS4gKi8KIAotCQlpZiAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0ID09IDAp
IHsKLQkJCS8qIERvIG5vdGhpbmcgKi8KLQkJfSBlbHNlIGlmIChzcnZfZmx1c2hfbG9nX2F0X3Ry
eF9jb21taXQgPT0gMSkgewotCQkJaWYgKHNydl91bml4X2ZpbGVfZmx1c2hfbWV0aG9kID09IFNS
Vl9VTklYX05PU1lOQykgewotCQkJCS8qIFdyaXRlIHRoZSBsb2cgYnV0IGRvIG5vdCBmbHVzaCBp
dCB0byBkaXNrICovCi0KLQkJCQlsb2dfd3JpdGVfdXBfdG8obHNuLCBMT0dfV0FJVF9PTkVfR1JP
VVAsCi0JCQkJCQlGQUxTRSk7Ci0JCQl9IGVsc2UgewotCQkJCS8qIFdyaXRlIHRoZSBsb2cgdG8g
dGhlIGxvZyBmaWxlcyBBTkQgZmx1c2gKLQkJCQl0aGVtIHRvIGRpc2sgKi8KLQotCQkJCWxvZ193
cml0ZV91cF90byhsc24sIExPR19XQUlUX09ORV9HUk9VUCwgVFJVRSk7Ci0JCQl9Ci0JCX0gZWxz
ZSBpZiAoc3J2X2ZsdXNoX2xvZ19hdF90cnhfY29tbWl0ID09IDIpIHsKLQotCQkJLyogV3JpdGUg
dGhlIGxvZyBidXQgZG8gbm90IGZsdXNoIGl0IHRvIGRpc2sgKi8KLQotCQkJbG9nX3dyaXRlX3Vw
X3RvKGxzbiwgTE9HX1dBSVRfT05FX0dST1VQLCBGQUxTRSk7Ci0JCX0gZWxzZSB7Ci0JCQl1dF9l
cnJvcjsKLQkJfQorCQl0cnhfZmx1c2hfbG9nX2lmX25lZWRlZChsc24sIHRyeCk7CiAJfQogfQog
CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==