From: Date: October 16 2008 12:21am Subject: bzr commit into mysql-5.1 branch (davi:2669) Bug#38941 List-Archive: http://lists.mysql.com/commits/56307 X-Bug: 38941 Message-Id: <20081015222111.AFF2DEC383@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 bnVtYmVyCiAgICAgIGdlbmVyYXRvci4gVGhlIGluaXRpYWwgc2VlZCBpcyBzZXQgdG8gMSBiZWNh dXNlIHRoZSBwcmV2aW91c2x5IHVzZWQKICAgICAgZ2VuZXJhdG9yIHdhc24ndCBiZWluZyBzZWVk ZWQgLS0gdGhlIGluaXRpYWwgc2VlZCBpcyAxIGlmIHNyYW5kb20oKQogICAgICBpcyBub3QgY2Fs bGVkLgogICAgICAKICAgICAgRnV0aGVybW9yZSwgdGhlICdmYXN0JyBtdXRleCBpbXBsZW1lbnRh dGlvbiBoYXMgc2V2ZXJhbCBzaG9ydGNvbWluZ3MKICAgICAgYW5kIHByb3ZpZGVzIG5vIG1lYXN1 cmFibGUgcGVyZm9ybWFuY2UgYmVuZWZpdC4gVGhlcmVmb3JlLCBpdHMgdXNlIGlzCiAgICAgIG5v dCByZWNvbW1lbmRlZCB1bmxlc3MgaXQgcHJvdmlkZXMgZGlyZWN0bHkgbWVhc3VyYWJsZSByZXN1 bHRzLgptb2RpZmllZDoKICBpbmNsdWRlL215X3B0aHJlYWQuaAogIG15c3lzL3Rocl9tdXRleC5j CgpwZXItZmlsZSBtZXNzYWdlczoKICBpbmNsdWRlL215X3B0aHJlYWQuaAogICAgQWRkIGZpZWxk IHRvIGtlZXAgdGhlIFJORyBzdGF0ZS4KICBteXN5cy90aHJfbXV0ZXguYwogICAgVXNlIGEgcGFs bGlhdGl2ZSBwZXItbXV0ZXggcm5nIHN0YXRlIHRvIGRldGVybWluZSB0aGUgc3BpbiBkZWxheS4K ICAgIFRoZSBSTkcgaXMgbm90IHRocmVhZC1zYWZlIGJ1dCBqdW1waW5nIGEgZmV3IHNlcXVlbmNl cyBpbiB0aGUgUk5HCiAgICBpcyBoYXJtbGVzcy4KPT09IG1vZGlmaWVkIGZpbGUgJ2luY2x1ZGUv bXlfcHRocmVhZC5oJwotLS0gYS9pbmNsdWRlL215X3B0aHJlYWQuaAkyMDA4LTAzLTE5IDE4OjUy OjIyICswMDAwCisrKyBiL2luY2x1ZGUvbXlfcHRocmVhZC5oCTIwMDgtMTAtMTUgMjI6MjE6MDAg KzAwMDAKQEAgLTUxOSw2ICs1MTksNyBAQCB0eXBlZGVmIHN0cnVjdCBzdF9teV9wdGhyZWFkX2Zh c3RtdXRleF90CiB7CiAgIHB0aHJlYWRfbXV0ZXhfdCBtdXRleDsKICAgdWludCBzcGluczsKKyAg dWludCBybmdfc3RhdGU7CiB9IG15X3B0aHJlYWRfZmFzdG11dGV4X3Q7CiB2b2lkIGZhc3RtdXRl eF9nbG9iYWxfaW5pdCh2b2lkKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3lzL3Rocl9tdXRl eC5jJwotLS0gYS9teXN5cy90aHJfbXV0ZXguYwkyMDA3LTEwLTA5IDEyOjQ4OjQ5ICswMDAwCisr KyBiL215c3lzL3Rocl9tdXRleC5jCTIwMDgtMTAtMTUgMjI6MjE6MDAgKzAwMDAKQEAgLTQzOCw5 ICs0MzgsMzMgQEAgaW50IG15X3B0aHJlYWRfZmFzdG11dGV4X2luaXQobXlfcHRocmVhZAogICAg IG1wLT5zcGlucz0gTVlfUFRIUkVBRF9GQVNUTVVURVhfU1BJTlM7IAogICBlbHNlCiAgICAgbXAt PnNwaW5zPSAwOworICBtcC0+cm5nX3N0YXRlPSAxOwogICByZXR1cm4gcHRocmVhZF9tdXRleF9p bml0KCZtcC0+bXV0ZXgsIGF0dHIpOyAKIH0KIAorLyoqCisgIFBhcmstTWlsbGVyIHJhbmRvbSBu dW1iZXIgZ2VuZXJhdG9yLiBBIHNpbXBsZSBsaW5lYXIgY29uZ3J1ZW50aWFsCisgIGdlbmVyYXRv ciB0aGF0IG9wZXJhdGVzIGluIG11bHRpcGxpY2F0aXZlIGdyb3VwIG9mIGludGVnZXJzIG1vZHVs byBuLgorCisgIHhfe2srMX0gPSAoeF9rIGcpIG1vZCBuCisKKyAgUG9wdWxhciBwYWlyIG9mIHBh cmFtZXRlcnM6IG4gPSAyXjMyIOKIkiA1ID0gNDI5NDk2NzI5MSBhbmQgZyA9IDI3OTQ3MDI3My4K KyAgVGhlIHBlcmlvZCBvZiB0aGUgZ2VuZXJhdG9yIGlzIGFib3V0IDJeMzEuCisgIExhcmdlc3Qg dmFsdWUgdGhhdCBjYW4gYmUgcmV0dXJuZWQ6IDIxNDc0ODM2NDYgKFJBTkRfTUFYKQorCisgIFJl ZmVyZW5jZToKKworICBTLiBLLiBQYXJrIGFuZCBLLiBXLiBNaWxsZXIKKyAgIlJhbmRvbSBudW1i ZXIgZ2VuZXJhdG9yczogZ29vZCBvbmVzIGFyZSBoYXJkIHRvIGZpbmQiCisgIENvbW11bi4gQUNN LCBPY3RvYmVyIDE5ODgsIFZvbHVtZSAzMSwgTm8gMTAsIHBhZ2VzIDExOTItMTIwMS4KKyovCisK K3N0YXRpYyBkb3VibGUgcGFya19ybmcobXlfcHRocmVhZF9mYXN0bXV0ZXhfdCAqbXApCit7Cisg IG1wLT5ybmdfc3RhdGU9ICgobXlfdWxvbmdsb25nKW1wLT5ybmdfc3RhdGUgKiAyNzk0NzAyNzNV KSAlIDQyOTQ5NjcyOTFVOworICByZXR1cm4gKG1wLT5ybmdfc3RhdGUgLyAyMTQ3NDgzNjQ3LjAp OworfQorCiBpbnQgbXlfcHRocmVhZF9mYXN0bXV0ZXhfbG9jayhteV9wdGhyZWFkX2Zhc3RtdXRl eF90ICptcCkKIHsKICAgaW50ICAgcmVzOwpAQCAtNDU4LDggKzQ4Miw3IEBAIGludCBteV9wdGhy ZWFkX2Zhc3RtdXRleF9sb2NrKG15X3B0aHJlYWQKICAgICAgIHJldHVybiByZXM7CiAKICAgICBt dXRleF9kZWxheShtYXhkZWxheSk7Ci0gICAgbWF4ZGVsYXkgKz0gKChkb3VibGUpIHJhbmRvbSgp IC8gKGRvdWJsZSkgUkFORF9NQVgpICogCi0JICAgICAgICBNWV9QVEhSRUFEX0ZBU1RNVVRFWF9E RUxBWSArIDE7CisgICAgbWF4ZGVsYXkgKz0gcGFya19ybmcobXApICogTVlfUFRIUkVBRF9GQVNU TVVURVhfREVMQVkgKyAxOwogICB9CiAgIHJldHVybiBwdGhyZWFkX211dGV4X2xvY2soJm1wLT5t dXRleCk7CiB9Cgo=