From: Bjorn Munch
Date: February 7 2011 11:57pm
Subject: bzr push into mysql-5.1 branch (bjorn.munch:3579 to 3580)
List-Archive: http://lists.mysql.com/commits/130651
Message-Id: <201102072357.p17Nv8TQ021368@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1ODAgQmpvcm4gTXVuY2gJMjAxMS0wMi0wOCBbbWVyZ2VdCiAgICAgIG1lcmdlIDQ3MTQxLDU5
OTc5CgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3QvbXlzcWwtdGVzdC1ydW4ucGwKIDM1
NzkgT2xlIEpvaG4gQXNrZQkyMDExLTAyLTA3CiAgICAgIEZpeCBmb3IgYnVnIzU5MzA4OiBJbmNv
cnJlY3QgcmVzdWx0IGZvciBTRUxFQ1QgRElTVElOQ1QgPGNvbD4uLi4gT1JERVIgQlkgPGNvbD4g
REVTQy4KICAgICAgICAgICAgCiAgICAgIEFsc28gZml4IGJ1ZyM1OTExMDogTWVtb3J5IGxlYWsg
b2YgUVVJQ0tfU0VMRUNUX0kgYWxsb2NhdGVkIG1lbW9yeS4KICAgICAgSW5jbHVkZXMgSsO4cmdl
biBMw7hsYW5kcyByZXZpZXcgY29tbWVudHMuCiAgICAgICAgICAgIAogICAgICBSb290IGNhdXNl
IG9mIHRoZXNlIGJ1Z3MgYXJlIHRoYXQgdGVzdF9pZl9za2lwX3NvcnRfb3JkZXIoKSBkZWNpZGVk
IHRvCiAgICAgIHJldmVydCB0aGUgJ3NraXBfc29ydF9vcmRlcicgZGVzY2lzaW9uIChhbmQgdXNl
IGZpbGVzb3J0KSBhZnRlciB0aGUKICAgICAgcXVlcnkgcGxhbiBoYXMgYmVlbiB1cGRhdGVkIHRv
IHJlZmxlY3QgYSAnc2tpcCcgb2YgdGhlIHNvcnQgb3JkZXIuCiAgICAgICAgICAgIAogICAgICBU
aGlzIG1pZ2h0IGhhcHBlbiBpbiAnY2hlY2tfcmV2ZXJzZV9vcmRlcjonIGlmIHdlIGhhdmUgYSAK
ICAgICAgc2VsZWN0LT5xdWljayB3aGljaCBjb3VsZCBub3QgYmUgbWFkZSBkZXNjZW5kaW5nIGJ5
IGFwcGVuZGluZyAKICAgICAgYSBRVUlDS19TRUxFQ1RfREVTQy4gKCkuCiAgICAgICAgICAgIAog
ICAgICBUaGUgb3JpZ2luYWwgJ3NhdmVfcXVpY2snIHdhcyB0aGVuIHJlc3RvcmVkIGFmdGVyIHRo
ZSBRRVAgaGFzIGJlZW4gbW9kaWZpZWQsCiAgICAgIHdoaWNoIGNhdXNlZDoKICAgICAgICAgICAg
CiAgICAgICAgLSBBbiBpbmNvcnJlY3QgJ3ByZWNvbXB1dGVkX2dyb3VwX2J5PSBUUlVFJyBtYXkg
aGF2ZSBiZWVuIHNldCwgCiAgICAgICAgICBhbmQgbm90IHJldmVydGVkLCBhcyBwYXJ0IG9mIHRo
ZSBhbHJlYWR5IG1vZGlmaWZpZWQgUUVQIChCdWcjNTkzMDgpCiAgICAgICAgLSBBICdzZWxlY3Qt
PnF1aWNrJyBtaWdodCBoYXZlIGJlZW4gY3JlYXRlZCB3aGljaCB3ZSBmYWlsIHRvIGRlbGV0ZSAo
YnVnIzU5MTEwKS4KICAgICAgICAgICAgCiAgICAgIFRoaXMgZml4IGlzIGEgcmVmYWN0b3JpY2F0
aW9uIG9mIHRlc3RfaWZfc2tpcF9zb3J0X29yZGVyKCkgd2hlcmUgYWxsIGxvZ2ljCiAgICAgIHJl
bGF0ZWQgdG8gbW9kaWZpY2F0aW9uIG9mIFFFUCAoY29udHJvbGxlZCBieSBhcmd1bWVudCAnYm9v
bCBub19jaGFuZ2VzJyksIGlzCiAgICAgIG1vdmVkIHRvIHRoZSBlbmQgb2YgdGVzdF9pZl9za2lw
X3NvcnRfb3JkZXIoKSwgYW5kIGRvbmUgYWZ0ZXIgKmFsbCogJ3Rlc3RfaWZfc2tpcCcKICAgICAg
Y2hlY2tzIGhhcyBiZWVuIHBlcmZvcm1lZCAtIGluY2x1ZGluZyB0aGUgJ2NoZWNrX3JldmVyc2Vf
b3JkZXI6JyBjaGVja3MuCiAgICAgICAgICAgIAogICAgICBUaGUgcmVmYWN0b3JpY2F0aW9uIGFi
b3ZlIGNvbnRhaW5zIG5vdyBpbnRlbnRpb25hbCBjaGFuZ2VzIHRvIHRoZSBsb2dpYyB3aGljaCAK
ICAgICAgaGFzIGJlZW4gbW92ZWQgdG8gdGhlIGVuZCBvZiB0aGUgZnVuY3Rpb24uCiAgICAgICAg
ICAgIAogICAgICBGdXJ0aGVybW9yZSwgYSBzbWFsbGVyIHBhcnQgb2YgdGhlIGZpeCBhZGRyZXNz
IHRoZSBoYW5kbGluZyBvZiB0aGUgCiAgICAgIHNlbGVjdC0+cXVpY2sgb2JqZWN0cyB3aGljaCBt
YXkgYWxyZWFkeSBleGlzdHMgd2hlbiB3ZSBjYWxsIAogICAgICAndGVzdF9pZl9za2lwX3NvcnRf
b3JkZXIoKScgKHNhdmVfcXVpY2spIC1hbmQKICAgICAgbmV3IHNlbGVjdC0+cXVpY2sncyBjcmVh
dGVkIGR1cmluZyB0ZXN0X2lmX3NraXBfc29ydF9vcmRlcigpOgogICAgICAgICAgICAKICAgICAg
ICAtIEJlZm9yZSBuZXcgc2VsZWN0LT5xdWljayBtYXkgYmUgY3JlYXRlZCBieSBjYWxsaW5nIDo6
dGVzdF9xdWlja19zZWxlY3QoKSwgd2UKICAgICAgICAgIHNldCAnc2VsZWN0LT5xdWljaz0gMCcg
dG8gYXZvaWQgdGhhdCA6OnRlc3RfcXVpY2tfc2VsZWN0KCkgcHJlbWF0dXJlbHkKICAgICAgICAg
IGRlbGV0ZSB0aGUgc2F2ZV9xdWljaydzLiAoQWZ0ZXIgdGhpcyBjYWxsIHdlIG1heSBoYXZlIGJv
dGggYSAnc2F2ZV9xdWljaycgCiAgICAgICAgICBhbmQgJ3NlbGVjdC0+cXVpY2snKQogICAgICAg
ICAgICAKICAgICAgICAtIEFsbCByZXR1cm5zIGZyb20gOjp0ZXN0X2lmX3NraXBfc29ydF9vcmRl
cigpIHdoZXJlIHdlIG1heSBoYXZlIGJvdGggYQogICAgICAgICAgJ3NhdmVfcXVpY2snIGFuZCBh
ICdzZWxlY3QtPnF1aWNrJyBoYXMgYmVlbiBjaGFuZ2VkIHRvIGdvdG8ncyB0byB0aGUKICAgICAg
ICAgIGV4aXQgcG9pbnRzICdza2lwZWRfc29ydF9vcmRlcjonIG9yICduZWVkX2ZpbGVzb3J0Oicg
d2hlcmUgd2UKICAgICAgICAgIGRlY2lkZSB3aGljaCBvZiB0aGUgUVVJQ0tfU0VMRUNUJ3MgdG8g
a2VlcCwgYW5kIGRlbGV0ZSB0aGUgb3RoZXIuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRl
c3Qvci9vcmRlcl9ieS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L29yZGVyX2J5LnRlc3QKICAg
ICAgc3FsL3NxbF9zZWxlY3QuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvbXlzcWwt
dGVzdC1ydW4ucGwnCi0tLSBhL215c3FsLXRlc3QvbXlzcWwtdGVzdC1ydW4ucGwJMjAxMS0wMS0y
NyAxMTozODoxMyArMDAwMAorKysgYi9teXNxbC10ZXN0L215c3FsLXRlc3QtcnVuLnBsCTIwMTEt
MDItMDcgMTE6NDI6MjEgKzAwMDAKQEAgLTE4Miw2ICsxODIsNyBAQCBteSAkb3B0X2N1cnNvcl9w
cm90b2NvbDsKIG15ICRvcHRfdmlld19wcm90b2NvbDsKIAogb3VyICRvcHRfZGVidWc7CitvdXIg
JG9wdF9kZWJ1Z19zZXJ2ZXI7CiBvdXIgQG9wdF9jYXNlczsgICAgICAgICAgICAgICAgICAjIFRo
ZSB0ZXN0IGNhc2VzIG5hbWVzIGluIGFyZ3YKIG91ciAkb3B0X2VtYmVkZGVkX3NlcnZlcjsKIApA
QCAtOTM2LDYgKzkzNyw3IEBAIHN1YiBjb21tYW5kX2xpbmVfc2V0dXAgewogCiAgICAgICAgICAg
ICAgIyBEZWJ1Z2dpbmcKICAgICAgICAgICAgICAnZGVidWcnICAgICAgICAgICAgICAgICAgICA9
PiBcJG9wdF9kZWJ1ZywKKyAgICAgICAgICAgICAnZGVidWctc2VydmVyJyAgICAgICAgICAgICA9
PiBcJG9wdF9kZWJ1Z19zZXJ2ZXIsCiAgICAgICAgICAgICAgJ2dkYicgICAgICAgICAgICAgICAg
ICAgICAgPT4gXCRvcHRfZ2RiLAogICAgICAgICAgICAgICdjbGllbnQtZ2RiJyAgICAgICAgICAg
ICAgID0+IFwkb3B0X2NsaWVudF9nZGIsCiAgICAgICAgICAgICAgJ21hbnVhbC1nZGInICAgICAg
ICAgICAgICAgPT4gXCRvcHRfbWFudWFsX2dkYiwKQEAgLTEwODIsNiArMTA4NCw5IEBAIHN1YiBj
b21tYW5kX2xpbmVfc2V0dXAgewogICBteSAkcGF0aF9zaGFyZT0gZGlybmFtZSgkcGF0aF9sYW5n
dWFnZSk7CiAgICRwYXRoX2NoYXJzZXRzZGlyPSAgIG10cl9wYXRoX2V4aXN0cygiJHBhdGhfc2hh
cmUvY2hhcnNldHMiKTsKIAorICAjIC0tZGVidWcgaW1wbGllcyB3ZSBydW4gZGVidWcgc2VydmVy
CisgICRvcHRfZGVidWdfc2VydmVyPSAxIGlmICRvcHRfZGVidWc7CisKICAgaWYgKHVzaW5nX2V4
dGVybigpKQogICB7CiAgICAgIyBDb25uZWN0IHRvIHRoZSBydW5uaW5nIG15c3FsZCBhbmQgZmlu
ZCBvdXQgd2hhdCBpdCBzdXBwb3J0cwpAQCAtMTcxMiw3ICsxNzE3LDcgQEAgc3ViIGZpbmRfbXlz
cWxkIHsKICAgbXkgQG15c3FsZF9uYW1lcz0gKCJteXNxbGQiLCAibXlzcWxkLW1heC1udCIsICJt
eXNxbGQtbWF4IiwKIAkJICAgICAibXlzcWxkLW50Iik7CiAKLSAgaWYgKCAkb3B0X2RlYnVnICl7
CisgIGlmICggJG9wdF9kZWJ1Z19zZXJ2ZXIgKXsKICAgICAjIFB1dCBteXNxbGQtZGVidWcgZmly
c3QgaW4gdGhlIGxpc3Qgb2YgYmluYXJpZXMgdG8gbG9vayBmb3IKICAgICBtdHJfdmVyYm9zZSgi
QWRkaW5nIG15c3FsZC1kZWJ1ZyBmaXJzdCBpbiBsaXN0IG9mIGJpbmFyaWVzIHRvIGxvb2sgZm9y
Iik7CiAgICAgdW5zaGlmdChAbXlzcWxkX25hbWVzLCAibXlzcWxkLWRlYnVnIik7CkBAIC0xNzgz
LDkgKzE3ODgsMTIgQEAgc3ViIGV4ZWN1dGFibGVfc2V0dXAgKCkgewogc3ViIGNsaWVudF9kZWJ1
Z19hcmcoJCQpIHsKICAgbXkgKCRhcmdzLCAkY2xpZW50X25hbWUpPSBAXzsKIAorICAjIFdvcmth
cm91bmQgZm9yIEJ1ZyAjNTA2Mjc6IGRyb3AgYW55IGRlYnVnIG9wdAorICByZXR1cm4gaWYgJGNs
aWVudF9uYW1lID1+IC9ebXlzcWxiaW5sb2cvOworCiAgIGlmICggJG9wdF9kZWJ1ZyApIHsKICAg
ICBtdHJfYWRkX2FyZygkYXJncywKLQkJIi0tZGVidWc9ZDp0OkEsJXMvbG9nLyVzLnRyYWNlIiwK
KwkJIi0tbG9vc2UtZGVidWc9ZDp0OkEsJXMvbG9nLyVzLnRyYWNlIiwKIAkJJHBhdGhfdmFyZGly
X3RyYWNlLCAkY2xpZW50X25hbWUpCiAgIH0KIH0KQEAgLTIzOTksOSArMjQwNyw5IEBAIHN1YiBj
aGVja19kZWJ1Z19zdXBwb3J0ICgkKSB7CiAgICAgI210cl9yZXBvcnQoIiAtIGJpbmFyaWVzIGFy
ZSBub3QgZGVidWcgY29tcGlsZWQiKTsKICAgICAkZGVidWdfY29tcGlsZWRfYmluYXJpZXM9IDA7
CiAKLSAgICBpZiAoICRvcHRfZGVidWcgKQorICAgIGlmICggJG9wdF9kZWJ1Z19zZXJ2ZXIgKQog
ICAgIHsKLSAgICAgIG10cl9lcnJvcigiQ2FuJ3QgdXNlIC0tZGVidWcsIGJpbmFyaWVzIGRvZXMg
bm90IHN1cHBvcnQgaXQiKTsKKyAgICAgIG10cl9lcnJvcigiQ2FuJ3QgdXNlIC0tZGVidWdbLXNl
cnZlcl0sIGJpbmFyeSBkb2VzIG5vdCBzdXBwb3J0IGl0Iik7CiAgICAgfQogICAgIHJldHVybjsK
ICAgfQpAQCAtNTU3OSw2ICs1NTg3LDggQEAgT3B0aW9ucyBmb3IgZGVidWdnaW5nIHRoZSBwcm9k
dWN0CiAgIGNsaWVudC1nZGIgICAgICAgICAgICBTdGFydCBteXNxbHRlc3QgY2xpZW50IGluIGdk
YgogICBkZGQgICAgICAgICAgICAgICAgICAgU3RhcnQgbXlzcWxkIGluIGRkZAogICBkZWJ1ZyAg
ICAgICAgICAgICAgICAgRHVtcCB0cmFjZSBvdXRwdXQgZm9yIGFsbCBzZXJ2ZXJzIGFuZCBjbGll
bnQgcHJvZ3JhbXMKKyAgZGVidWctc2VydmVyICAgICAgICAgIFVzZSBkZWJ1ZyB2ZXJzaW9uIG9m
IHNlcnZlciwgYnV0IHdpdGhvdXQgdHVybmluZyBvbgorICAgICAgICAgICAgICAgICAgICAgICAg
dHJhY2luZwogICBkZWJ1Z2dlcj1OQU1FICAgICAgICAgU3RhcnQgbXlzcWxkIGluIHRoZSBzZWxl
Y3RlZCBkZWJ1Z2dlcgogICBnZGIgICAgICAgICAgICAgICAgICAgU3RhcnQgdGhlIG15c3FsZChz
KSBpbiBnZGIKICAgbWFudWFsLWRlYnVnICAgICAgICAgIExldCB1c2VyIG1hbnVhbGx5IHN0YXJ0
IG15c3FsZCBpbiBkZWJ1Z2dlciwgYmVmb3JlCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBm
b3IgcHVzaCBlbWFpbHMpLg==