From: marko.makela
Date: June 28 2011 9:44am
Subject: bzr push into mysql-5.5 branch (marko.makela:3469 to 3470)
List-Archive: http://lists.mysql.com/commits/139953
Message-Id: <201106280944.p5S9iGYk019012@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0NzAgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cGFnZS9wYWdlMHppcC5jCiAzNDY5IERtaXRyeSBTaHVsZ2EJMjAxMS0wNi0yNCBbbWVyZ2VdCiAg
ICAgIE1hbnVhbCBtZXJnZSBvZiBwYXRjaCBmb3IgYnVnIzExNzU2MDEzIGZyb20gbXlzcWwtNS4x
IHRyZWUuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9zcF9zeW5jLnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3Qvc3Bfc3luYy50ZXN0CiAgICAgIHNxbC9zcC5jYwogICAgICBzcWwv
c3FsX2RiLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTB6
aXAuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwemlwLmMJcmV2aWQ6ZG1pdHJ5
LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNjIzMTcwMjU4LTh0MGV0a2U0eWZtaTVia3gKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwemlwLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA2MjgwOTAzNTUtazUzczd3bGRrajUwZjJoeQpAQCAtMTUxLDYgKzE1MSwyMCBA
QCBwYWdlX3ppcF9lbXB0eV9zaXplKAogI2VuZGlmIC8qICFVTklWX0hPVEJBQ0tVUCAqLwogCiAv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKK0dldHMgdGhlIG51bWJlciBvZiBlbGVtZW50cyBpbiB0aGUgZGVuc2UgcGFnZSBk
aXJlY3RvcnksCitpbmNsdWRpbmcgZGVsZXRlZCByZWNvcmRzICh0aGUgZnJlZSBsaXN0KS4KK0By
ZXR1cm4JbnVtYmVyIG9mIGVsZW1lbnRzIGluIHRoZSBkZW5zZSBwYWdlIGRpcmVjdG9yeSAqLwor
VU5JVl9JTkxJTkUKK3VsaW50CitwYWdlX3ppcF9kaXJfZWxlbXMoCisvKj09PT09PT09PT09PT09
PSovCisJY29uc3QgcGFnZV96aXBfZGVzX3QqCXBhZ2VfemlwKQkvKiE8IGluOiBjb21wcmVzc2Vk
IHBhZ2UgKi8KK3sKKwkvKiBFeGNsdWRlIHRoZSBwYWdlIGluZmltdW0gYW5kIHN1cHJlbXVtIGZy
b20gdGhlIHJlY29yZCBjb3VudC4gKi8KKwlyZXR1cm4ocGFnZV9kaXJfZ2V0X25faGVhcChwYWdl
X3ppcC0+ZGF0YSkgLSBQQUdFX0hFQVBfTk9fVVNFUl9MT1cpOworfQorCisvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIEdl
dHMgdGhlIHNpemUgb2YgdGhlIGNvbXByZXNzZWQgcGFnZSB0cmFpbGVyICh0aGUgZGVuc2UgcGFn
ZSBkaXJlY3RvcnkpLAogaW5jbHVkaW5nIGRlbGV0ZWQgcmVjb3JkcyAodGhlIGZyZWUgbGlzdCku
CiBAcmV0dXJuCWxlbmd0aCBvZiBkZW5zZSBwYWdlIGRpcmVjdG9yeSwgaW4gYnl0ZXMgKi8KQEAg
LTE2MCwxNCArMTc0LDQyIEBAIHBhZ2VfemlwX2Rpcl9zaXplKAogLyo9PT09PT09PT09PT09PSov
CiAJY29uc3QgcGFnZV96aXBfZGVzX3QqCXBhZ2VfemlwKQkvKiE8IGluOiBjb21wcmVzc2VkIHBh
Z2UgKi8KIHsKLQkvKiBFeGNsdWRlIHRoZSBwYWdlIGluZmltdW0gYW5kIHN1cHJlbXVtIGZyb20g
dGhlIHJlY29yZCBjb3VudC4gKi8KLQl1bGludAlzaXplID0gUEFHRV9aSVBfRElSX1NMT1RfU0la
RQotCQkqIChwYWdlX2Rpcl9nZXRfbl9oZWFwKHBhZ2VfemlwLT5kYXRhKQotCQkgICAtIFBBR0Vf
SEVBUF9OT19VU0VSX0xPVyk7Ci0JcmV0dXJuKHNpemUpOworCXJldHVybihQQUdFX1pJUF9ESVJf
U0xPVF9TSVpFICogcGFnZV96aXBfZGlyX2VsZW1zKHBhZ2VfemlwKSk7CiB9CiAKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgorR2V0cyBhbiBvZmZzZXQgdG8gdGhlIGNvbXByZXNzZWQgcGFnZSB0cmFpbGVyICh0aGUgZGVu
c2UgcGFnZSBkaXJlY3RvcnkpLAoraW5jbHVkaW5nIGRlbGV0ZWQgcmVjb3JkcyAodGhlIGZyZWUg
bGlzdCkuCitAcmV0dXJuCW9mZnNldCBvZiB0aGUgZGVuc2UgcGFnZSBkaXJlY3RvcnkgKi8KK1VO
SVZfSU5MSU5FCit1bGludAorcGFnZV96aXBfZGlyX3N0YXJ0X29mZnMoCisvKj09PT09PT09PT09
PT09PT09PT09Ki8KKwljb25zdCBwYWdlX3ppcF9kZXNfdCoJcGFnZV96aXAsCS8qITwgaW46IGNv
bXByZXNzZWQgcGFnZSAqLworCXVsaW50CQkJbl9kZW5zZSkJLyohPCBpbjogZGlyZWN0b3J5IHNp
emUgKi8KK3sKKwl1dF9hZChuX2RlbnNlICogUEFHRV9aSVBfRElSX1NMT1RfU0laRSA8IHBhZ2Vf
emlwX2dldF9zaXplKHBhZ2VfemlwKSk7CisKKwlyZXR1cm4ocGFnZV96aXBfZ2V0X3NpemUocGFn
ZV96aXApIC0gbl9kZW5zZSAqIFBBR0VfWklQX0RJUl9TTE9UX1NJWkUpOworfQorCisvKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8v
KioKK0dldHMgYSBwb2ludGVyIHRvIHRoZSBjb21wcmVzc2VkIHBhZ2UgdHJhaWxlciAodGhlIGRl
bnNlIHBhZ2UgZGlyZWN0b3J5KSwKK2luY2x1ZGluZyBkZWxldGVkIHJlY29yZHMgKHRoZSBmcmVl
IGxpc3QpLgorQHBhcmFtW2luXSBwYWdlX3ppcAljb21wcmVzc2VkIHBhZ2UKK0BwYXJhbVtpbl0g
bl9kZW5zZQludW1iZXIgb2YgZW50cmllcyBpbiB0aGUgZGlyZWN0b3J5CitAcmV0dXJuCXBvaW50
ZXIgdG8gdGhlIGRlbnNlIHBhZ2UgZGlyZWN0b3J5ICovCisjZGVmaW5lIHBhZ2VfemlwX2Rpcl9z
dGFydF9sb3cocGFnZV96aXAsIG5fZGVuc2UpCQkJXAorCSgocGFnZV96aXApLT5kYXRhICsgcGFn
ZV96aXBfZGlyX3N0YXJ0X29mZnMocGFnZV96aXAsIG5fZGVuc2UpKQorLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitHZXRz
IGEgcG9pbnRlciB0byB0aGUgY29tcHJlc3NlZCBwYWdlIHRyYWlsZXIgKHRoZSBkZW5zZSBwYWdl
IGRpcmVjdG9yeSksCitpbmNsdWRpbmcgZGVsZXRlZCByZWNvcmRzICh0aGUgZnJlZSBsaXN0KS4K
K0BwYXJhbVtpbl0gcGFnZV96aXAJY29tcHJlc3NlZCBwYWdlCitAcmV0dXJuCXBvaW50ZXIgdG8g
dGhlIGRlbnNlIHBhZ2UgZGlyZWN0b3J5ICovCisjZGVmaW5lIHBhZ2VfemlwX2Rpcl9zdGFydChw
YWdlX3ppcCkJCQkJCVwKKwlwYWdlX3ppcF9kaXJfc3RhcnRfbG93KHBhZ2VfemlwLCBwYWdlX3pp
cF9kaXJfZWxlbXMocGFnZV96aXApKQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIEdldHMgdGhlIHNpemUgb2YgdGhl
IGNvbXByZXNzZWQgcGFnZSB0cmFpbGVyICh0aGUgZGVuc2UgcGFnZSBkaXJlY3RvcnkpLAogb25s
eSBpbmNsdWRpbmcgdXNlciByZWNvcmRzIChleGNsdWRpbmcgdGhlIGZyZWUgbGlzdCkuCiBAcmV0
dXJuCWxlbmd0aCBvZiBkZW5zZSBwYWdlIGRpcmVjdG9yeSBjb21wcmlzaW5nIGV4aXN0aW5nIHJl
Y29yZHMsIGluIGJ5dGVzICovCkBAIC0yMjQyLDggKzIyODQsNyBAQCB6bGliX2RvbmU6CiAJfQog
CiAJLyogUmVzdG9yZSB0aGUgdW5jb21wcmVzc2VkIGNvbHVtbnMgaW4gaGVhcF9ubyBvcmRlci4g
Ki8KLQlzdG9yYWdlCT0gcGFnZV96aXAtPmRhdGEgKyBwYWdlX3ppcF9nZXRfc2l6ZShwYWdlX3pp
cCkKLQkJLSBuX2RlbnNlICogUEFHRV9aSVBfRElSX1NMT1RfU0laRTsKKwlzdG9yYWdlID0gcGFn
ZV96aXBfZGlyX3N0YXJ0X2xvdyhwYWdlX3ppcCwgbl9kZW5zZSk7CiAKIAlmb3IgKHNsb3QgPSAw
OyBzbG90IDwgbl9kZW5zZTsgc2xvdCsrKSB7CiAJCXJlY190KgkJcmVjCT0gcmVjc1tzbG90XTsK
QEAgLTI3MjgsOCArMjc2OSw3IEBAIHpsaWJfZG9uZToKIAkJcmV0dXJuKEZBTFNFKTsKIAl9CiAK
LQlzdG9yYWdlID0gcGFnZV96aXAtPmRhdGEgKyBwYWdlX3ppcF9nZXRfc2l6ZShwYWdlX3ppcCkK
LQkJLSBuX2RlbnNlICogUEFHRV9aSVBfRElSX1NMT1RfU0laRTsKKwlzdG9yYWdlID0gcGFnZV96
aXBfZGlyX3N0YXJ0X2xvdyhwYWdlX3ppcCwgbl9kZW5zZSk7CiAKIAlleHRlcm5zID0gc3RvcmFn
ZSAtIG5fZGVuc2UKIAkJKiAoREFUQV9UUlhfSURfTEVOICsgREFUQV9ST0xMX1BUUl9MRU4pOwpA
QCAtMzQ1Nyw5ICszNDk3LDcgQEAgcGFnZV96aXBfd3JpdGVfcmVjKAogCX0KIAogCS8qIFdyaXRl
IHRoZSBkYXRhIGJ5dGVzLiAgU3RvcmUgdGhlIHVuY29tcHJlc3NlZCBieXRlcyBzZXBhcmF0ZWx5
LiAqLwotCXN0b3JhZ2UgPSBwYWdlX3ppcC0+ZGF0YSArIHBhZ2VfemlwX2dldF9zaXplKHBhZ2Vf
emlwKQotCQktIChwYWdlX2Rpcl9nZXRfbl9oZWFwKHBhZ2UpIC0gUEFHRV9IRUFQX05PX1VTRVJf
TE9XKQotCQkqIFBBR0VfWklQX0RJUl9TTE9UX1NJWkU7CisJc3RvcmFnZSA9IHBhZ2VfemlwX2Rp
cl9zdGFydChwYWdlX3ppcCk7CiAKIAlpZiAocGFnZV9pc19sZWFmKHBhZ2UpKSB7CiAJCXVsaW50
CQlsZW47CkBAIC0zNzU1LDkgKzM3OTMsNyBAQCBjb3JydXB0OgogCQlmaWVsZCA9IHBhZ2UgKyBv
ZmZzZXQ7CiAJCXN0b3JhZ2UgPSBwYWdlX3ppcC0+ZGF0YSArIHpfb2Zmc2V0OwogCi0JCXN0b3Jh
Z2VfZW5kID0gcGFnZV96aXAtPmRhdGEgKyBwYWdlX3ppcF9nZXRfc2l6ZShwYWdlX3ppcCkKLQkJ
CS0gKHBhZ2VfZGlyX2dldF9uX2hlYXAocGFnZSkgLSBQQUdFX0hFQVBfTk9fVVNFUl9MT1cpCi0J
CQkqIFBBR0VfWklQX0RJUl9TTE9UX1NJWkU7CisJCXN0b3JhZ2VfZW5kID0gcGFnZV96aXBfZGly
X3N0YXJ0KHBhZ2VfemlwKTsKIAogCQloZWFwX25vID0gMSArIChzdG9yYWdlX2VuZCAtIHN0b3Jh
Z2UpIC8gUkVDX05PREVfUFRSX1NJWkU7CiAKQEAgLTM3OTMsNyArMzgyOSw5IEBAIHBhZ2Vfemlw
X3dyaXRlX25vZGVfcHRyKAogewogCWJ5dGUqCWZpZWxkOwogCWJ5dGUqCXN0b3JhZ2U7CisjaWZk
ZWYgVU5JVl9ERUJVRwogCXBhZ2VfdCoJcGFnZQk9IHBhZ2VfYWxpZ24ocmVjKTsKKyNlbmRpZiAv
KiBVTklWX0RFQlVHICovCiAKIAl1dF9hZChQQUdFX1pJUF9NQVRDSChyZWMsIHBhZ2VfemlwKSk7
CiAJdXRfYWQocGFnZV9zaW1wbGVfdmFsaWRhdGVfbmV3KHBhZ2UpKTsKQEAgLTM4MTAsOSArMzg0
OCw3IEBAIHBhZ2VfemlwX3dyaXRlX25vZGVfcHRyKAogCVVOSVZfTUVNX0FTU0VSVF9SVyhwYWdl
X3ppcC0+ZGF0YSwgcGFnZV96aXBfZ2V0X3NpemUocGFnZV96aXApKTsKIAlVTklWX01FTV9BU1NF
UlRfUlcocmVjLCBzaXplKTsKIAotCXN0b3JhZ2UgPSBwYWdlX3ppcC0+ZGF0YSArIHBhZ2Vfemlw
X2dldF9zaXplKHBhZ2VfemlwKQotCQktIChwYWdlX2Rpcl9nZXRfbl9oZWFwKHBhZ2UpIC0gUEFH
RV9IRUFQX05PX1VTRVJfTE9XKQotCQkqIFBBR0VfWklQX0RJUl9TTE9UX1NJWkUKKwlzdG9yYWdl
ID0gcGFnZV96aXBfZGlyX3N0YXJ0KHBhZ2VfemlwKQogCQktIChyZWNfZ2V0X2hlYXBfbm9fbmV3
KHJlYykgLSAxKSAqIFJFQ19OT0RFX1BUUl9TSVpFOwogCWZpZWxkID0gcmVjICsgc2l6ZSAtIFJF
Q19OT0RFX1BUUl9TSVpFOwogCkBAIC0zODYxLDcgKzM4OTcsOSBAQCBwYWdlX3ppcF93cml0ZV90
cnhfaWRfYW5kX3JvbGxfcHRyKAogewogCWJ5dGUqCWZpZWxkOwogCWJ5dGUqCXN0b3JhZ2U7Cisj
aWZkZWYgVU5JVl9ERUJVRwogCXBhZ2VfdCoJcGFnZQk9IHBhZ2VfYWxpZ24ocmVjKTsKKyNlbmRp
ZiAvKiBVTklWX0RFQlVHICovCiAJdWxpbnQJbGVuOwogCiAJdXRfYWQoUEFHRV9aSVBfTUFUQ0go
cmVjLCBwYWdlX3ppcCkpOwpAQCAtMzg3OSw5ICszOTE3LDcgQEAgcGFnZV96aXBfd3JpdGVfdHJ4
X2lkX2FuZF9yb2xsX3B0cigKIAogCVVOSVZfTUVNX0FTU0VSVF9SVyhwYWdlX3ppcC0+ZGF0YSwg
cGFnZV96aXBfZ2V0X3NpemUocGFnZV96aXApKTsKIAotCXN0b3JhZ2UgPSBwYWdlX3ppcC0+ZGF0
YSArIHBhZ2VfemlwX2dldF9zaXplKHBhZ2VfemlwKQotCQktIChwYWdlX2Rpcl9nZXRfbl9oZWFw
KHBhZ2UpIC0gUEFHRV9IRUFQX05PX1VTRVJfTE9XKQotCQkqIFBBR0VfWklQX0RJUl9TTE9UX1NJ
WkUKKwlzdG9yYWdlID0gcGFnZV96aXBfZGlyX3N0YXJ0KHBhZ2VfemlwKQogCQktIChyZWNfZ2V0
X2hlYXBfbm9fbmV3KHJlYykgLSAxKQogCQkqIChEQVRBX1RSWF9JRF9MRU4gKyBEQVRBX1JPTExf
UFRSX0xFTik7CiAKQEAgLTM5NDgsMTEgKzM5ODQsNyBAQCBwYWdlX3ppcF9jbGVhcl9yZWMoCiAJ
CS8qIENsZWFyIG5vZGVfcHRyLiBPbiB0aGUgY29tcHJlc3NlZCBwYWdlLAogCQl0aGVyZSBpcyBh
biBhcnJheSBvZiBub2RlX3B0ciBpbW1lZGlhdGVseSBiZWZvcmUgdGhlCiAJCWRlbnNlIHBhZ2Ug
ZGlyZWN0b3J5LCBhdCB0aGUgdmVyeSBlbmQgb2YgdGhlIHBhZ2UuICovCi0JCXN0b3JhZ2UJPSBw
YWdlX3ppcC0+ZGF0YQotCQkJKyBwYWdlX3ppcF9nZXRfc2l6ZShwYWdlX3ppcCkKLQkJCS0gKHBh
Z2VfZGlyX2dldF9uX2hlYXAocGFnZSkKLQkJCSAgIC0gUEFHRV9IRUFQX05PX1VTRVJfTE9XKQot
CQkJKiBQQUdFX1pJUF9ESVJfU0xPVF9TSVpFOworCQlzdG9yYWdlCT0gcGFnZV96aXBfZGlyX3N0
YXJ0KHBhZ2VfemlwKTsKIAkJdXRfYWQoZGljdF9pbmRleF9nZXRfbl91bmlxdWVfaW5fdHJlZShp
bmRleCkgPT0KIAkJICAgICAgcmVjX29mZnNfbl9maWVsZHMob2Zmc2V0cykgLSAxKTsKIAkJZmll
bGQJPSByZWNfZ2V0X250aF9maWVsZChyZWMsIG9mZnNldHMsCkBAIC0zOTcyLDExICs0MDA0LDcg
QEAgcGFnZV96aXBfY2xlYXJfcmVjKAogCQkJPSBkaWN0X2NvbF9nZXRfY2x1c3RfcG9zKAogCQkJ
ZGljdF90YWJsZV9nZXRfc3lzX2NvbCgKIAkJCQlpbmRleC0+dGFibGUsIERBVEFfVFJYX0lEKSwg
aW5kZXgpOwotCQlzdG9yYWdlCT0gcGFnZV96aXAtPmRhdGEKLQkJCSsgcGFnZV96aXBfZ2V0X3Np
emUocGFnZV96aXApCi0JCQktIChwYWdlX2Rpcl9nZXRfbl9oZWFwKHBhZ2UpCi0JCQkgICAtIFBB
R0VfSEVBUF9OT19VU0VSX0xPVykKLQkJCSogUEFHRV9aSVBfRElSX1NMT1RfU0laRTsKKwkJc3Rv
cmFnZQk9IHBhZ2VfemlwX2Rpcl9zdGFydChwYWdlX3ppcCk7CiAJCWZpZWxkCT0gcmVjX2dldF9u
dGhfZmllbGQocmVjLCBvZmZzZXRzLCB0cnhfaWRfcG9zLCAmbGVuKTsKIAkJdXRfYWQobGVuID09
IERBVEFfVFJYX0lEX0xFTik7CiAKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNo
IGVtYWlscyku