From: marko.makela
Date: November 10 2011 3:01pm
Subject: bzr push into mysql-5.1 branch (marko.makela:3639 to 3640) Bug#7975
 Bug#11759688 Bug#12842206
List-Archive: http://lists.mysql.com/commits/141792
X-Bug: 7975,11759688,12842206
Message-Id: <201111101501.pAAF1FGV010525@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2NDAgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0xMAogICAgICBCdWcgIzEyODQyMjA2IElOTk9E
QiBMT0NLSU5HIFJFR1JFU1NJT04gRk9SIElOU0VSVCBJR05PUkU6IEFkZCBhIHRlc3QgY2FzZS4K
ICAgICAgVGhlIGJ1ZyB3YXMgYWNjaWRlbnRhbGx5IGZpeGVkIGJ5IGZpeGluZwogICAgICBCdWcj
MTE3NTk2ODggNTIwMjA6IElubm9EQiBjYW4gc3RpbGwgZGVhZGxvY2sgb24ganVzdCBJTlNFUlQu
Li5PTiBEVVBMSUNBVEUgS0VZCiAgICAgIGEuay5hLiB0aGUgcmVpbnRyb2R1Y3Rpb24gb2YKICAg
ICAgQnVnIzc5NzUgZGVhZGxvY2sgd2l0aG91dCBhbnkgbG9ja2luZywgc2ltcGxlIHNlbGVjdCBh
bmQgdXBkYXRlCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Iv
aW5ub2RiLWxvY2sucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2Ri
LWxvY2sudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGIt
bG9jay5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2Ri
LWxvY2sudGVzdAogMzYzOSBNYXJrbyBNw6RrZWzDpAkyMDExLTExLTEwCiAgICAgIEJ1ZyMxMTc1
OTY4OCA1MjAyMDogSW5ub0RCIGNhbiBzdGlsbCBkZWFkbG9jayBvbiBqdXN0IElOU0VSVC4uLk9O
IERVUExJQ0FURSBLRVkKICAgICAgYS5rLmEuIEJ1ZyM3OTc1IGRlYWRsb2NrIHdpdGhvdXQgYW55
IGxvY2tpbmcsIHNpbXBsZSBzZWxlY3QgYW5kIHVwZGF0ZQogICAgICAKICAgICAgQnVnIzc5NzUg
d2FzIHJlaW50cm9kdWNlZCB3aGVuIHRoZSBzdG9yYWdlIGVuZ2luZSBBUEkgd2FzIG1hZGUKICAg
ICAgcGx1Z2dhYmxlIGluIE15U1FMIDUuMS4gSW5zdGVhZCBvZiBsb29raW5nIGF0IHRoZC0+bGV4
IGRpcmVjdGx5LCB3ZQogICAgICByZWx5IG9uIGhhbmRsZXI6OmV4dHJhKCkuIEJ1dCwgd2Ugd2Vy
ZSBsb29raW5nIGF0IHRoZSB3cm9uZyBleHRyYSgpCiAgICAgIGZsYWcsIGFuZCB3ZSB3ZXJlIGln
bm9yaW5nIHRoZSBUUlhfRFVQX1JFUExBQ0UgZmxhZyBpbiBwbGFjZXMgd2hlcmUgd2UKICAgICAg
c2hvdWxkIG9iZXkgaXQuCiAgICAgIAogICAgICBpbm5vZGJfcmVwbGFjZS50ZXN0OiBBZGQgdGVz
dHMgZm9yIGhvcGVmdWxseSBhbGwgYWZmZWN0ZWQgc3RhdGVtZW50CiAgICAgIHR5cGVzLCBzbyB0
aGF0IGJ1ZyBzaG91bGQgbmV2ZXIgZXZlciByZXN1cmZhY2UuIFRoaXMga2luZCBvZiB0ZXN0cwog
ICAgICBzaG91bGQgaGF2ZSBiZWVuIGFkZGVkIHdoZW4gZml4aW5nIEJ1ZyM3OTc1IGluIE15U1FM
IDUuMC4zIGluIHRoZQogICAgICBmaXJzdCBwbGFjZS4KICAgICAgCiAgICAgIHJiOjgwNiBhcHBy
b3ZlZCBieSBTdW5ueSBCYWlucwoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYl9yZXBsYWNlLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYl9yZXBsYWNlLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1
Z2luL3IvaW5ub2RiX3JlcGxhY2UucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
X3BsdWdpbi90L2lubm9kYl9yZXBsYWNlLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzcWwvc3Fs
X2luc2VydC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuYwogICAgICBzdG9yYWdlL2lubm9kYl9w
bHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lu
bm9kYi5jYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBpbnMuYwo9PT0gbW9k
aWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9jay5yZXN1bHQn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWxvY2sucmVzdWx0CXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEwMTA0OTMxLXc4eHR1djAybmZqYmkyYW4K
KysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItbG9jay5yZXN1bHQJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMTAxNDQ1NDctdzUzd3VmYnRsMTV3MTYzcApA
QCAtNTUsMyArNTUsMjAgQEAgaWQJeAogMQkxCiAyCTEwCiBkcm9wIHRhYmxlIHQxOworIworI0J1
ZyMxMjg0MjIwNiBJTk5PREIgTE9DS0lORyBSRUdSRVNTSU9OIEZPUiBJTlNFUlQgSUdOT1JFCisj
Zml4ZWQgYnkgcmUtZml4aW5nIEJ1ZyM3OTc1CisjYWthIEJ1ZyMxMTc1OTY4OCA1MjAyMDogSW5u
b0RCIGNhbiBzdGlsbCBkZWFkbG9jayBvbiBqdXN0IElOU0VSVC4uLgorIworQ1JFQVRFIFRBQkxF
IHQxIChhIElOVCBQUklNQVJZIEtFWSwgYiBJTlQgTk9UIE5VTEwpIEVOR0lORT1Jbm5vREI7CitJ
TlNFUlQgSU5UTyB0MSBWQUxVRVMoMywxKTsKK0JFR0lOOworSU5TRVJUIElHTk9SRSBJTlRPIHQx
IFZBTFVFUygzLDE0KTsKK0JFR0lOOworSU5TRVJUIElHTk9SRSBJTlRPIHQxIFZBTFVFUygzLDIz
KTsKK1NFTEVDVCAqIEZST00gdDEgRk9SIFVQREFURTsKK0NPTU1JVDsKK2EJYgorMwkxCitDT01N
SVQ7CitEUk9QIFRBQkxFIHQxOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiLWxvY2sudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGItbG9jay50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEw
MTA0OTMxLXc4eHR1djAybmZqYmkyYW4KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9p
bm5vZGItbG9jay50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTEwMTQ0
NTQ3LXc1M3d1ZmJ0bDE1dzE2M3AKQEAgLTEwMCwzICsxMDAsNDQgQEAgc2VsZWN0ICogZnJvbSB0
MTsKIGRyb3AgdGFibGUgdDE7CiAKICMgRW5kIG9mIDQuMSB0ZXN0cworCistLWVjaG8gIworLS1l
Y2hvICNCdWcjMTI4NDIyMDYgSU5OT0RCIExPQ0tJTkcgUkVHUkVTU0lPTiBGT1IgSU5TRVJUIElH
Tk9SRQorLS1lY2hvICNmaXhlZCBieSByZS1maXhpbmcgQnVnIzc5NzUKKy0tZWNobyAjYWthIEJ1
ZyMxMTc1OTY4OCA1MjAyMDogSW5ub0RCIGNhbiBzdGlsbCBkZWFkbG9jayBvbiBqdXN0IElOU0VS
VC4uLgorLS1lY2hvICMKKworY29ubmVjdGlvbiBkZWZhdWx0OworQ1JFQVRFIFRBQkxFIHQxIChh
IElOVCBQUklNQVJZIEtFWSwgYiBJTlQgTk9UIE5VTEwpIEVOR0lORT1Jbm5vREI7CisKK0lOU0VS
VCBJTlRPIHQxIFZBTFVFUygzLDEpOworCitCRUdJTjsKKyMgdGhpcyB1c2VkIHRvIHdyb25nbHkg
YWNxdWlyZSBhbiBYIGxvY2s7IG5vdyBpdCB0YWtlcyBhbiBTIGxvY2sKK0lOU0VSVCBJR05PUkUg
SU5UTyB0MSBWQUxVRVMoMywxNCk7CisKK2Nvbm5lY3Rpb24gY29uMTsKK0JFR0lOOworIyB0aGlz
IHVzZWQgdG8gd3JvbmdseSBhY3F1aXJlIGFuIFggbG9jazsgbm93IGl0IHRha2VzIGFuIFMgbG9j
aworSU5TRVJUIElHTk9SRSBJTlRPIHQxIFZBTFVFUygzLDIzKTsKKy0tc2VuZAorU0VMRUNUICog
RlJPTSB0MSBGT1IgVVBEQVRFOworCitjb25uZWN0aW9uIGNvbjI7CisjIENoZWNrIHRoYXQgdGhl
IGFib3ZlIFNFTEVDVCBpcyBibG9ja2VkCitsZXQgJHdhaXRfY29uZGl0aW9uPQorICBzZWxlY3Qg
Y291bnQoKikgPSAxIGZyb20gaW5mb3JtYXRpb25fc2NoZW1hLnByb2Nlc3NsaXN0CisgIHdoZXJl
IHN0YXRlID0gJ1NlbmRpbmcgZGF0YScgYW5kCisgICAgICAgIGluZm8gPSAnU0VMRUNUICogRlJP
TSB0MSBGT1IgVVBEQVRFJzsKKy0tc291cmNlIGluY2x1ZGUvd2FpdF9jb25kaXRpb24uaW5jCisK
K2Nvbm5lY3Rpb24gZGVmYXVsdDsKK0NPTU1JVDsKK2Nvbm5lY3Rpb24gY29uMTsKK3JlYXA7CitD
T01NSVQ7CitkaXNjb25uZWN0IGNvbjE7CitkaXNjb25uZWN0IGNvbjI7CisKK2Nvbm5lY3Rpb24g
ZGVmYXVsdDsKK0RST1AgVEFCTEUgdDE7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiLWxvY2sucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0
L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItbG9jay5yZXN1bHQJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTExMTAxMDQ5MzEtdzh4dHV2MDJuZmpiaTJhbgorKysgYi9teXNx
bC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItbG9jay5yZXN1bHQJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMTAxNDQ1NDctdzUzd3VmYnRsMTV3MTYzcApAQCAt
NTUsMyArNTUsMjAgQEAgaWQJeAogMQkxCiAyCTEwCiBkcm9wIHRhYmxlIHQxOworIworI0J1ZyMx
Mjg0MjIwNiBJTk5PREIgTE9DS0lORyBSRUdSRVNTSU9OIEZPUiBJTlNFUlQgSUdOT1JFCisjZml4
ZWQgYnkgcmUtZml4aW5nIEJ1ZyM3OTc1CisjYWthIEJ1ZyMxMTc1OTY4OCA1MjAyMDogSW5ub0RC
IGNhbiBzdGlsbCBkZWFkbG9jayBvbiBqdXN0IElOU0VSVC4uLgorIworQ1JFQVRFIFRBQkxFIHQx
IChhIElOVCBQUklNQVJZIEtFWSwgYiBJTlQgTk9UIE5VTEwpIEVOR0lORT1Jbm5vREI7CitJTlNF
UlQgSU5UTyB0MSBWQUxVRVMoMywxKTsKK0JFR0lOOworSU5TRVJUIElHTk9SRSBJTlRPIHQxIFZB
TFVFUygzLDE0KTsKK0JFR0lOOworSU5TRVJUIElHTk9SRSBJTlRPIHQxIFZBTFVFUygzLDIzKTsK
K1NFTEVDVCAqIEZST00gdDEgRk9SIFVQREFURTsKK0NPTU1JVDsKK2EJYgorMwkxCitDT01NSVQ7
CitEUk9QIFRBQkxFIHQxOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2lubm9kYi1sb2NrLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2lubm9kYi1sb2NrLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTExMTAxMDQ5MzEtdzh4dHV2MDJuZmpiaTJhbgorKysgYi9teXNxbC10ZXN0L3N1aXRl
L2lubm9kYl9wbHVnaW4vdC9pbm5vZGItbG9jay50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTExMTEwMTQ0NTQ3LXc1M3d1ZmJ0bDE1dzE2M3AKQEAgLTEwMCwzICsxMDAsNDQg
QEAgc2VsZWN0ICogZnJvbSB0MTsKIGRyb3AgdGFibGUgdDE7CiAKICMgRW5kIG9mIDQuMSB0ZXN0
cworCistLWVjaG8gIworLS1lY2hvICNCdWcjMTI4NDIyMDYgSU5OT0RCIExPQ0tJTkcgUkVHUkVT
U0lPTiBGT1IgSU5TRVJUIElHTk9SRQorLS1lY2hvICNmaXhlZCBieSByZS1maXhpbmcgQnVnIzc5
NzUKKy0tZWNobyAjYWthIEJ1ZyMxMTc1OTY4OCA1MjAyMDogSW5ub0RCIGNhbiBzdGlsbCBkZWFk
bG9jayBvbiBqdXN0IElOU0VSVC4uLgorLS1lY2hvICMKKworY29ubmVjdGlvbiBkZWZhdWx0Owor
Q1JFQVRFIFRBQkxFIHQxIChhIElOVCBQUklNQVJZIEtFWSwgYiBJTlQgTk9UIE5VTEwpIEVOR0lO
RT1Jbm5vREI7CisKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUygzLDEpOworCitCRUdJTjsKKyMgdGhp
cyB1c2VkIHRvIHdyb25nbHkgYWNxdWlyZSBhbiBYIGxvY2s7IG5vdyBpdCB0YWtlcyBhbiBTIGxv
Y2sKK0lOU0VSVCBJR05PUkUgSU5UTyB0MSBWQUxVRVMoMywxNCk7CisKK2Nvbm5lY3Rpb24gY29u
MTsKK0JFR0lOOworIyB0aGlzIHVzZWQgdG8gd3JvbmdseSBhY3F1aXJlIGFuIFggbG9jazsgbm93
IGl0IHRha2VzIGFuIFMgbG9jaworSU5TRVJUIElHTk9SRSBJTlRPIHQxIFZBTFVFUygzLDIzKTsK
Ky0tc2VuZAorU0VMRUNUICogRlJPTSB0MSBGT1IgVVBEQVRFOworCitjb25uZWN0aW9uIGNvbjI7
CisjIENoZWNrIHRoYXQgdGhlIGFib3ZlIFNFTEVDVCBpcyBibG9ja2VkCitsZXQgJHdhaXRfY29u
ZGl0aW9uPQorICBzZWxlY3QgY291bnQoKikgPSAxIGZyb20gaW5mb3JtYXRpb25fc2NoZW1hLnBy
b2Nlc3NsaXN0CisgIHdoZXJlIHN0YXRlID0gJ1NlbmRpbmcgZGF0YScgYW5kCisgICAgICAgIGlu
Zm8gPSAnU0VMRUNUICogRlJPTSB0MSBGT1IgVVBEQVRFJzsKKy0tc291cmNlIGluY2x1ZGUvd2Fp
dF9jb25kaXRpb24uaW5jCisKK2Nvbm5lY3Rpb24gZGVmYXVsdDsKK0NPTU1JVDsKK2Nvbm5lY3Rp
b24gY29uMTsKK3JlYXA7CitDT01NSVQ7CitkaXNjb25uZWN0IGNvbjE7CitkaXNjb25uZWN0IGNv
bjI7CisKK2Nvbm5lY3Rpb24gZGVmYXVsdDsKK0RST1AgVEFCTEUgdDE7CgpObyBidW5kbGUgKHJl
YXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==