From: Mattias Jonsson
Date: October 7 2011 2:21pm
Subject: bzr push into mysql-trunk branch (mattias.jonsson:3479 to 3480) Bug#56590
 Bug#11763825
List-Archive: http://lists.mysql.com/commits/141354
X-Bug: 56590,11763825
Message-Id: <201110071420.p97EKs89021885@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0ODAgTWF0dGlhcyBKb25zc29uCTIwMTEtMTAtMDcKICAgICAgYnVnIzExNzYzODI1L0J1ZyM1
NjU5MDogUEFSVElUSU9OUzogRlVMTFRFWFQgU0VBUkNIRVMgRkFJTAogICAgICAKICAgICAgQ29u
ZnVzaW5nIGVycm9yIG1lc3NhZ2U6CiAgICAgIEVSUk9SIDEyMTQgKEhZMDAwKTogVGhlIHVzZWQg
dGFibGUgdHlwZSBkb2Vzbid0IHN1cHBvcnQgRlVMTFRFWFQKICAgICAgaW5kZXhlcwogICAgICAK
ICAgICAgRml4ZWQgYnkgYWRkaW5nIGEgbmV3IGVycm9yIGZvciB0aGlzOgogICAgICBFUlJPUiBI
WTAwMDogRlVMTFRFWFQgaW5kZXggaXMgbm90IHN1cHBvcnRlZCBmb3IgcGFydGl0aW9uZWQgdGFi
bGVzLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvcGFydGl0aW9uX215aXNhbS5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L3BhcnRpdGlvbl9teWlzYW0udGVzdAogICAgICBzcWwv
c2hhcmUvZXJybXNnLXV0ZjgudHh0CiAgICAgIHNxbC9zcWxfdGFibGUuY2MKIDM0NzkgQW5kcmVp
IEVsa2luCTIwMTEtMTAtMDcKICAgICAgQnVnIzEyOTYwMjg0IC0gUlBMLlJQTF9QQVJBTExFTF9T
V0lUQ0hfU0VRVUVOVElBTCBURVNUIEZBSUxFRCBJTiBWQUxHUklORCBSVU4gT04KICAgICAgCiAg
ICAgIFRoZXJlIHdhcyBhIHRpbWVvdXQgYXQgdGhlIHZlcnkgZW5kIG9mIHRoZSB0ZXN0LgogICAg
ICBEZXRhaWxzIG9mIHByaW50b3V0IHVwb24gdGhlIGZhaWx1cmUgZG9lcyBub3QgcmV2ZWFsIGFu
eSBpc3N1ZSB3aXRoIHRoZSB0ZXh0IG5vcgogICAgICB0aGUgc2VydmVyIGNvZGUuIEl0J3MganVz
dCBzbG93IGFuZCBpcyB1c2VkIHRvIHBhc3Mgb24gdGhlIHNhbWUgdmFsZ3JpbmQgYnV0IHRoZSBy
dW4KICAgICAgdGltZSBpcyBhcHBhcmVudGx5IGJpZyAob3ZlciAxIDAwMCAwMDAgbXNlYykgLQog
ICAgICAgIHJwbC5ycGxfcGFyYWxsZWxfc3dpdGNoX3NlcXVlbnRpYWwgJ21peCcgdzIgWyBwYXNz
IF0gIDEwNjgxMDEKICAgICAgCiAgICAgIFNvIGl0J3MgZml4ZWQgd2l0aCBkZWNyZWFzaW5nIGxv
YWQgc2l6ZSB3aGVuIHRoZSB0ZXN0IHJ1bnMgb24gdmFsZ3JpbmQuCiAgICAgQCBteXNxbC10ZXN0
L2NvbGxlY3Rpb25zL2RlZmF1bHQuZXhwZXJpbWVudGFsCiAgICAgICAgY29ycmVjdGluZyByZWY6
cyB0byBidWdzIHRvIGFjY29yZCB0aGVtIHdpdGggdGhlIGZvcm1hdC4KICAgICBAIG15c3FsLXRl
c3Qvc3VpdGUvcnBsL3QvcnBsX3BhcmFsbGVsX3N3aXRjaF9zZXF1ZW50aWFsLnRlc3QKICAgICAg
ICBkZWNyZWFzaW5nIGxvYWQgc2l6ZSB3aGVuIHRoZSB0ZXN0IHJ1bnMgb24gdmFsZ3JpbmQuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3QvY29sbGVjdGlvbnMvZGVmYXVsdC5leHBlcmlt
ZW50YWwKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfcGFyYWxsZWxfc3dpdGNoX3Nl
cXVlbnRpYWwudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3BhcnRpdGlvbl9t
eWlzYW0ucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvcGFydGl0aW9uX215aXNhbS5yZXN1bHQJ
MjAxMS0xMC0wNiAwOTo1MDo0MCArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvcGFydGl0aW9uX215
aXNhbS5yZXN1bHQJMjAxMS0xMC0wNyAxNDoyMDoyMSArMDAwMApAQCAtMSw1ICsxLDI1IEBACiBE
Uk9QIFRBQkxFIElGIEVYSVNUUyB0MSwgdDI7CiAjCisjIEJ1ZyMxMTc2MzgyNS81NjU5MDogUEFS
VElUSU9OUzogRlVMTFRFWFQgU0VBUkNIRVMgRkFJTAorIyAoYmFkL2NvbmZ1c2luZyBlcnJvciBt
ZXNzYWdlKQorQ1JFQVRFIFRBQkxFIHQxCisoYSBJTlQgVU5TSUdORUQgQVVUT19JTkNSRU1FTlQg
Tk9UIE5VTEwgUFJJTUFSWSBLRVksCitiIFZBUkNIQVIoMjAwKSwKK2MgVEVYVCkKK0VOR0lORT1N
eUlTQU0KK1BBUlRJVElPTiBCWSBIQVNIKGEpIFBBUlRJVElPTlMgMTsKK0NSRUFURSBGVUxMVEVY
VCBJTkRFWCBtc2cgT04gdDEgKGIsIGMpOworRVJST1IgSFkwMDA6IEZVTExURVhUIGluZGV4IGlz
IG5vdCBzdXBwb3J0ZWQgZm9yIHBhcnRpdGlvbmVkIHRhYmxlcy4KK0RST1AgVEFCTEUgdDE7CitD
UkVBVEUgVEFCTEUgdDEKKyhhIElOVCBVTlNJR05FRCBBVVRPX0lOQ1JFTUVOVCBOT1QgTlVMTCBQ
UklNQVJZIEtFWSwKK2IgVkFSQ0hBUigyMDApLAorYyBURVhULAorRlVMTFRFWFQgKGIsIGMpKQor
RU5HSU5FPU15SVNBTQorUEFSVElUSU9OIEJZIEhBU0goYSkgUEFSVElUSU9OUyAxOworRVJST1Ig
SFkwMDA6IEZVTExURVhUIGluZGV4IGlzIG5vdCBzdXBwb3J0ZWQgZm9yIHBhcnRpdGlvbmVkIHRh
Ymxlcy4KKyMKICMgQlVHIzExOTMzMjI2IC0gNjA2ODE6IENIRUNLU1VNIFRBQkxFIFJFVFVSTlMg
MCBGT1IgUEFSVElUSU9ORUQgVEFCTEUKICMKIENSRUFURSBUQUJMRSB0MSAoCgo9PT0gbW9kaWZp
ZWQgZmlsZSAnbXlzcWwtdGVzdC90L3BhcnRpdGlvbl9teWlzYW0udGVzdCcKLS0tIGEvbXlzcWwt
dGVzdC90L3BhcnRpdGlvbl9teWlzYW0udGVzdAkyMDExLTEwLTA2IDA5OjUwOjQwICswMDAwCisr
KyBiL215c3FsLXRlc3QvdC9wYXJ0aXRpb25fbXlpc2FtLnRlc3QJMjAxMS0xMC0wNyAxNDoyMDoy
MSArMDAwMApAQCAtMTAsNiArMTAsMjcgQEAgRFJPUCBUQUJMRSBJRiBFWElTVFMgdDEsIHQyOwog
bGV0ICRNWVNRTERfREFUQURJUj0gYFNFTEVDVCBAQGRhdGFkaXJgOwogCiAtLWVjaG8gIworLS1l
Y2hvICMgQnVnIzExNzYzODI1LzU2NTkwOiBQQVJUSVRJT05TOiBGVUxMVEVYVCBTRUFSQ0hFUyBG
QUlMCistLWVjaG8gIyAoYmFkL2NvbmZ1c2luZyBlcnJvciBtZXNzYWdlKQorQ1JFQVRFIFRBQkxF
IHQxCisoYSBJTlQgVU5TSUdORUQgQVVUT19JTkNSRU1FTlQgTk9UIE5VTEwgUFJJTUFSWSBLRVks
CisgYiBWQVJDSEFSKDIwMCksCisgYyBURVhUKQorRU5HSU5FPU15SVNBTQorUEFSVElUSU9OIEJZ
IEhBU0goYSkgUEFSVElUSU9OUyAxOworLS1lcnJvciBFUl9GVUxMVEVYVF9OT1RfU1VQUE9SVEVE
X1dJVEhfUEFSVElUSU9OSU5HCitDUkVBVEUgRlVMTFRFWFQgSU5ERVggbXNnIE9OIHQxIChiLCBj
KTsKK0RST1AgVEFCTEUgdDE7CistLWVycm9yIEVSX0ZVTExURVhUX05PVF9TVVBQT1JURURfV0lU
SF9QQVJUSVRJT05JTkcKK0NSRUFURSBUQUJMRSB0MQorKGEgSU5UIFVOU0lHTkVEIEFVVE9fSU5D
UkVNRU5UIE5PVCBOVUxMIFBSSU1BUlkgS0VZLAorIGIgVkFSQ0hBUigyMDApLAorIGMgVEVYVCwK
KyBGVUxMVEVYVCAoYiwgYykpCitFTkdJTkU9TXlJU0FNCitQQVJUSVRJT04gQlkgSEFTSChhKSBQ
QVJUSVRJT05TIDE7CisKKy0tZWNobyAjCiAtLWVjaG8gIyBCVUcjMTE5MzMyMjYgLSA2MDY4MTog
Q0hFQ0tTVU0gVEFCTEUgUkVUVVJOUyAwIEZPUiBQQVJUSVRJT05FRCBUQUJMRQogLS1lY2hvICMK
IENSRUFURSBUQUJMRSB0MSAoCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NoYXJlL2Vycm1zZy11
dGY4LnR4dCcKLS0tIGEvc3FsL3NoYXJlL2Vycm1zZy11dGY4LnR4dAkyMDExLTA5LTI5IDEyOjU1
OjA2ICswMDAwCisrKyBiL3NxbC9zaGFyZS9lcnJtc2ctdXRmOC50eHQJMjAxMS0xMC0wNyAxNDoy
MDoyMSArMDAwMApAQCAtNjU5MiwzICs2NTkyLDcgQEAgRVJfUExVR0lOX05PX1VOSU5TVEFMTAog
CiBFUl9QTFVHSU5fTk9fSU5TVEFMTAogICBlbmcgIlBsdWdpbiAnJXMnIGlzIG1hcmtlZCBhcyBu
b3QgZHluYW1pY2FsbHkgaW5zdGFsbGFibGUuIFlvdSBoYXZlIHRvIHN0b3AgdGhlIHNlcnZlciB0
byBpbnN0YWxsIGl0LiIKKworRVJfRlVMTFRFWFRfTk9UX1NVUFBPUlRFRF9XSVRIX1BBUlRJVElP
TklORworICBlbmcgIkZVTExURVhUIGluZGV4IGlzIG5vdCBzdXBwb3J0ZWQgZm9yIHBhcnRpdGlv
bmVkIHRhYmxlcy4iCisgIHN3ZSAiRlVMTFRFWFQgaW5kZXggc3TilJzilaJkcyBlaiBm4pSc4pWi
ciBwYXJ0aXRpb25lcmFkZSB0YWJlbGxlci4iCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NxbF90
YWJsZS5jYycKLS0tIGEvc3FsL3NxbF90YWJsZS5jYwkyMDExLTA4LTMwIDA0OjI4OjE4ICswMDAw
CisrKyBiL3NxbC9zcWxfdGFibGUuY2MJMjAxMS0xMC0wNyAxNDoyMDoyMSArMDAwMApAQCAtMzQ1
Nyw2ICszNDU3LDE1IEBAIG15c3FsX3ByZXBhcmVfY3JlYXRlX3RhYmxlKFRIRCAqdGhkLCBIQV8K
ICAgICB7CiAgICAgICBpZiAoIShmaWxlLT5oYV90YWJsZV9mbGFncygpICYgSEFfQ0FOX0ZVTExU
RVhUKSkKICAgICAgIHsKKyNpZmRlZiBXSVRIX1BBUlRJVElPTl9TVE9SQUdFX0VOR0lORQorICAg
ICAgICBpZiAoZmlsZS0+aHQgPT0gcGFydGl0aW9uX2h0b24pCisgICAgICAgIHsKKyAgICAgICAg
ICBteV9tZXNzYWdlKEVSX0ZVTExURVhUX05PVF9TVVBQT1JURURfV0lUSF9QQVJUSVRJT05JTkcs
CisgICAgICAgICAgICAgICAgICAgICBFUihFUl9GVUxMVEVYVF9OT1RfU1VQUE9SVEVEX1dJVEhf
UEFSVElUSU9OSU5HKSwKKyAgICAgICAgICAgICAgICAgICAgIE1ZRigwKSk7CisgICAgICAgICAg
REJVR19SRVRVUk4oVFJVRSk7CisgICAgICAgIH0KKyNlbmRpZgogCW15X21lc3NhZ2UoRVJfVEFC
TEVfQ0FOVF9IQU5ETEVfRlQsIEVSKEVSX1RBQkxFX0NBTlRfSEFORExFX0ZUKSwKICAgICAgICAg
ICAgICAgICAgICBNWUYoMCkpOwogCURCVUdfUkVUVVJOKFRSVUUpOwoKTm8gYnVuZGxlIChyZWFz
b246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=