From: Joerg Bruehe
Date: August 15 2011 7:15pm
Subject: bzr push into mysql-5.1 branch (joerg.bruehe:3584 to 3585) Bug#47337
List-Archive: http://lists.mysql.com/commits/140628
X-Bug: 47337
Message-Id: <201108151915.p7FJFiUR022246@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1ODUgSm9lcmcgQnJ1ZWhlCTIwMTEtMDgtMTUgW21lcmdlXQogICAgICBNZXJnZSBidWcjNDcz
MzcgZm9yIHB1c2hpbmcgaW50byA1LjEKCiAgICBtb2RpZmllZDoKICAgICAgY29uZmlndXJlLmlu
CiAzNTg0IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDgtMTUKICAgICAgQnVnICMxMTc2NjU5MSA1OTcz
MzogUG9zc2libGUgZGVhZGxvY2sgd2hlbiBidWZmZXJlZCBjaGFuZ2VzIGFyZSB0byBiZQogICAg
ICBkaXNjYXJkZWQgaW4gYnVmX3BhZ2VfY3JlYXRlKCkKICAgICAgCiAgICAgIFRoaXMgYnVnIHR1
cm5lZCBvdXQgdG8gYmUgYSBmYWxzZSBhbGFybSwgYSBidWcgaW4gdGhlIFVOSVZfU1lOQ19ERUJV
RwogICAgICBkaWFnbm9zdGljIGNvZGUuIEJlY2F1c2Ugb2YgdGhpcywgdGhlIHBhdGNoIHdhcyBu
b3QgYmFja3BvcnRlZCB0byB0aGUKICAgICAgYnVpbHQtaW4gSW5ub0RCIGluIE15U1FMIDUuMS4g
RnVydGhlcm1vcmUsIHRoZXJlIGlzIG5vIHRlc3QgY2FzZSBmb3IKICAgICAgSW5ub0RCIFBsdWdp
biBpbiBNeVNRTCA1LjEsIGJlY2F1c2UgdGhlIGRlbGV0ZSBidWZmZXJpbmcgaW4gTXlTUUwgNS41
CiAgICAgIG1ha2VzIHRyaWdnZXJpbmcgdGhlIGZhaWx1cmUgbXVjaCBlYXNpZXIuCiAgICAgIAog
ICAgICBXaGVuIGEgZnJlZWQgcGFnZSBmb3Igd2hpY2ggdGhlcmUgZXhpc3Qgb3JwaGFuZWQgYnVm
ZmVyZWQgY2hhbmdlcyBpcwogICAgICBhbGxvY2F0ZWQgYW5kIHJldXNlZCBmb3Igc29tZXRoaW5n
IGVsc2UsIGJ1Zl9wYWdlX2NyZWF0ZSgpIHdpbGwgZGlzY2FyZAogICAgICB0aGUgYnVmZmVyZWQg
Y2hhbmdlcyBieSBpbnZva2luZyBpYnVmX21lcmdlX29yX2RlbGV0ZV9mb3JfcGFnZSgpLgogICAg
ICBUaGlzIHdvdWxkIHZpb2xhdGUgdGhlIElubm9EQiBsYXRjaGluZyBvcmRlci4KICAgICAgCiAg
ICAgIFR3ZWFrIHRoZSBsYXRjaGluZyBvcmRlciBhcyBmb2xsb3dzLiBNb3ZlIFNZTkNfSUJVRl9N
VVRFWCBiZWxvdwogICAgICBTWU5DX0ZTUF9QQUdFLCB3aGVyZSBpdCBsb2dpY2FsbHkgYmVsb25n
cywgYW5kIGFzc2lnbiBuZXcgbGF0Y2hpbmcKICAgICAgbGV2ZWxzIGZvciB0aGUgaWJ1Zi0+aW5k
ZXgtPmxvY2sgYW5kIHRoZSBpbnNlcnQgYnVmZmVyIEItdHJlZSBwYWdlczoKICAgICAgCiAgICAg
ICNkZWZpbmUgU1lOQ19JQlVGX01VVEVYCQkzNzAJLyogaWJ1Zl9tdXRleCAqLwogICAgICAjZGVm
aW5lIFNZTkNfSUJVRl9JTkRFWF9UUkVFCTM2MAogICAgICAjZGVmaW5lIFNZTkNfSUJVRl9UUkVF
X05PREVfTkVXCTM1OQogICAgICAjZGVmaW5lIFNZTkNfSUJVRl9UUkVFX05PREUJMzU4CiAgICAg
IAogICAgICBidHJfYmxvY2tfZ2V0KCksIGJ0cl9wYWdlX2dldCgpOiBJbiBVTklWX1NZTkNfREVC
VUcsIGFkZCB0aGUgcGFyYW1ldGVyCiAgICAgICJpbmRleCIgZm9yIGRldGVybWluaW5nIHRoZSBh
cHByb3ByaWF0ZSBsYXRjaGluZyBvcmRlcgogICAgICAoU1lOQ19JQlVGX1RSRUVfTk9ERSBvciBT
WU5DX1RSRUVfTk9ERSkuCiAgICAgIAogICAgICBidHJfcGFnZV9hbGxvY19mb3JfaWJ1ZigpLCBi
dHJfY3JlYXRlKCk6IFVzZSBTWU5DX0lCVUZfVFJFRV9OT0RFX05FVwogICAgICBpbnN0ZWFkIG9m
IFNZTkNfVFJFRV9OT0RFX05FVyBmb3IgaW5zZXJ0IGJ1ZmZlciBwYWdlcy4KICAgICAgCiAgICAg
IGJ0cl9jdXJfc2VhcmNoX3RvX250aF9sZXZlbCgpLCBidHJfcGN1cl9yZXN0b3JlX3Bvc2l0aW9u
X2Z1bmMoKTogVXNlCiAgICAgIFNZTkNfSUJVRl9UUkVFX05PREUgaW5zdGVhZCBvZiBTWU5DX1RS
RUVfTk9ERSBmb3IgaW5zZXJ0IGJ1ZmZlciBwYWdlcy4KICAgICAgCiAgICAgIGJ0cl9zZWFyY2hf
Z3Vlc3Nfb25faGFzaCgpOiBBc3NlcnQgdGhhdCB0aGUgaW5kZXggaXMgbm90IGFuIGluc2VydCBi
dWZmZXIgdHJlZS4KICAgICAgCiAgICAgIGRpY3RfaW5kZXhfYWRkX3RvX2NhY2hlKCk6IFVzZSBT
WU5DX0lCVUZfSU5ERVhfVFJFRSBmb3IgdGhlIGluc2VydAogICAgICBidWZmZXIgdHJlZSAoaWJ1
Zi0+aW5kZXgtPmxvY2spLgogICAgICAKICAgICAgaWJ1ZjBpYnVmLmM6IFVzZSBTWU5DX0lCVUZf
VFJFRV9OT0RFIG9yIFNZTkNfSUJVRl9UUkVFX05PREVfTkVXIGZvcgogICAgICBhbGwgQi10cmVl
IHBhZ2VzLgogICAgICAKICAgICAgaWJ1Zl9tZXJnZV9vcl9kZWxldGVfZm9yX3BhZ2UoKTogQXNz
ZXJ0IHRoYXQgdGhlIHVzZXIgcGFnZSBpcwogICAgICBCVUZfSU9fUkVBRCBmaXhlZC4gT25seSBp
biB0aGlzIHdheSBpdCBpcyBPSyB0byBsYXRjaCBpdCBhcwogICAgICBTWU5DX0lCVUZfVFJFRV9O
T0RFIGluc3RlYWQgb2YgdGhlIHByb3BlciBTWU5DX1RSRUVfTk9ERSAod2hpY2ggd291bGQKICAg
ICAgdmlvbGF0ZSB0aGUgY2hhbmdlZCBsYXRjaGluZyBvcmRlcikuCiAgICAgIAogICAgICBzeW5j
X3RocmVhZF9hZGRfbGV2ZWwoKTogUmVtb3ZlIHRoZSBzcGVjaWFsIHR3ZWFrIGZvcgogICAgICBT
WU5DX0lCVUZfTVVURVguIEFkZCBydWxlcyBmb3IgdGhlIGFkZGVkIGxhdGNoaW5nIGxldmVscy4K
ICAgICAgCiAgICAgIHJiOjU5MSBhcHByb3ZlZCBieSBKaW1teSBZYW5nCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9i
dHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwcGN1ci5jCiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMHNlYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9kaWN0L2RpY3QwY3JlYS5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0
L2RpY3QwZGljdC5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pYnVmL2lidWYwaWJ1Zi5j
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J0cjBidHIuaAogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwYnRyLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL3N5bmMwc3luYy5oCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9z
eW5jL3N5bmMwc3luYy5jCj09PSBtb2RpZmllZCBmaWxlICdjb25maWd1cmUuaW4nCi0tLSBhL2Nv
bmZpZ3VyZS5pbgkyMDExLTA4LTEyIDExOjIwOjE3ICswMDAwCisrKyBiL2NvbmZpZ3VyZS5pbgky
MDExLTA4LTE1IDE4OjQxOjE3ICswMDAwCkBAIC0yNzExLDcgKzI3MTEsNyBAQCB0aGVuCiAgICAg
TUFOX0RST1A9IiRNQU5fRFJPUCBlbWJlZGRlZCIKICAgICBncmVwIC12ICdlbWJlZGRlZCcgJE1B
TkxJU1RGSUwgPiAkVE1QTElTVEZJTCA7IG12IC1mICRUTVBMSVNURklMICRNQU5MSVNURklMCiAg
IGZpCi0gIGlmIHRlc3QgWCIkd2l0aF9wbHVnaW5faW5ub2Jhc2UiICE9IFh5ZXMKKyAgaWYgdGVz
dCBYIiR3aXRoX3BsdWdpbl9pbm5vYmFzZSIgIT0gWHllcyAtYSBYIiR3aXRoX3BsdWdpbl9pbm5v
ZGJfcGx1Z2luIiAhPSBYeWVzCiAgIHRoZW4KICAgICBNQU5fRFJPUD0iJE1BTl9EUk9QIGlubm9k
YiIKICAgICBncmVwIC12ICdpbm5vJyAkTUFOTElTVEZJTCA+ICRUTVBMSVNURklMIDsgbXYgLWYg
JFRNUExJU1RGSUwgJE1BTkxJU1RGSUwKQEAgLTI3OTAsNyArMjc5MCw3IEBAIHRoZW4KIGZpCiAK
ICMgImlubm9jaGVja3N1bSIgaXMgbm90IGluIHRoZSAiaW5ub2Jhc2UvIiBzdWJkaXJlY3Rvcnks
IGJ1dCBzaG91bGQgYmUgc3dpdGNoZWQKLUFNX0NPTkRJVElPTkFMKFtCVUlMRF9JTk5PREJfVE9P
TFNdLCBbdGVzdCBYIiR3aXRoX3BsdWdpbl9pbm5vYmFzZSIgPSBYeWVzXSkKK0FNX0NPTkRJVElP
TkFMKFtCVUlMRF9JTk5PREJfVE9PTFNdLCBbdGVzdCBYIiR3aXRoX3BsdWdpbl9pbm5vYmFzZSIg
PSBYeWVzIC1vIFgiJHdpdGhfcGx1Z2luX2lubm9kYl9wbHVnaW4iID0gWHllcyBdKQogCiAjIElN
UE9SVEFOVCAtIGRvIG5vdCBtb2RpZnkgTElCUyBwYXN0IHRoaXMgbGluZSAtIHRoaXMgaGFjayBp
cyB0aGUgb25seSB3YXkKICMgSSBrbm93IHRvIGFkZCB0aGUgc3RhdGljIE5TUyBtYWdpYyBpZiB3
ZSBoYXZlIHN0YXRpYyBOU1MgbGlicmFyaWVzIHdpdGgKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2Vs
ZXNzIGZvciBwdXNoIGVtYWlscyku