From: Ole John Aske
Date: January 27 2012 11:20am
Subject: bzr push into mysql-trunk branch (ole.john.aske:3797 to 3798) Bug#13330645
List-Archive: http://lists.mysql.com/commits/142600
X-Bug: 13330645
Message-Id: <20120127112049.8A9C6235@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3OTggT2xlIEpvaG4gQXNrZQkyMDEyLTAxLTI3CiAgICAgIEZvbGxvd3VwIGZpeCBmb3IgYnVn
IzEzMzMwNjQ1LgogICAgICAKICAgICAgQXMgd2Ugbm93IGRvbid0IHJlcXVlc3QgSEFfTVJSX1NP
UlRFRCB3aGVuIHRoZXJlIGFyZSBubyBzb3J0IHJlcXVpcmVtZW50cywgd2UgaGF2ZQogICAgICB0
byBhZGQgc29tZSAnLS1zb3J0ZWRfcmVzdWx0JyB0byB0aGUgdGVzdHMgaW4gb3JkZXIgdG8gZ2V0
IHRoZSBleHBlY3RlZCByb3cgb3JkZXIKICAgICAgaW4gdGhlIHJlc3VsdHMuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGFydHMvaW5jL3BhcnRpdGlvbi1kbWwtMS03Lmlu
YwogICAgICBteXNxbC10ZXN0L3N1aXRlL3BhcnRzL2luYy9wYXJ0aXRpb24tZG1sLTEtOC5pbmMK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uX2tleV8xNmNvbC5pbmMK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uX2tleV8zMmNvbC5pbmMK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uX2tleV80Y29sLmluYwog
ICAgICBteXNxbC10ZXN0L3N1aXRlL3BhcnRzL2luYy9wYXJ0aXRpb25fa2V5Xzhjb2wuaW5jCiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvcGFydHMvci9wYXJ0aXRpb25fc3BlY2lhbF9teWlzYW0ucmVz
dWx0CiAzNzk3IEd1aWxoZW0gQmljaG90CTIwMTItMDEtMjcKICAgICAgTm93IHRoYXQgcGIyIGhh
cyBhIGRhaWx5IHJ1biB3aXRoIG5vbi1kZWZhdWx0IGlubm9kYiBwYWdlIHNpemUsCiAgICAgIHdl
IGdldCB0ZXN0IGZhaWx1cmVzIGJlY2F1c2UgcGFnZSBzaXplIGluZmx1ZW5jZXMgY29zdCAKICAg
ICAgYW5kIHRodXMgaW5mbHVlbmNlcyB0aGUgdHJhY2UuIFNvbHV0aW9uOiBkaXNhYmxlIHRoZSBm
YWlsaW5nCiAgICAgIHRlc3QgaWYgcGFnZSBzaXplIGlzIG5vbi1kZWZhdWx0LgoKICAgIG1vZGlm
aWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL29wdF90cmFjZS9pbmNsdWRlL3JhbmdlLmluYwo9
PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uLWRt
bC0xLTcuaW5jJwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3BhcnRzL2luYy9wYXJ0aXRpb24tZG1s
LTEtNy5pbmMJMjAxMS0wMi0xNyAxNTozNjowNSArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRl
L3BhcnRzL2luYy9wYXJ0aXRpb24tZG1sLTEtNy5pbmMJMjAxMi0wMS0yNyAxMToyMDoyNiArMDAw
MApAQCAtMjcsNiArMjcsNyBAQCBHUkFOVCBBTEwgUFJJVklMRUdFUyBPTiB0ZXN0LiogVE8gdGVz
dF91CiBHUkFOVCBBTEwgUFJJVklMRUdFUyBPTiB0ZXN0LiogVE8gdGVzdF91c2VyXzMgSURFTlRJ
RklFRCBCWSAndGVzdHB3JzsKIAogY29ubmVjdCAoc2Vzc2lvbjEsIGxvY2FsaG9zdCwgdGVzdF91
c2VyXzEsJ3Rlc3RwdycsdGVzdCk7CistLXNvcnRlZF9yZXN1bHQKIFNFTEVDVCAqIEZST00gdDEg
UEFSVElUSU9OIChgcDAtMjlgKSBXSEVSRSBhIEJFVFdFRU4gMCBBTkQgOSBMT0NLIElOIFNIQVJF
IE1PREU7CiBVUERBVEUgdDEgUEFSVElUSU9OIChgcDAtMjlgKSBTRVQgYj0ncDAtMjktdXBkLTEn
IFdIRVJFIGEgQkVUV0VFTiAwIEFORCA5IDsKIApAQCAtNDgsNiArNDksNyBAQCBjb25uZWN0aW9u
IHNlc3Npb24yOwogLS1lY2hvICMjIyMjIyMgZXhwZWN0IHAwLTI5IGhhcyBub3QgYmVlbiB1cGRh
dGVkCiAtLXNvcnRlZF9yZXN1bHQKIFNFTEVDVCAqIEZST00gdDEgUEFSVElUSU9OIChgcDAtMjlg
KTsKKy0tc29ydGVkX3Jlc3VsdAogU0VMRUNUICogRlJPTSB0MSBQQVJUSVRJT04gKGBwMC0yOWAp
IFdIRVJFIGEgQkVUV0VFTiAyMCBBTkQgMjkgRk9SIFVQREFURTsKIFVQREFURSB0MSBQQVJUSVRJ
T04gKGBwMC0yOWApIFNFVCBiPSdwMC0yOS11cGQtMicgV0hFUkUgYSBCRVRXRUVOIDIwIEFORCAy
OSA7CiAKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL3BhcnRzL2luYy9wYXJ0
aXRpb24tZG1sLTEtOC5pbmMnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvaW5jL3BhcnRp
dGlvbi1kbWwtMS04LmluYwkyMDExLTAyLTE3IDE1OjM2OjA1ICswMDAwCisrKyBiL215c3FsLXRl
c3Qvc3VpdGUvcGFydHMvaW5jL3BhcnRpdGlvbi1kbWwtMS04LmluYwkyMDEyLTAxLTI3IDExOjIw
OjI2ICswMDAwCkBAIC0yNiw2ICsyNiw3IEBAIEdSQU5UIEFMTCBQUklWSUxFR0VTIE9OIHRlc3Qu
KiBUTyB0ZXN0X3UKIEdSQU5UIEFMTCBQUklWSUxFR0VTIE9OIHRlc3QuKiBUTyB0ZXN0X3VzZXJf
MyBJREVOVElGSUVEIEJZICd0ZXN0cHcnOwogCiBjb25uZWN0IChzZXNzaW9uMSwgbG9jYWxob3N0
LCB0ZXN0X3VzZXJfMSwndGVzdHB3Jyx0ZXN0KTsKKy0tc29ydGVkX3Jlc3VsdAogU0VMRUNUICog
RlJPTSB0MSBQQVJUSVRJT04gKGBwMC0yOWApIFdIRVJFIGEgQkVUV0VFTiAwIEFORCA5IExPQ0sg
SU4gU0hBUkUgTU9ERTsKIFVQREFURSB0MSBQQVJUSVRJT04gKGBwMC0yOWApIFNFVCBiPSdwMC0y
OS11cGQtMScgV0hFUkUgYSBCRVRXRUVOIDAgQU5EIDkgOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAn
bXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uX2tleV8xNmNvbC5pbmMnCi0tLSBh
L215c3FsLXRlc3Qvc3VpdGUvcGFydHMvaW5jL3BhcnRpdGlvbl9rZXlfMTZjb2wuaW5jCTIwMDgt
MDItMDYgMTQ6MTM6NTYgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFy
dGl0aW9uX2tleV8xNmNvbC5pbmMJMjAxMi0wMS0yNyAxMToyMDoyNiArMDAwMApAQCAtMTEsNSAr
MTEsNiBAQCBpbnNlcnQgaW50byB0MSB2YWx1ZXMgCiAoJzE5ODAtMTAtMTQnLCAnZmdiYmQnLCAn
ZHR6bmR0eicsICd3JywgNjc4NTYsIDU0NjMzNTQuNjcsIDM1Njc4NDUzMzMsIDEyNCwnMTk4MC0x
MC0xNCcsICdmZ2JiZCcsICdkdHpuZHR6JywgJ3cnLCA2Nzg1NiwgNTQ2MzM1NC42NywgMzU2Nzg0
NTMzMywgMTI0LCAnZCxmIHPDtmllcnVnc2lnIG1zaXJlZyBzaXVnIGVpNWdndGggbHJ1dGx1aXRn
emXDtmpydG5iLnJranRodWVrdWh6cmt1dGhnamRuZmZqbWJyJyksCiAoJzIwMDAtMDYtMTUnLCAn
anVrZycsJ3ppa2h1aycsJ20nLCA0NTY3NSwgNjQ2NTc1NC4xMywgNDM1MjQyNjIzNDYyLCAxOCwg
JzIwMDAtMDYtMTUnLCAnanVrZycsJ3ppa2h1aycsJ20nLCA0NTY3NSwgNjQ2NTc1NC4xMywgNDM1
MjQyNjIzNDYyLCAxOCwgJ3BpYiBtZG90a2JtLm0nKTsKIHNlbGVjdCAqIGZyb20gdDE7CistLXNv
cnRlZF9yZXN1bHQKIHNlbGVjdCAqIGZyb20gdDEgd2hlcmUgYTwxOTg1MTIzMTsKIGRyb3AgdGFi
bGUgdDE7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFy
dGl0aW9uX2tleV8zMmNvbC5pbmMnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvaW5jL3Bh
cnRpdGlvbl9rZXlfMzJjb2wuaW5jCTIwMDktMDktMTUgMTU6MDc6NTIgKzAwMDAKKysrIGIvbXlz
cWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uX2tleV8zMmNvbC5pbmMJMjAxMi0wMS0y
NyAxMToyMDoyNiArMDAwMApAQCAtMjEsNiArMjEsNyBAQCBpbnNlcnQgaW50byB0MSB2YWx1ZXMg
CiAoJzE5ODAtMTAtMTQnLCAnZmdiYmQnLCAnZHR6bmR0eicsICd3JywgNjc4NTYsIDU0NjMzNTQu
NjcsIDM1Njc4NDUzMzMsIDEyNCwgJzE5ODAtMTAtMTQnLCAnZmdiYmQnLCAnZHR6bmR0eicsICd3
JywgNjc4NTYsIDU0NjMzNTQuNjcsIDM1Njc4NDUzMzMsIDEyNCwgJzE5ODAtMTAtMTQnLCAnZmdi
YmQnLCAnZHR6bmR0eicsICd3JywgNjc4NTYsIDU0NjMzNTQuNjcsIDM1Njc4NDUzMzMsIDEyNCwg
JzE5ODAtMTAtMTQnLCAnZmdiYmQnLCAnZHR6bmR0eicsICd3JywgNjc4NTYsIDU0NjMzNTQuNjcs
IDM1Njc4NDUzMzMsIDEyNCwgJ2QsZiBzw7ZpZXJ1Z3NpZyBtc2lyZWcgc2l1ZyBlaTVnZ3RoIGxy
dXRsdWl0Z3plw7ZqcnRuYi5ya2p0aHVla3VoenJrdXRoZ2pkbmZmam1icicpLAogKCcyMDAwLTA2
LTE1JywgJ2p1a2cnLCd6aWtodWsnLCdtJywgNDU2NzUsIDY0NjU3NTQuMTMsIDQzNTI0MjYyMzQ2
MiwgMTgsICcyMDAwLTA2LTE1JywgJ2p1a2cnLCd6aWtodWsnLCdtJywgNDU2NzUsIDY0NjU3NTQu
MTMsIDQzNTI0MjYyMzQ2MiwgMTgsICcyMDAwLTA2LTE1JywgJ2p1a2cnLCd6aWtodWsnLCdtJywg
NDU2NzUsIDY0NjU3NTQuMTMsIDQzNTI0MjYyMzQ2MiwgMTgsICcyMDAwLTA2LTE1JywgJ2p1a2cn
LCd6aWtodWsnLCdtJywgNDU2NzUsIDY0NjU3NTQuMTMsIDQzNTI0MjYyMzQ2MiwgMTgsICdwaWIg
bWRvdGtibS5tJyk7CiBzZWxlY3QgKiBmcm9tIHQxOworLS1zb3J0ZWRfcmVzdWx0CiBzZWxlY3Qg
KiBmcm9tIHQxIHdoZXJlIGE8MTk4NTEyMzE7CiBkcm9wIHRhYmxlIHQxOwogLS1lbmFibGVfYWJv
cnRfb25fZXJyb3IKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL3BhcnRzL2lu
Yy9wYXJ0aXRpb25fa2V5XzRjb2wuaW5jJwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3BhcnRzL2lu
Yy9wYXJ0aXRpb25fa2V5XzRjb2wuaW5jCTIwMDgtMDItMDYgMTQ6MTM6NTYgKzAwMDAKKysrIGIv
bXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9pbmMvcGFydGl0aW9uX2tleV80Y29sLmluYwkyMDEyLTAx
LTI3IDExOjIwOjI2ICswMDAwCkBAIC0xMSw2ICsxMSw3IEBAIGluc2VydCBpbnRvIHQxIHZhbHVl
cyAKICgnMTk4MC0xMC0xNCcsICdmZ2JiZCcsICdkdHpuZHR6JywgJ3cnKSwKICgnMjAwMC0wNi0x
NScsICdqdWtnJywnemlraHVrJywnbScpOwogc2VsZWN0ICogZnJvbSB0MTsKKy0tc29ydGVkX3Jl
c3VsdAogc2VsZWN0ICogZnJvbSB0MSB3aGVyZSBhPDE5ODUxMjMxOwogZHJvcCB0YWJsZSB0MTsK
IAoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvcGFydHMvaW5jL3BhcnRpdGlv
bl9rZXlfOGNvbC5pbmMnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvaW5jL3BhcnRpdGlv
bl9rZXlfOGNvbC5pbmMJMjAwOC0wMi0wNiAxNDoxMzo1NiArMDAwMAorKysgYi9teXNxbC10ZXN0
L3N1aXRlL3BhcnRzL2luYy9wYXJ0aXRpb25fa2V5Xzhjb2wuaW5jCTIwMTItMDEtMjcgMTE6MjA6
MjYgKzAwMDAKQEAgLTExLDUgKzExLDYgQEAgaW5zZXJ0IGludG8gdDEgdmFsdWVzIAogKCcxOTgw
LTEwLTE0JywgJ2ZnYmJkJywgJ2R0em5kdHonLCAndycsIDY3ODU2LCA1NDYzMzU0LjY3LCAzNTY3
ODQ1MzMzLCAxMjQsICdkLGYgc8O2aWVydWdzaWcgbXNpcmVnIHNpdWcgZWk1Z2d0aCBscnV0bHVp
dGd6ZcO2anJ0bmIucmtqdGh1ZWt1aHpya3V0aGdqZG5mZmptYnInKSwKICgnMjAwMC0wNi0xNScs
ICdqdWtnJywnemlraHVrJywnbScsIDQ1Njc1LCA2NDY1NzU0LjEzLCA0MzUyNDI2MjM0NjIsIDE4
LCAncGliIG1kb3RrYm0ubScgKTsKIHNlbGVjdCAqIGZyb20gdDE7CistLXNvcnRlZF9yZXN1bHQK
IHNlbGVjdCAqIGZyb20gdDEgd2hlcmUgYTwxOTg1MTIzMTsKIGRyb3AgdGFibGUgdDE7Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9wYXJ0cy9yL3BhcnRpdGlvbl9zcGVjaWFs
X215aXNhbS5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGFydHMvci9wYXJ0aXRpb25f
c3BlY2lhbF9teWlzYW0ucmVzdWx0CTIwMTEtMDMtMjQgMTM6MTA6MzcgKzAwMDAKKysrIGIvbXlz
cWwtdGVzdC9zdWl0ZS9wYXJ0cy9yL3BhcnRpdGlvbl9zcGVjaWFsX215aXNhbS5yZXN1bHQJMjAx
Mi0wMS0yNyAxMToyMDoyNiArMDAwMApAQCAtMzEsOSArMzEsOSBAQCBhCWIJYwlkCiAyMDAwLTA2
LTE1CWp1a2cJemlraHVrCW0KIHNlbGVjdCAqIGZyb20gdDEgd2hlcmUgYTwxOTg1MTIzMTsKIGEJ
YgljCWQKLTE5ODMtMTItMzEJY2RlZglzcnRidnNyCXcKLTE5ODAtMTAtMTQJZmdiYmQJZHR6bmR0
egl3CiAxOTc1LTAxLTAxCWFiY2RlCWFiY2RlCW0KKzE5ODAtMTAtMTQJZmdiYmQJZHR6bmR0egl3
CisxOTgzLTEyLTMxCWNkZWYJc3J0YnZzcgl3CiBkcm9wIHRhYmxlIHQxOwogY3JlYXRlIHRhYmxl
IHQxIChhIGRhdGUgbm90IG51bGwsIGIgdmFyY2hhcig1MCkgbm90IG51bGwsIGMgdmFyY2hhcig1
MCkgbm90IG51bGwsIGQgZW51bSgnbScsICd3Jykgbm90IG51bGwsIGUgaW50IG5vdCBudWxsLCBm
IGRlY2ltYWwgKDE4LDIpIG5vdCBudWxsLCBnIGJpZ2ludCBub3QgbnVsbCwgaCB0aW55aW50IG5v
dCBudWxsLCBpIGNoYXIoMjU1KSwgcHJpbWFyeSBrZXkoYSxiLGMsZCxlLGYsZyxoKSkgZW5naW5l
PSdNeUlTQU0nIAogcGFydGl0aW9uIGJ5IGtleShhLGIsYyxkLGUsZixnLGgpICgKCk5vIGJ1bmRs
ZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku