From: Ole John Aske
Date: January 14 2011 2:29pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4113 to 4114)
List-Archive: http://lists.mysql.com/commits/128786
Message-Id: <20110114142957.AF66D223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQxMTQgT2xlIEpvaG4gQXNrZQkyMDExLTAxLTE0CiAgICAgIEJhY2twb3J0IHRvIG15c3FsLTUu
MS10ZWxjby03LjA6CiAgICAgIAogICAgICBGaXggZm9yIGJ1ZyM1ODYyNiwgSW5jb3JyZWN0IHJl
c3VsdCBmb3IgV0hFUkUgPGNvbHVtbj4gSU4gKDxzdWJxdWVyeT4pIElTIFVOS05PV04uCiAgICAg
ICAgICAgIAogICAgICBOT1RFOiBUaGlzIGZpeCBpcyBhIGJhY2twb3J0IGZyb20gNS42Lnggd2hp
Y2ggYWxyZWFkeSBzZWVtcyB0byBoYXZlIGZpeGVkIHRoaXMgcHJvYmxlbS4KICAgICAgICAgICAg
CiAgICAgIFRoZSBmaXggZW5zdXJlcyB0aGF0IGlmICdGdWxsIHNjYW4gb24gTlVMTCBrZXknIGFj
Y2VzcyBtZXRob2QgbWF5IGJlIHVzZWQKICAgICAgZm9yIGEgdGFibGUsIHdlIGNhbid0IGFzc3Vt
ZSB0aGF0IGFueSBwYXJ0IG9mIHRoZSBwcmVkaWNhdGUgaXMgY292ZXJlZCBieQogICAgICB0aGUg
UkVGLWtleS4gKFRoZSBqb2luX3RhYiBpcyBrbm93biB0byBoYXZlICdGdWxsIHNjYW4gb24gTlVM
TCBrZXknIGlmCiAgICAgIGFueSBjb25kX2d1YXJkc1tdIGhhcyBiZWVuIGRlZmluZWQgZm9yICdq
b2luX3RhYi0+cmVmJykKICAgICAgICAgICAgCiAgICAgIHBhcnRfb2ZfcmVma2V5KCkgd2lsbCB0
aGVyZWZvcmUgcmV0dXJuICcwJyBpZiBhIHBvdGVudGlhbCdGdWxsIHNjYW4gb24gTlVMTCBrZXkn
IAogICAgICBpcyBkZXRlY3RlZCAtIFdoaWNoIHdpbGwgZm9yY2UgbWFrZV9jb25kX2Zvcl90YWJs
ZSgpIHRvIGluY2x1ZGUgYWxsIHBhcnQgb2YgYSAKICAgICAgcHJlZGljYXRlIGNvdmVyaW5nIHRo
ZSBzcGVjaWZpZWQgJ3RhYmxlcycgYW5kICd1c2VkX3RhYmxlJyBtYXNrLgoKICAgIG1vZGlmaWVk
OgogICAgICBteXNxbC10ZXN0L3Ivam9pbl9vdXRlci5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90
L2pvaW5fb3V0ZXIudGVzdAogICAgICBzcWwvc3FsX3NlbGVjdC5jYwogNDExMyBNYWdudXMgQmzD
pXVkZAkyMDExLTAxLTE0CiAgICAgIG5kYgogICAgICAgLSAgcmVtb3ZlIG5lZWQgZm9yIE1BWF9Y
WFggdmFsdWVzIGluIG15c3FsIHNlcnZlciBlbnVtcywKICAgICAgICAgbGwgdGhlIHZhbHVlcyB0
aGF0IGNhbiBiZSBleHBlY3RlZCB0byBiZSBoYW5kbGVkCiAgICAgICAgIGJ5IGNvbmRpdGlvbiBw
dXNoZG93biBhcmUgaGFyZGNvZGVkLiBPbmx5IHdoZW4gYXNraW5nCiAgICAgICAgIGZvciAiaXMg
dGhpcyB0eXBlIHN1cHBvcnRlZC9leHBlY3RlZD8iIGNhbiB3ZSBleHBlY3QgImFueSIKICAgICAg
ICAgdmFsdWUgZm9yIHRoZSB0eXBlLiBUaGlzIG1lYW5zIHRoZSAnZXhwZWN0aW5nJyBmdW5jdGlv
bnMgc2hvdWxkIHJldHVybgogICAgICAgICBmYWxzZSBmb3IgYW55IHR5cGUgdmFsdWVzIGl0IGRv
ZXMgbm90IGtub3cgYWJvdXQuCiAgICAgICAtIFNpbmNlIHdlIGtub3cgdGhlIG1heCB2YWx1ZXMg
Zm9yIGJpdG1hc2sgYXQgY29tcGlsZSB0aW1lLCB1c2UKICAgICAgICAgIGZpeGVkIHNpemUgYnVm
ZmVycyB0byByZW1vdmUgdGhlIG5lZWQgZm9yIGV4dHJhIG1hbGxvY3Mgd2hlbiBjcmVhdGluZwog
ICAgICAgICBOZGJfZXhwZWN0X3N0YWNrCiAgICAgICAtIHJldmVydCB0aGUgYWRkaXRpb3RuIG9m
IE1BWF9YWFggdmFsdWVzIG9uIHRoZSB0aHJlZSBlbnVtcwoKICAgIG1vZGlmaWVkOgogICAgICBp
bmNsdWRlL215c3FsLmgucHAKICAgICAgaW5jbHVkZS9teXNxbF9jb20uaAogICAgICBzcWwvaGFf
bmRiY2x1c3Rlcl9jb25kLmgKICAgICAgc3FsL2l0ZW0uaAogICAgICBzcWwvcnBsX3V0aWxpdHku
Y2MKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9qb2luX291dGVyLnJlc3VsdCcKLS0t
IGEvbXlzcWwtdGVzdC9yL2pvaW5fb3V0ZXIucmVzdWx0CTIwMTEtMDEtMTQgMDg6NTQ6NDcgKzAw
MDAKKysrIGIvbXlzcWwtdGVzdC9yL2pvaW5fb3V0ZXIucmVzdWx0CTIwMTEtMDEtMTQgMTQ6MjY6
MTQgKzAwMDAKQEAgLTE0NjcsNCArMTQ2Nyw0NCBAQCBXSEVSRSA3OwogY29sX2RhdGV0aW1lX2tl
eQogTlVMTAogRFJPUCBUQUJMRSBCQjsKKyMKKyMgQnVnIzU4NjI2IEluY29ycmVjdCByZXN1bHQg
Zm9yIFdIRVJFIDxjb2x1bW4+IElOICg8c3VicXVlcnk+KSBJUyBVTktOT1dOIAorIworQ1JFQVRF
IFRBQkxFIHQxIChJIElOVCBOT1QgTlVMTCk7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDEpLCgy
KTsKK0NSRUFURSBUQUJMRSB0MiAoSSBJTlQgTk9UIE5VTEwpOworSU5TRVJUIElOVE8gdDIgVkFM
VUVTICgzKTsKK0NSRUFURSBUQUJMRSB0MyAoUEsxIElOVCwgUEsyIElOVCwgUFJJTUFSWSBLRVko
UEsxLFBLMikpOworSU5TRVJUIElOVE8gdDMgVkFMVUVTICgxLDEpLCgyLDIpLCgzLDMpOworU0VM
RUNUICogRlJPTQordDEgTEVGVCBKT0lOIHQyIE9OIHQyLmkgPSB0MS5pCitXSEVSRSB0Mi5pIElO
IAorKAorU0VMRUNUIFNUUkFJR0hUX0pPSU4gdDMucGsxIEZST00gdDMgSk9JTiB0MyBhcyB0NAor
T04gdDQucGsxPXQzLnBrMQorV0hFUkUgdDMucGsyID0gdDIuaQorKQorSVMgVU5LTk9XTjsKK0kJ
SQorU0VMRUNUICogRlJPTQordDEgTEVGVCBKT0lOIHQyIE9OIHQyLmkgPSB0MS5pCitXSEVSRSB0
Mi5pIElOIAorKAorU0VMRUNUIHQzLnBrMSBGUk9NIHQzIExFRlQgSk9JTiB0MyBhcyB0NAorT04g
dDQucGsxPXQzLnBrMQorV0hFUkUgdDMucGsyID0gdDIuaQorKQorSVMgVU5LTk9XTjsKK0kJSQor
U0VMRUNUICogRlJPTQordDEgTEVGVCBKT0lOIHQyIE9OIHQyLmkgPSB0MS5pCitXSEVSRSB0Mi5p
IElOIAorKAorU0VMRUNUIHQzLnBrMSBGUk9NIHQzIEpPSU4gdDMgYXMgdDQKK09OIHQ0LnBrMT10
My5wazEKK1dIRVJFIHQzLnBrMiA9IHQyLmkKKykKK0lTIFVOS05PV047CitJCUkKK0RST1AgVEFC
TEUgdDEsdDIsdDM7CiBFbmQgb2YgNS4xIHRlc3RzCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwt
dGVzdC90L2pvaW5fb3V0ZXIudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2pvaW5fb3V0ZXIudGVz
dAkyMDExLTAxLTE0IDA4OjU0OjQ3ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9qb2luX291dGVy
LnRlc3QJMjAxMS0wMS0xNCAxNDoyNjoxNCArMDAwMApAQCAtMTA2Myw0ICsxMDYzLDQ4IEBAIEZS
T00gQkIgdGFibGUxIFJJR0hUIEpPSU4gQkIgdGFibGUyCiAKIERST1AgVEFCTEUgQkI7CiAKKy0t
ZWNobyAjCistLWVjaG8gIyBCdWcjNTg2MjYgSW5jb3JyZWN0IHJlc3VsdCBmb3IgV0hFUkUgPGNv
bHVtbj4gSU4gKDxzdWJxdWVyeT4pIElTIFVOS05PV04gCistLWVjaG8gIworCitDUkVBVEUgVEFC
TEUgdDEgKEkgSU5UIE5PVCBOVUxMKTsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMSksKDIpOwor
Q1JFQVRFIFRBQkxFIHQyIChJIElOVCBOT1QgTlVMTCk7CitJTlNFUlQgSU5UTyB0MiBWQUxVRVMg
KDMpOworQ1JFQVRFIFRBQkxFIHQzIChQSzEgSU5ULCBQSzIgSU5ULCBQUklNQVJZIEtFWShQSzEs
UEsyKSk7CitJTlNFUlQgSU5UTyB0MyBWQUxVRVMgKDEsMSksKDIsMiksKDMsMyk7CisKKyMjJ0lT
IFVOS05PV04nIHNob3VsZCBub3QgcmV0dXJuIGFueSByb3dzIGFzIHN1YnF1ZXJ5IHJldHVybnMg
YW4gZW1wdHkgc2V0CitTRUxFQ1QgKiBGUk9NCisgdDEgTEVGVCBKT0lOIHQyIE9OIHQyLmkgPSB0
MS5pCisgV0hFUkUgdDIuaSBJTiAKKyAoCisgICBTRUxFQ1QgU1RSQUlHSFRfSk9JTiB0My5wazEg
RlJPTSB0MyBKT0lOIHQzIGFzIHQ0CisgICAgT04gdDQucGsxPXQzLnBrMQorICAgIFdIRVJFIHQz
LnBrMiA9IHQyLmkKKyApCisgSVMgVU5LTk9XTjsgCisKK1NFTEVDVCAqIEZST00KKyB0MSBMRUZU
IEpPSU4gdDIgT04gdDIuaSA9IHQxLmkKKyBXSEVSRSB0Mi5pIElOIAorICgKKyAgIFNFTEVDVCB0
My5wazEgRlJPTSB0MyBMRUZUIEpPSU4gdDMgYXMgdDQKKyAgICBPTiB0NC5wazE9dDMucGsxCisg
ICAgV0hFUkUgdDMucGsyID0gdDIuaQorICkKKyBJUyBVTktOT1dOOyAKKworU0VMRUNUICogRlJP
TQorIHQxIExFRlQgSk9JTiB0MiBPTiB0Mi5pID0gdDEuaQorIFdIRVJFIHQyLmkgSU4gCisgKAor
ICAgU0VMRUNUIHQzLnBrMSBGUk9NIHQzIEpPSU4gdDMgYXMgdDQKKyAgICBPTiB0NC5wazE9dDMu
cGsxCisgICAgV0hFUkUgdDMucGsyID0gdDIuaQorICkKKyBJUyBVTktOT1dOOyAKKworRFJPUCBU
QUJMRSB0MSx0Mix0MzsKKwogLS1lY2hvIEVuZCBvZiA1LjEgdGVzdHMKCj09PSBtb2RpZmllZCBm
aWxlICdzcWwvc3FsX3NlbGVjdC5jYycKLS0tIGEvc3FsL3NxbF9zZWxlY3QuY2MJMjAxMS0wMS0x
NCAxMjo0OToyNSArMDAwMAorKysgYi9zcWwvc3FsX3NlbGVjdC5jYwkyMDExLTAxLTE0IDE0OjI2
OjE0ICswMDAwCkBAIC0xMjk2MCwxMCArMTI5NjAsMjcgQEAgcGFydF9vZl9yZWZrZXkoVEFCTEUg
KnRhYmxlLEZpZWxkICpmaWVsZAogICAgIEtFWV9QQVJUX0lORk8gKmtleV9wYXJ0PQogICAgICAg
dGFibGUtPmtleV9pbmZvW3RhYmxlLT5yZWdpbmZvLmpvaW5fdGFiLT5yZWYua2V5XS5rZXlfcGFy
dDsKIAorI2lmbmRlZiBNQ1BfQlVHNTg2MjYKKyAgICB1aW50IHBhcnQ7CisKKyAgICAvKiBJZiBl
eGVjdXRpb24gcGxhbiBtYXkgdXNlICdGdWxsIHNjYW4gb24gTlVMTCBrZXknLCBUaGVyZSBtaWdo
dAorICAgICAqIG5vdCBieSBhbnkgJ1JFRicgYWNjZXNzIGFuZCBlbnRpcmUgcHJlZGljYXRlIHNo
b3VsZCBiZSBwcmVzZXJ2ZWQuCisgICAgICovCisgICAgZm9yIChwYXJ0PTAgOyBwYXJ0IDwgcmVm
X3BhcnRzIDsgcGFydCsrKQorICAgIHsKKyAgICAgIGlmICh0YWJsZS0+cmVnaW5mby5qb2luX3Rh
Yi0+cmVmLmNvbmRfZ3VhcmRzW3BhcnRdKQorICAgICAgICByZXR1cm4gKEl0ZW0qKSAwOworICAg
IH0KKworICAgIGZvciAocGFydD0wIDsgcGFydCA8IHJlZl9wYXJ0cyA7IHBhcnQrKyxrZXlfcGFy
dCsrKQorI2Vsc2UKICAgICBmb3IgKHVpbnQgcGFydD0wIDsgcGFydCA8IHJlZl9wYXJ0cyA7IHBh
cnQrKyxrZXlfcGFydCsrKQorI2VuZGlmCisgICAgewogICAgICAgaWYgKGZpZWxkLT5lcShrZXlf
cGFydC0+ZmllbGQpICYmCiAJICAhKGtleV9wYXJ0LT5rZXlfcGFydF9mbGFnICYgKEhBX1BBUlRf
S0VZX1NFRyB8IEhBX05VTExfUEFSVCkpKQogCXJldHVybiB0YWJsZS0+cmVnaW5mby5qb2luX3Rh
Yi0+cmVmLml0ZW1zW3BhcnRdOworICAgIH0KICAgfQogICByZXR1cm4gKEl0ZW0qKSAwOwogfQoK
Tm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=