From: Sergey Vojtovich
Date: October 21 2011 5:31am
Subject: bzr push into mysql-5.1 branch (sergey.vojtovich:3629 to 3630)
List-Archive: http://lists.mysql.com/commits/141526
Message-Id: <201110210527.p9L5RoUX028202@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MzAgU2VyZ2V5IFZvanRvdmljaAkyMDExLTEwLTIxIFttZXJnZV0KICAgICAgTWVyZ2UuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW0ucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3QvdC9teWlzYW0udGVzdAogICAgICBzdG9yYWdlL215aXNhbS9oYV9teWlzYW0uY2MKICAg
ICAgc3RvcmFnZS9teWlzYW0vbWlfZGVsZXRlX2FsbC5jCiAzNjI5IE1hcmtvIE3DpGtlbMOkCTIw
MTEtMTAtMjEKICAgICAgQnVnIzEzMTE2MDQ1IENvbXBpbGF0aW9uIGZhaWx1cmUgdXNpbmcgR0ND
IDQuNi4xIGluIGJ0ci9idHIwY3VyLmMKICAgICAgCiAgICAgIGJ0cl9yZWNvcmRfbm90X251bGxf
ZmllbGRfaW5fcmVjKCk6IFJlbW92ZSB0aGUgcGFyYW1ldGVyIHJlYy4KICAgICAgVXNlIHJlY19v
ZmZzX250aF9zcWxfbnVsbCgpIGluc3RlYWQgb2YgcmVjX2dldF9udGhfZmllbGQoKS4KICAgICAg
CiAgICAgIHJiOjc4OCBhcHByb3ZlZCBieSBKaW1teSBZYW5nCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCj09
PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvbXlpc2FtLnJlc3VsdCcKLS0tIGEvbXlzcWwt
dGVzdC9yL215aXNhbS5yZXN1bHQJMjAxMC0wMy0yNSAxMjoxMToxNiArMDAwMAorKysgYi9teXNx
bC10ZXN0L3IvbXlpc2FtLnJlc3VsdAkyMDExLTEwLTIwIDExOjAzOjIyICswMDAwCkBAIC0yNDEy
LDQgKzI0MTIsMjggQEAgQ0FSRElOQUxJVFkKIERST1AgVEFCTEUgdDE7CiBTRVQgbXlpc2FtX3Nv
cnRfYnVmZmVyX3NpemU9QEBnbG9iYWwubXlpc2FtX3NvcnRfYnVmZmVyX3NpemU7CiBTRVQgbXlp
c2FtX3JlcGFpcl90aHJlYWRzPUBAZ2xvYmFsLm15aXNhbV9yZXBhaXJfdGhyZWFkczsKKyMKKyMg
QlVHIzExNzU3MDMyIC0gNDkwMzA6IE9QVElNSVpFIFRBQkxFIEJSRUFLUyBNWUlTQU0gVEFCTEUg
V0hFTgorIyAgICAgICAgICAgICAgICBVU0lORyBNWUlTQU1fVVNFX01NQVAgT04gV0lORE9XUwor
IworU0VUIEdMT0JBTCBteWlzYW1fdXNlX21tYXA9MTsKK0NSRUFURSBUQUJMRSB0MShhIElOVCk7
CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMoMSksKDIpOworREVMRVRFIEZST00gdDEgV0hFUkUgYT0x
OworRkxVU0ggVEFCTEUgdDE7CitMT0NLIFRBQkxFIHQxIFdSSVRFOworT1BUSU1JWkUgVEFCTEUg
dDE7CitUYWJsZQlPcAlNc2dfdHlwZQlNc2dfdGV4dAordGVzdC50MQlvcHRpbWl6ZQlzdGF0dXMJ
T0sKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUygzKTsKK1VOTE9DSyBUQUJMRVM7CitTRUxFQ1QgKiBG
Uk9NIHQxOworYQorMgorMworQ0hFQ0sgVEFCTEUgdDE7CitUYWJsZQlPcAlNc2dfdHlwZQlNc2df
dGV4dAordGVzdC50MQljaGVjawlzdGF0dXMJT0sKK0RST1AgVEFCTEUgdDE7CitTRVQgR0xPQkFM
IG15aXNhbV91c2VfbW1hcD1kZWZhdWx0OwogRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1vZGlmaWVk
IGZpbGUgJ215c3FsLXRlc3QvdC9teWlzYW0udGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L215aXNh
bS50ZXN0CTIwMTAtMDMtMTIgMTA6NDM6MzAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L215aXNh
bS50ZXN0CTIwMTEtMTAtMjAgMTE6MDM6MjIgKzAwMDAKQEAgLTE2NDUsNCArMTY0NSwyMiBAQCBE
Uk9QIFRBQkxFIHQxOwogU0VUIG15aXNhbV9zb3J0X2J1ZmZlcl9zaXplPUBAZ2xvYmFsLm15aXNh
bV9zb3J0X2J1ZmZlcl9zaXplOwogU0VUIG15aXNhbV9yZXBhaXJfdGhyZWFkcz1AQGdsb2JhbC5t
eWlzYW1fcmVwYWlyX3RocmVhZHM7CiAKKy0tZWNobyAjCistLWVjaG8gIyBCVUcjMTE3NTcwMzIg
LSA0OTAzMDogT1BUSU1JWkUgVEFCTEUgQlJFQUtTIE1ZSVNBTSBUQUJMRSBXSEVOCistLWVjaG8g
IyAgICAgICAgICAgICAgICBVU0lORyBNWUlTQU1fVVNFX01NQVAgT04gV0lORE9XUworLS1lY2hv
ICMKK1NFVCBHTE9CQUwgbXlpc2FtX3VzZV9tbWFwPTE7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQp
OworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDEpLCgyKTsKK0RFTEVURSBGUk9NIHQxIFdIRVJFIGE9
MTsKK0ZMVVNIIFRBQkxFIHQxOworTE9DSyBUQUJMRSB0MSBXUklURTsKK09QVElNSVpFIFRBQkxF
IHQxOworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDMpOworVU5MT0NLIFRBQkxFUzsKK1NFTEVDVCAq
IEZST00gdDE7CitDSEVDSyBUQUJMRSB0MTsKK0RST1AgVEFCTEUgdDE7CitTRVQgR0xPQkFMIG15
aXNhbV91c2VfbW1hcD1kZWZhdWx0OworCiAtLWVjaG8gRW5kIG9mIDUuMSB0ZXN0cwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbXlpc2FtL2hhX215aXNhbS5jYycKLS0tIGEvc3RvcmFnZS9t
eWlzYW0vaGFfbXlpc2FtLmNjCTIwMTEtMDctMDMgMTU6NDc6MzcgKzAwMDAKKysrIGIvc3RvcmFn
ZS9teWlzYW0vaGFfbXlpc2FtLmNjCTIwMTEtMTAtMjAgMTE6MDM6MjIgKzAwMDAKQEAgLTExMzUs
NiArMTEzNSwxOCBAQCBpbnQgaGFfbXlpc2FtOjpyZXBhaXIoVEhEICp0aGQsIE1JX0NIRUNLCiAJ
CQltaV9nZXRfbWFza19hbGxfa2V5c19hY3RpdmUoc2hhcmUtPmJhc2Uua2V5cykgOgogCQkJc2hh
cmUtPnN0YXRlLmtleV9tYXApOwogICAgIHVpbnQgdGVzdGZsYWc9cGFyYW0udGVzdGZsYWc7Cisj
aWZkZWYgSEFWRV9NTUFQCisgICAgYm9vbCByZW1hcD0gdGVzdChzaGFyZS0+ZmlsZV9tYXApOwor
ICAgIC8qCisgICAgICBtaV9yZXBhaXIqKCkgZnVuY3Rpb25zIGZhbWlseSB1c2UgZmlsZSBJL08g
ZXZlbiBpZiBtZW1vcnkKKyAgICAgIG1hcHBpbmcgaXMgYXZhaWxhYmxlLgorCisgICAgICBTaW5j
ZSBtaXhpbmcgbW1hcCBJL08gYW5kIGZpbGUgSS9PIG1heSBjYXVzZSB2YXJpb3VzIGFydGlmYWN0
cywKKyAgICAgIG1lbW9yeSBtYXBwaW5nIG11c3QgYmUgZGlzYWJsZWQuCisgICAgKi8KKyAgICBp
ZiAocmVtYXApCisgICAgICBtaV9tdW5tYXBfZmlsZShmaWxlKTsKKyNlbmRpZgogICAgIGlmICht
aV90ZXN0X2lmX3NvcnRfcmVwKGZpbGUsZmlsZS0+c3RhdGUtPnJlY29yZHMsa2V5X21hcCwwKSAm
JgogCShsb2NhbF90ZXN0ZmxhZyAmIFRfUkVQX0JZX1NPUlQpKQogICAgIHsKQEAgLTExNjYsNiAr
MTE3OCwxMCBAQCBpbnQgaGFfbXlpc2FtOjpyZXBhaXIoVEhEICp0aGQsIE1JX0NIRUNLCiAgICAg
ICBlcnJvcj0gIG1pX3JlcGFpcigmcGFyYW0sIGZpbGUsIGZpeGVkX25hbWUsCiAJCQlwYXJhbS50
ZXN0ZmxhZyAmIFRfUVVJQ0spOwogICAgIH0KKyNpZmRlZiBIQVZFX01NQVAKKyAgICBpZiAocmVt
YXApCisgICAgICBtaV9keW5tYXBfZmlsZShmaWxlLCBmaWxlLT5zdGF0ZS0+ZGF0YV9maWxlX2xl
bmd0aCk7CisjZW5kaWYKICAgICBwYXJhbS50ZXN0ZmxhZz10ZXN0ZmxhZzsKICAgICBvcHRpbWl6
ZV9kb25lPTE7CiAgIH0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL215aXNhbS9taV9kZWxl
dGVfYWxsLmMnCi0tLSBhL3N0b3JhZ2UvbXlpc2FtL21pX2RlbGV0ZV9hbGwuYwkyMDExLTA2LTMw
IDE1OjM3OjEzICswMDAwCisrKyBiL3N0b3JhZ2UvbXlpc2FtL21pX2RlbGV0ZV9hbGwuYwkyMDEx
LTEwLTIwIDExOjAzOjIyICswMDAwCkBAIC02MywxMSArNjMsNiBAQCBpbnQgbWlfZGVsZXRlX2Fs
bF9yb3dzKE1JX0lORk8gKmluZm8pCiAgICAgICBteV9jaHNpemUoc2hhcmUtPmtmaWxlLCBzaGFy
ZS0+YmFzZS5rZXlzdGFydCwgMCwgTVlGKE1ZX1dNRSkpICApCiAgICAgZ290byBlcnI7CiAgIFZP
SUQoX21pX3dyaXRlaW5mbyhpbmZvLFdSSVRFSU5GT19VUERBVEVfS0VZRklMRSkpOwotI2lmZGVm
IEhBVkVfTU1BUAotICAvKiBNYXAgYWdhaW4gKi8KLSAgaWYgKHNoYXJlLT5maWxlX21hcCkKLSAg
ICBtaV9keW5tYXBfZmlsZShpbmZvLCAobXlfb2ZmX3QpIDApOwotI2VuZGlmCiAgIGFsbG93X2Jy
ZWFrKCk7CQkJLyogQWxsb3cgU0lHSFVQICYgU0lHSU5UICovCiAgIERCVUdfUkVUVVJOKDApOwog
CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==