From: Date: October 16 2008 4:22am
Subject: bzr push into mysql-6.0 branch (davi:2879 to 2880)
List-Archive: http://lists.mysql.com/commits/56324
Message-Id: <20081016022236.074EAEC39A@skynet.ctb.virtua.com.br>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDI4ODAgRGF2aSBBcm5hdXQJMjAwOC0xMC0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUu
MS1idWd0ZWFtIGludG8gbXlzcWwtNi4wLWJ1Z3RlYW0uCm1vZGlmaWVkOgogIGluY2x1ZGUvbXlf
cHRocmVhZC5oCiAgbXlzcWwtdGVzdC9yL2xpbWl0LnJlc3VsdAogIG15c3FsLXRlc3Qvci9zcC5y
ZXN1bHQKICBteXNxbC10ZXN0L3QvbGltaXQudGVzdAogIG15c3FsLXRlc3QvdC9zcC50ZXN0CiAg
bXlzeXMvdGhyX211dGV4LmMKICBzcWwvaXRlbS5jYwogIHNxbC9zcWxfbGV4LmNjCgogMjg3OSBE
YXZpIEFybmF1dAkyMDA4LTEwLTE1CiAgICAgIFBvc3QtbWVyZ2UgZml4OiBSZW1vdmUgdGhyZWFk
IHByaW9yaXR5IHNldHRpbmcgY29kZS4KbW9kaWZpZWQ6CiAgbXlzeXMvbXlfd2luY29uZC5jCiAg
bXlzeXMvbXlfd2ludGhyZWFkLmMKCj09PSBtb2RpZmllZCBmaWxlICdpbmNsdWRlL215X3B0aHJl
YWQuaCcKLS0tIGEvaW5jbHVkZS9teV9wdGhyZWFkLmgJMjAwOC0xMC0xNSAyMjo1MzoxOCArMDAw
MAorKysgYi9pbmNsdWRlL215X3B0aHJlYWQuaAkyMDA4LTEwLTE2IDAyOjEzOjE2ICswMDAwCkBA
IC01MDgsNiArNTA4LDcgQEAgdHlwZWRlZiBzdHJ1Y3Qgc3RfbXlfcHRocmVhZF9mYXN0bXV0ZXhf
dAogewogICBwdGhyZWFkX211dGV4X3QgbXV0ZXg7CiAgIHVpbnQgc3BpbnM7CisgIHVpbnQgcm5n
X3N0YXRlOwogfSBteV9wdGhyZWFkX2Zhc3RtdXRleF90Owogdm9pZCBmYXN0bXV0ZXhfZ2xvYmFs
X2luaXQodm9pZCk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvbGltaXQucmVz
dWx0JwotLS0gYS9teXNxbC10ZXN0L3IvbGltaXQucmVzdWx0CTIwMDgtMDItMjggMTQ6MzQ6MDgg
KzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL2xpbWl0LnJlc3VsdAkyMDA4LTEwLTE1IDIxOjM0OjUx
ICswMDAwCkBAIC0xMTEsMyArMTExLDYgQEAgc2V0IEBhPS0xNDYzMjQ3NTkzODQ1Mzk3OTEzNjsK
IGV4ZWN1dGUgcyB1c2luZyBAYSwgQGE7CiBFUlJPUiBIWTAwMDogSW5jb3JyZWN0IGFyZ3VtZW50
cyB0byBFWEVDVVRFCiBFbmQgb2YgNS4wIHRlc3RzCitzZWxlY3QgMSBhcyBhIGxpbWl0IDQyOTQ5
NjcyOTYsMTA7CithCitFbmQgb2YgNS4xIHRlc3RzCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwt
dGVzdC9yL3NwLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL3NwLnJlc3VsdAkyMDA4LTA5LTI1
IDExOjQ2OjE3ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9zcC5yZXN1bHQJMjAwOC0xMC0xNiAw
MjoxMzoxNiArMDAwMApAQCAtNjgyOCw2ICs2ODI4LDE5IEBAIHNlbGVjdCBzdWJzdHIoYHN0cmAs
IGBwb3NgKyAxICkgaW50byBgc3QKIGVuZCAkCiBjYWxsIGBwMmAoJ3MgcyBzIHMgcyBzJyk7CiBk
cm9wIHByb2NlZHVyZSBgcDJgOworZHJvcCB0YWJsZSBpZiBleGlzdHMgdDE7Citkcm9wIHByb2Nl
ZHVyZSBpZiBleGlzdHMgcDE7CitjcmVhdGUgcHJvY2VkdXJlIHAxKCkgYmVnaW4gc2VsZWN0ICog
ZnJvbSB0MTsgZW5kJAorY2FsbCBwMSQKK0VSUk9SIDQyUzAyOiBUYWJsZSAndGVzdC50MScgZG9l
c24ndCBleGlzdAorY3JlYXRlIHRhYmxlIHQxIChhIGludGVnZXIpJAorY2FsbCBwMSQKK2EKK2Fs
dGVyIHRhYmxlIHQxIGFkZCBiIGludGVnZXI7CitjYWxsIHAxJAorYQorZHJvcCB0YWJsZSB0MTsK
K2Ryb3AgcHJvY2VkdXJlIHAxOwogIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICMgLS0gRW5kIG9mIDUuMCB0ZXN0cwog
IyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0KCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvbGltaXQudGVzdCcK
LS0tIGEvbXlzcWwtdGVzdC90L2xpbWl0LnRlc3QJMjAwOC0wMi0yOCAyMzoyMjo1MCArMDAwMAor
KysgYi9teXNxbC10ZXN0L3QvbGltaXQudGVzdAkyMDA4LTEwLTE2IDAxOjUwOjU2ICswMDAwCkBA
IC05NSwzICs5NSwxMSBAQCBzZXQgQGE9LTE0NjMyNDc1OTM4NDUzOTc5MTM2OwogZXhlY3V0ZSBz
IHVzaW5nIEBhLCBAYTsKIAogLS1lY2hvIEVuZCBvZiA1LjAgdGVzdHMKKworIworIyBCdWcjMzcw
NzU6IG9mZnNldCBvZiBsaW1pdCBjbGF1c2UgbWlnaHQgYmUgdHJ1bmNhdGVkIHRvIDAgb24gMzIt
Yml0cyBzZXJ2ZXIgdy9vIGJpZyB0YWJsZXMKKyMKKworc2VsZWN0IDEgYXMgYSBsaW1pdCA0Mjk0
OTY3Mjk2LDEwOworCistLWVjaG8gRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlmaWVkIGZpbGUg
J215c3FsLXRlc3QvdC9zcC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3Qvc3AudGVzdAkyMDA4LTA5
LTI1IDExOjQ2OjE3ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9zcC50ZXN0CTIwMDgtMTAtMTYg
MDI6MTM6MTYgKzAwMDAKQEAgLTgwMzgsNiArODAzOCwyOCBAQCBkZWxpbWl0ZXIgOyQKIGNhbGwg
YHAyYCgncyBzIHMgcyBzIHMnKTsKIGRyb3AgcHJvY2VkdXJlIGBwMmA7CiAKKyMKKyMgQnVnIzM4
ODIzOiBJbnZhbGlkIG1lbW9yeSBhY2Nlc3Mgd2hlbiBhIFNQIHN0YXRlbWVudCBkb2VzIHdpbGRj
YXJkIGV4cGFuc2lvbgorIworCistLWRpc2FibGVfd2FybmluZ3MKK2Ryb3AgdGFibGUgaWYgZXhp
c3RzIHQxOworZHJvcCBwcm9jZWR1cmUgaWYgZXhpc3RzIHAxOworLS1lbmFibGVfd2FybmluZ3MK
KworZGVsaW1pdGVyICQ7CitjcmVhdGUgcHJvY2VkdXJlIHAxKCkgYmVnaW4gc2VsZWN0ICogZnJv
bSB0MTsgZW5kJAorLS1lcnJvciBFUl9OT19TVUNIX1RBQkxFCitjYWxsIHAxJAorY3JlYXRlIHRh
YmxlIHQxIChhIGludGVnZXIpJAorY2FsbCBwMSQKK2FsdGVyIHRhYmxlIHQxIGFkZCBiIGludGVn
ZXI7CitjYWxsIHAxJAorZGVsaW1pdGVyIDskCisKK2Ryb3AgdGFibGUgdDE7Citkcm9wIHByb2Nl
ZHVyZSBwMTsKKwogLS1lY2hvICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAtLWVjaG8gIyAtLSBFbmQgb2YgNS4wIHRl
c3RzCiAtLWVjaG8gIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KCj09PSBtb2RpZmllZCBmaWxlICdteXN5cy90aHJfbXV0
ZXguYycKLS0tIGEvbXlzeXMvdGhyX211dGV4LmMJMjAwNy0xMi0xNiAxNTowMzo0NCArMDAwMAor
KysgYi9teXN5cy90aHJfbXV0ZXguYwkyMDA4LTEwLTE2IDAyOjEzOjE2ICswMDAwCkBAIC00NTgs
OSArNDU4LDMzIEBAIGludCBteV9wdGhyZWFkX2Zhc3RtdXRleF9pbml0KG15X3B0aHJlYWQKICAg
ICBtcC0+c3BpbnM9IE1ZX1BUSFJFQURfRkFTVE1VVEVYX1NQSU5TOyAKICAgZWxzZQogICAgIG1w
LT5zcGlucz0gMDsKKyAgbXAtPnJuZ19zdGF0ZT0gMTsKICAgcmV0dXJuIHB0aHJlYWRfbXV0ZXhf
aW5pdCgmbXAtPm11dGV4LCBhdHRyKTsgCiB9CiAKKy8qKgorICBQYXJrLU1pbGxlciByYW5kb20g
bnVtYmVyIGdlbmVyYXRvci4gQSBzaW1wbGUgbGluZWFyIGNvbmdydWVudGlhbAorICBnZW5lcmF0
b3IgdGhhdCBvcGVyYXRlcyBpbiBtdWx0aXBsaWNhdGl2ZSBncm91cCBvZiBpbnRlZ2VycyBtb2R1
bG8gbi4KKworICB4X3trKzF9ID0gKHhfayBnKSBtb2QgbgorCisgIFBvcHVsYXIgcGFpciBvZiBw
YXJhbWV0ZXJzOiBuID0gMl4zMiDiiJIgNSA9IDQyOTQ5NjcyOTEgYW5kIGcgPSAyNzk0NzAyNzMu
CisgIFRoZSBwZXJpb2Qgb2YgdGhlIGdlbmVyYXRvciBpcyBhYm91dCAyXjMxLgorICBMYXJnZXN0
IHZhbHVlIHRoYXQgY2FuIGJlIHJldHVybmVkOiAyMTQ3NDgzNjQ2IChSQU5EX01BWCkKKworICBS
ZWZlcmVuY2U6CisKKyAgUy4gSy4gUGFyayBhbmQgSy4gVy4gTWlsbGVyCisgICJSYW5kb20gbnVt
YmVyIGdlbmVyYXRvcnM6IGdvb2Qgb25lcyBhcmUgaGFyZCB0byBmaW5kIgorICBDb21tdW4uIEFD
TSwgT2N0b2JlciAxOTg4LCBWb2x1bWUgMzEsIE5vIDEwLCBwYWdlcyAxMTkyLTEyMDEuCisqLwor
CitzdGF0aWMgZG91YmxlIHBhcmtfcm5nKG15X3B0aHJlYWRfZmFzdG11dGV4X3QgKm1wKQorewor
ICBtcC0+cm5nX3N0YXRlPSAoKG15X3Vsb25nbG9uZyltcC0+cm5nX3N0YXRlICogMjc5NDcwMjcz
VSkgJSA0Mjk0OTY3MjkxVTsKKyAgcmV0dXJuIChtcC0+cm5nX3N0YXRlIC8gMjE0NzQ4MzY0Ny4w
KTsKK30KKwogaW50IG15X3B0aHJlYWRfZmFzdG11dGV4X2xvY2sobXlfcHRocmVhZF9mYXN0bXV0
ZXhfdCAqbXApCiB7CiAgIGludCAgIHJlczsKQEAgLTQ3OCw4ICs1MDIsNyBAQCBpbnQgbXlfcHRo
cmVhZF9mYXN0bXV0ZXhfbG9jayhteV9wdGhyZWFkCiAgICAgICByZXR1cm4gcmVzOwogCiAgICAg
bXV0ZXhfZGVsYXkobWF4ZGVsYXkpOwotICAgIG1heGRlbGF5ICs9ICgoZG91YmxlKSByYW5kb20o
KSAvIChkb3VibGUpIFJBTkRfTUFYKSAqIAotCSAgICAgICAgTVlfUFRIUkVBRF9GQVNUTVVURVhf
REVMQVkgKyAxOworICAgIG1heGRlbGF5ICs9IHBhcmtfcm5nKG1wKSAqIE1ZX1BUSFJFQURfRkFT
VE1VVEVYX0RFTEFZICsgMTsKICAgfQogICByZXR1cm4gcHRocmVhZF9tdXRleF9sb2NrKCZtcC0+
bXV0ZXgpOwogfQoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9pdGVtLmNjJwotLS0gYS9zcWwvaXRl
bS5jYwkyMDA4LTEwLTEzIDEwOjQ0OjU2ICswMDAwCisrKyBiL3NxbC9pdGVtLmNjCTIwMDgtMTAt
MTYgMDI6MTM6MTYgKzAwMDAKQEAgLTE4MDIsNyArMTgwMiw4IEBAIEl0ZW1fZmllbGQ6Okl0ZW1f
ZmllbGQoVEhEICp0aGQsIE5hbWVfcmUKICAgICBiZSBhbGxvY2F0ZWQgaW4gdGhlIHN0YXRlbWVu
dCBtZW1vcnksIG5vdCBpbiB0YWJsZSBtZW1vcnkgKHRoZSB0YWJsZQogICAgIHN0cnVjdHVyZSBj
YW4gZ28gYXdheSBhbmQgcG9wIHVwIGFnYWluIGJldHdlZW4gc3Vic2VxdWVudCBleGVjdXRpb25z
CiAgICAgb2YgYSBwcmVwYXJlZCBzdGF0ZW1lbnQgb3IgYWZ0ZXIgdGhlIGNsb3NlX3RhYmxlc19m
b3JfcmVvcGVuKCkgY2FsbAotICAgIGluIG15c3FsX211bHRpX3VwZGF0ZV9wcmVwYXJlKCkpLgor
ICAgIGluIG15c3FsX211bHRpX3VwZGF0ZV9wcmVwYXJlKCkgb3IgZHVlIHRvIHdpbGRjYXJkIGV4
cGFuc2lvbiBpbiBzdG9yZWQKKyAgICBwcm9jZWR1cmVzKS4KICAgKi8KICAgewogICAgIGlmIChk
Yl9uYW1lKQoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfbGV4LmNjJwotLS0gYS9zcWwvc3Fs
X2xleC5jYwkyMDA4LTEwLTA3IDIyOjA1OjIzICswMDAwCisrKyBiL3NxbC9zcWxfbGV4LmNjCTIw
MDgtMTAtMTYgMDI6MTM6MTYgKzAwMDAKQEAgLTI0NzksMTUgKzI0NzksMjAgQEAgdm9pZCBzdF9z
ZWxlY3RfbGV4X3VuaXQ6OnNldF9saW1pdChzdF9zZQogICB2YWw9IHNsLT5zZWxlY3RfbGltaXQg
PyBzbC0+c2VsZWN0X2xpbWl0LT52YWxfdWludCgpIDogSEFfUE9TX0VSUk9SOwogICBzZWxlY3Rf
bGltaXRfdmFsPSAoaGFfcm93cyl2YWw7CiAjaWZuZGVmIEJJR19UQUJMRVMKLSAgLyogCisgIC8q
CiAgICAgQ2hlY2sgZm9yIG92ZXJmbG93IDogaGFfcm93cyBjYW4gYmUgc21hbGxlciB0aGVuIHVs
b25nbG9uZyBpZgogICAgIEJJR19UQUJMRVMgaXMgb2ZmLgogICAgICovCiAgIGlmICh2YWwgIT0g
KHVsb25nbG9uZylzZWxlY3RfbGltaXRfdmFsKQogICAgIHNlbGVjdF9saW1pdF92YWw9IEhBX1BP
U19FUlJPUjsKICNlbmRpZgotICBvZmZzZXRfbGltaXRfY250PSAoaGFfcm93cykoc2wtPm9mZnNl
dF9saW1pdCA/IHNsLT5vZmZzZXRfbGltaXQtPnZhbF91aW50KCkgOgotICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFVMTCgwKSk7CisgIHZhbD0gc2wtPm9m
ZnNldF9saW1pdCA/IHNsLT5vZmZzZXRfbGltaXQtPnZhbF91aW50KCkgOiBVTEwoMCk7CisgIG9m
ZnNldF9saW1pdF9jbnQ9IChoYV9yb3dzKXZhbDsKKyNpZm5kZWYgQklHX1RBQkxFUworICAvKiBD
aGVjayBmb3IgdHJ1bmNhdGlvbi4gKi8KKyAgaWYgKHZhbCAhPSAodWxvbmdsb25nKW9mZnNldF9s
aW1pdF9jbnQpCisgICAgb2Zmc2V0X2xpbWl0X2NudD0gSEFfUE9TX0VSUk9SOworI2VuZGlmCiAg
IHNlbGVjdF9saW1pdF9jbnQ9IHNlbGVjdF9saW1pdF92YWwgKyBvZmZzZXRfbGltaXRfY250Owog
ICBpZiAoc2VsZWN0X2xpbWl0X2NudCA8IHNlbGVjdF9saW1pdF92YWwpCiAgICAgc2VsZWN0X2xp
bWl0X2NudD0gSEFfUE9TX0VSUk9SOwkJLy8gbm8gbGltaXQKCg==