From: Date: October 16 2008 12:11am Subject: bzr commit into mysql-5.1 branch (davi:2669) Bug#38941 List-Archive: http://lists.mysql.com/commits/56306 X-Bug: 38941 Message-Id: <20081015221148.747ABEC383@skynet.ctb.virtua.com.br> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IyBBdCBhIGxvY2FsIG15c3FsLTUuMSByZXBvc2l0b3J5IG9mIGRhdmkKCiAyNjY5IERhdmkgQXJu YXV0CTIwMDgtMTAtMTUKICAgICAgQnVnIzM4OTQxOiBmYXN0IG11dGV4ZXMgaW4gTXlTUUwgNS4x IGhhdmUgbXV0ZXggY29udGVudGlvbiB3aGVuIGNhbGxpbmcgcmFuZG9tKCkKICAgICAgCiAgICAg IFRoZSBwcm9ibGVtIGlzIHRoYXQgTXlTUUwncyAnZmFzdCcgbXV0ZXggaW1wbGVtZW50YXRpb24g dXNlcyB0aGUKICAgICAgcmFuZG9tKCkgcm91dGluZSB0byBkZXRlcm1pbmUgdGhlIHNwaW4gZGVs YXkuIFVuZm9ydHVuYXRlbHksIHRoZQogICAgICByb3V0aW5lIGludGVyZmFjZSBpcyBub3QgdGhl YWQtc2FmZSBhbmQgc29tZSBpbXBsZW1lbnRhdGlvbnMgKGVnOgogICAgICBnbGliYykgbWlnaHQg dXNlIGEgaW50ZXJuYWwgbG9jayB0byBwcm90ZWN0IHRoZSBSTkcgc3RhdGUsIGNhdXNpbmcKICAg ICAgZXhjZXNzaXZlIGxvY2tpbmcgY29udGVudGlvbiBpZiBsb3RzIG9mIHRocmVhZHMgYXJlIHNw aW5uaW5nIG9uCiAgICAgIGEgTXlTUUwncyAnZmFzdCcgbXV0ZXguIFRoZSBjb2RlIHdhcyBhbHNv IG1pc3VzaW5nIHRoZSB2YWx1ZQogICAgICBvZiB0aGUgUkFORF9NQVggbWFjcm8sIHRoaXMgbWFj cm8gcmVwcmVzZW50cyB0aGUgbGFyZ2VzdCB2YWx1ZQogICAgICB0aGF0IGNhbiBiZSByZXR1cm5l ZCBmcm9tIHRoZSByYW5kKCkgZnVuY3Rpb24sIG5vdCByYW5kb20oKS4KICAgICAgCiAgICAgIFRo ZSBzb2x1dGlvbiBpcyB0byB1c2UgdGhlIHF1aXRlIHNpbXBsZSBQYXJrLU1pbGxlciByYW5kb20g bnVtYmVyCiAgICAgIGdlbmVyYXRvci4gVGhlIGluaXRpYWwgc2VlZCBzZXQgdG8gMSBiZWNhdXNl IHRoZSB0aGUgcHJldmlvdXNseSB1c2VkCiAgICAgIGdlbmVyYXRvciB3YXNuJ3QgYmVpbmcgc2Vl ZGVkIC0tIHRoZSBpbml0aWFsIHNlZWQgaXMgMSBpZiBzcmFuZG9tKCkKICAgICAgaXMgbm90IGNh bGxlZC4KICAgICAgCiAgICAgIEZ1dGhlcm1vcmUsIHRoZSAnZmFzdCcgbXV0ZXggaW1wbGVtZW50 YXRpb24gaGFzIHNldmVyYWwgc2hvcnRjb21pbmdzCiAgICAgIGFuZCBwcm92aWRlcyBubyBtZWFz dXJhYmxlIHBlcmZvcm1hbmNlIGJlbmVmaXQuIFRoZXJlZm9yZSwgaXRzIHVzZSBpcwogICAgICBu b3QgcmVjb21tZW5kZWQgdW5sZXNzIGl0IHByb3ZpZGVzIGRpcmVjdGx5IG1lYXN1cmFibGUgcmVz dWx0cy4KbW9kaWZpZWQ6CiAgaW5jbHVkZS9teV9wdGhyZWFkLmgKICBteXN5cy90aHJfbXV0ZXgu YwoKcGVyLWZpbGUgbWVzc2FnZXM6CiAgaW5jbHVkZS9teV9wdGhyZWFkLmgKICAgIEFkZCBmaWVs ZCB0byBrZWVwIHRoZSBSTkcgc3RhdGUuCiAgbXlzeXMvdGhyX211dGV4LmMKICAgIFVzZSBhIHBh bGxpYXRpdmUgcGVyLW11dGV4IHJuZyBzdGF0ZSB0byBkZXRlcm1pbmUgdGhlIHNwaW4gZGVsYXku CiAgICBUaGUgUk5HIGlzIG5vdCB0aHJlYWQtc2FmZSBidXQganVtcGluZyBhIGZldyBzZXF1ZW5j ZXMgaW4gdGhlIFJORwogICAgaXMgaGFybWxlc3MuCj09PSBtb2RpZmllZCBmaWxlICdpbmNsdWRl L215X3B0aHJlYWQuaCcKLS0tIGEvaW5jbHVkZS9teV9wdGhyZWFkLmgJMjAwOC0wMy0xOSAxODo1 MjoyMiArMDAwMAorKysgYi9pbmNsdWRlL215X3B0aHJlYWQuaAkyMDA4LTEwLTE1IDIyOjExOjM3 ICswMDAwCkBAIC01MTksNiArNTE5LDcgQEAgdHlwZWRlZiBzdHJ1Y3Qgc3RfbXlfcHRocmVhZF9m YXN0bXV0ZXhfdAogewogICBwdGhyZWFkX211dGV4X3QgbXV0ZXg7CiAgIHVpbnQgc3BpbnM7Cisg IHVpbnQgcm5nX3N0YXRlOwogfSBteV9wdGhyZWFkX2Zhc3RtdXRleF90Owogdm9pZCBmYXN0bXV0 ZXhfZ2xvYmFsX2luaXQodm9pZCk7CiAKCj09PSBtb2RpZmllZCBmaWxlICdteXN5cy90aHJfbXV0 ZXguYycKLS0tIGEvbXlzeXMvdGhyX211dGV4LmMJMjAwNy0xMC0wOSAxMjo0ODo0OSArMDAwMAor KysgYi9teXN5cy90aHJfbXV0ZXguYwkyMDA4LTEwLTE1IDIyOjExOjM3ICswMDAwCkBAIC00Mzgs OSArNDM4LDMzIEBAIGludCBteV9wdGhyZWFkX2Zhc3RtdXRleF9pbml0KG15X3B0aHJlYWQKICAg ICBtcC0+c3BpbnM9IE1ZX1BUSFJFQURfRkFTVE1VVEVYX1NQSU5TOyAKICAgZWxzZQogICAgIG1w LT5zcGlucz0gMDsKKyAgbXAtPnJuZ19zdGF0ZT0gMTsKICAgcmV0dXJuIHB0aHJlYWRfbXV0ZXhf aW5pdCgmbXAtPm11dGV4LCBhdHRyKTsgCiB9CiAKKy8qKgorICBQYXJrLU1pbGxlciByYW5kb20g bnVtYmVyIGdlbmVyYXRvci4gQSBzaW1wbGUgbGluZWFyIGNvbmdydWVudGlhbAorICBnZW5lcmF0 b3IgdGhhdCBvcGVyYXRlcyBpbiBtdWx0aXBsaWNhdGl2ZSBncm91cCBvZiBpbnRlZ2VycyBtb2R1 bG8gbi4KKworICB4X3trKzF9ID0gKHhfayBnKSBtb2QgbgorCisgIFBvcHVsYXIgcGFpciBvZiBw YXJhbWV0ZXJzOiBuID0gMl4zMiDiiJIgNSA9IDQyOTQ5NjcyOTEgYW5kIGcgPSAyNzk0NzAyNzMu CisgIFRoZSBwZXJpb2Qgb2YgdGhlIGdlbmVyYXRvciBpcyBhYm91dCAyXjMxLgorICBMYXJnZXN0 IHZhbHVlIHRoYXQgY2FuIGJlIHJldHVybmVkOiAyMTQ3NDgzNjQ2IChSQU5EX01BWCkKKworICBS ZWZlcmVuY2U6CisKKyAgUy4gSy4gUGFyayBhbmQgSy4gVy4gTWlsbGVyCisgICJSYW5kb20gbnVt YmVyIGdlbmVyYXRvcnM6IGdvb2Qgb25lcyBhcmUgaGFyZCB0byBmaW5kIgorICBDb21tdW4uIEFD TSwgT2N0b2JlciAxOTg4LCBWb2x1bWUgMzEsIE5vIDEwLCBwYWdlcyAxMTkyLTEyMDEuCisqLwor CitzdGF0aWMgZG91YmxlIHBhcmtfcm5nKG15X3B0aHJlYWRfZmFzdG11dGV4X3QgKm1wKQorewor ICBtcC0+cm5nX3N0YXRlPSAoKG15X3Vsb25nbG9uZyltcC0+cm5nX3N0YXRlICogMjc5NDcwMjcz VSkgJSA0Mjk0OTY3MjkxVTsKKyAgcmV0dXJuIChtcC0+cm5nX3N0YXRlIC8gMjE0NzQ4MzY0Ny4w KTsKK30KKwogaW50IG15X3B0aHJlYWRfZmFzdG11dGV4X2xvY2sobXlfcHRocmVhZF9mYXN0bXV0 ZXhfdCAqbXApCiB7CiAgIGludCAgIHJlczsKQEAgLTQ1OCw4ICs0ODIsNyBAQCBpbnQgbXlfcHRo cmVhZF9mYXN0bXV0ZXhfbG9jayhteV9wdGhyZWFkCiAgICAgICByZXR1cm4gcmVzOwogCiAgICAg bXV0ZXhfZGVsYXkobWF4ZGVsYXkpOwotICAgIG1heGRlbGF5ICs9ICgoZG91YmxlKSByYW5kb20o KSAvIChkb3VibGUpIFJBTkRfTUFYKSAqIAotCSAgICAgICAgTVlfUFRIUkVBRF9GQVNUTVVURVhf REVMQVkgKyAxOworICAgIG1heGRlbGF5ICs9IHBhcmtfcm5nKG1wKSAqIE1ZX1BUSFJFQURfRkFT VE1VVEVYX0RFTEFZICsgMTsKICAgfQogICByZXR1cm4gcHRocmVhZF9tdXRleF9sb2NrKCZtcC0+ bXV0ZXgpOwogfQoK