From: Ole John Aske
Date: January 17 2011 12:32pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4118 to 4119)
List-Archive: http://lists.mysql.com/commits/128954
Message-Id: <20110117123211.76CA2223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQxMTkgT2xlIEpvaG4gQXNrZQkyMDExLTAxLTE3CiAgICAgIEZpeCBmb3IgYnVnIyM1ODc1MDog
J291dCBvZiBjb25uZWN0aW9uIG9iamVjdHMnIGR1ZSB0byBtaXNzaW5nIGNsb3NlKCkKICAgICAg
b2YgcHJldi4gZnVsbF90YWJsZV9zY2FuKCknCiAgICAgIAogICAgICBJZiBoYV9uZGJjbHVzdGVy
OjpyZWFkX3JhbmdlX2ZpcnN0X3RvX2J1ZigpIGhhZCB0byBkbyBhIDo6ZnVsbF90YWJsZV9zY2Fu
KCkgCiAgICAgIG9uIGEgVU5JUVVFX0lOREVYLCB0aGUgcmVzdWx0aW5nIFNjYW5PcGVyYXRpb24g
d2FzIG5vdCBwcm9wZXJseSBjbG9zZWQgYXQgZW5kCiAgICAgIG9mIGl0cyBsaWZldGltZS4gSWYg
bG90cyBvZiBzdWNoIG9wZXJhdGlvbnMgaXMgZXhlY3V0ZWQgd2l0aGluIHRoZSAKICAgICAgc2Ft
ZSB0cmFuc2FjdGlvbiwgd2Ugd2lsbCBldmVudHVhbGx5IHJ1biBvdXQgb2Ygb3BlcmF0aW9uIG9y
IHRyYW5zYWN0aW9uIG9iamVjdHMuCiAgICAgIChUcmFuc2FjdGlvbiBvYmplY3RzIGlzIGR1ZSB0
byBhIGR1bW5teSBIdXBwJ2VkIHRyYW5zYWN0aW9uIG9iamVjdCBpcyBhbGxvY2F0ZWQgYXMKICAg
ICAgcGFydCBvZiBhIFNjYW5PcGVyYXRpb24pCiAgICAgICAgICAgIAogICAgICBUaGlzIGZpeCBl
bnN1cmVzIHRoYXQgOjpjbG9zZV9zY2FuKCkgaXMgY2FsbGVkIGZvciBhbnkgb3BlbiBjdXJzb3Jz
IGF0IHN0YXJ0IG9mCiAgICAgIGhhX25kYmNsdXN0ZXI6OnJlYWRfcmFuZ2VfZmlyc3RfdG9fYnVm
KCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvbmRiL3IvbmRiX2luZGV4
X3VuaXF1ZS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9uZGIvdC9uZGJfaW5kZXhfdW5p
cXVlLnRlc3QKICAgICAgc3FsL2hhX25kYmNsdXN0ZXIuY2MKIDQxMTggTWFnbnVzIEJsw6V1ZGQJ
MjAxMS0wMS0xNyBbbWVyZ2VdCiAgICAgIE1lcmdlCgogICAgbW9kaWZpZWQ6CiAgICAgIGluY2x1
ZGUvbXlfc3lzLmgKICAgICAgbXlzeXMvbXlfbG9ja21lbS5jCiAgICAgIHNxbC9oYV9uZGJjbHVz
dGVyLmNjCiAgICAgIHNxbC9oYV9uZGJjbHVzdGVyLmgKICAgICAgc3FsL2hhX25kYmNsdXN0ZXJf
YmlubG9nLmNjCiAgICAgIHNxbC9oYV9uZGJjbHVzdGVyX2NvbmQuY2MKICAgICAgc3FsL2hhX25k
YmNsdXN0ZXJfY29uZC5oCiAgICAgIHNxbC9oYV9uZGJjbHVzdGVyX2dsdWUuaAogICAgICBzdG9y
YWdlL25kYi9zcmMvbWdtc3J2L0luaXRDb25maWdGaWxlUGFyc2VyLmNwcAo9PT0gbW9kaWZpZWQg
ZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9uZGIvci9uZGJfaW5kZXhfdW5pcXVlLnJlc3VsdCcKLS0t
IGEvbXlzcWwtdGVzdC9zdWl0ZS9uZGIvci9uZGJfaW5kZXhfdW5pcXVlLnJlc3VsdAkyMDEwLTEx
LTE0IDE0OjE2OjEwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvbmRiL3IvbmRiX2luZGV4
X3VuaXF1ZS5yZXN1bHQJMjAxMS0wMS0xNyAxMjozMToyOSArMDAwMApAQCAtODg5LDMgKzg4OSwy
NyBAQCBhCiA0CiBzZXQgZW5naW5lX2NvbmRpdGlvbl9wdXNoZG93biA9IEBvbGRfZWNwZDsKIGRy
b3AgdGFibGUgdDE7CitjcmVhdGUgdGFibGUgdDEgKHBrIGludCBwcmltYXJ5IGtleSwgYSBpbnQp
IGVuZ2luZT1uZGI7CitjcmVhdGUgdGFibGUgdDIgKHBrIGludCBwcmltYXJ5IGtleSwgdXEgaW50
LCBhIGludCwgCit1bmlxdWUga2V5IGl4KHVxLGEpIFVTSU5HIEhBU0gpIGVuZ2luZT1uZGI7CitX
YXJuaW5nczoKK1dhcm5pbmcJMTEyMQlOZGIgZG9lcyBub3Qgc3VwcG9ydCB1bmlxdWUgaW5kZXgg
b24gTlVMTCB2YWx1ZWQgYXR0cmlidXRlcywgaW5kZXggYWNjZXNzIHdpdGggTlVMTCB2YWx1ZSB3
aWxsIGJlY29tZSBmdWxsIHRhYmxlIHNjYW4KK2luc2VydCBpbnRvIHQyIHZhbHVlcworKDAsMCww
KSwgKDEsMSwwKSwgKDIsMiwwKSwgKDMsMywwKSwgKDQsNCwwKSwKKyg1LDUsMSksICg2LDYsMSks
ICg3LDcsMSksICg4LDgsMSksICg5LDksMSk7CitpbnNlcnQgaW50byB0MQorc2VsZWN0Cit0MS5w
ayArIHQyLnBrKjEwICsgdDMucGsqMTAwICsgdDQucGsqMTAwMCwgdDEuYQorZnJvbQordDIgYXMg
dDEsIHQyIGFzIHQyLCB0MiBhcyB0MywgdDIgYXMgdDQ7CitleHBsYWluCitTRUxFQ1QgU1RSQUlH
SFRfSk9JTiBjb3VudCgqKSBGUk9NIAordDEgSk9JTiB0MiBPTiB0Mi5hPXQxLmEgd2hlcmUgdDIu
dXEgSVMgTlVMTDsKK2lkCXNlbGVjdF90eXBlCXRhYmxlCXR5cGUJcG9zc2libGVfa2V5cwlrZXkJ
a2V5X2xlbglyZWYJcm93cwlFeHRyYQorMQlTSU1QTEUJdDEJQUxMCU5VTEwJTlVMTAlOVUxMCU5V
TEwJMTAwMDAJCisxCVNJTVBMRQl0MglyZWYJaXgJaXgJMTAJY29uc3QsdGVzdC50MS5hCTEJVXNp
bmcgd2hlcmUgd2l0aCBwdXNoZWQgY29uZGl0aW9uCitTRUxFQ1QgU1RSQUlHSFRfSk9JTiBjb3Vu
dCgqKSBGUk9NIAordDEgSk9JTiB0MiBPTiB0Mi5hPXQxLmEgd2hlcmUgdDIudXEgSVMgTlVMTDsK
K2NvdW50KCopCiswCitkcm9wIHRhYmxlIHQxLHQyOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs
LXRlc3Qvc3VpdGUvbmRiL3QvbmRiX2luZGV4X3VuaXF1ZS50ZXN0JwotLS0gYS9teXNxbC10ZXN0
L3N1aXRlL25kYi90L25kYl9pbmRleF91bmlxdWUudGVzdAkyMDEwLTExLTE0IDE0OjE2OjEwICsw
MDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvbmRiL3QvbmRiX2luZGV4X3VuaXF1ZS50ZXN0CTIw
MTEtMDEtMTcgMTI6MzE6MjkgKzAwMDAKQEAgLTUxNCw0ICs1MTQsNDIgQEAgc2V0IGVuZ2luZV9j
b25kaXRpb25fcHVzaGRvd24gPSBAb2xkX2VjcAogCiBkcm9wIHRhYmxlIHQxOwogCisjCisjIEJ1
ZyM1ODc1MDogJ291dCBvZiBjb25uZWN0aW9uIG9iamVjdHMnIGR1ZSB0byBtaXNzaW5nIGNsb3Nl
KCkKKyMgb2YgcHJldi4gZnVsbF90YWJsZV9zY2FuKCkKKyMKK2NyZWF0ZSB0YWJsZSB0MSAocGsg
aW50IHByaW1hcnkga2V5LCBhIGludCkgZW5naW5lPW5kYjsKK2NyZWF0ZSB0YWJsZSB0MiAocGsg
aW50IHByaW1hcnkga2V5LCB1cSBpbnQsIGEgaW50LCAKKyAgIHVuaXF1ZSBrZXkgaXgodXEsYSkg
VVNJTkcgSEFTSCkgZW5naW5lPW5kYjsKKworaW5zZXJ0IGludG8gdDIgdmFsdWVzCisgICAoMCww
LDApLCAoMSwxLDApLCAoMiwyLDApLCAoMywzLDApLCAoNCw0LDApLAorICAgKDUsNSwxKSwgKDYs
NiwxKSwgKDcsNywxKSwgKDgsOCwxKSwgKDksOSwxKTsKKworIyMKKyMgMTBeNCBjcm9zcyBwcm9k
dWN0IG9uIHQyIGNyZWF0ZXMgMTAuMDAwIHJvd3M6CisjIworaW5zZXJ0IGludG8gdDEKKyBzZWxl
Y3QKKyAgIHQxLnBrICsgdDIucGsqMTAgKyB0My5wayoxMDAgKyB0NC5wayoxMDAwLCB0MS5hCitm
cm9tCisgIHQyIGFzIHQxLCB0MiBhcyB0MiwgdDIgYXMgdDMsIHQyIGFzIHQ0OworCisjIEV4ZWN1
dGUgYSAnc2Nhbih0MSkgam9pbiBSRUYodDIpIHVzaW5nIGl4JworIyAgLSBXaGVyZSBjb25kaXRp
b24gJ3QyLnVxIElTIE5VTEwnIGluIGNvbWJpbmF0aW9uIHdpdGggCisjICAgIGpvaW4gY29uZC4g
J3QyLmE9dDEuYScgd2lsbCBjcmVhdGUgdGhlIFJFRiBrZXlzIChOVUxMLHQxLmEpLgorIyAgICBU
aGlzIHdpbGwgaW5pdGlhdGUgYSA6OmZ1bGxfdGFibGVfc2NhbigpIHdoaWNoIGZhaWxzIHRvCisj
ICAgIGNsb3NlIGFueSBvcGVuIHRhYmxlIHNjYW5zLgorIyAgLSBUYWJsZSBzY2FuKHQxKSB3aWxs
ICdkcml2ZScgdGhlIGNhc2UgYWJvdmUgYW5kIGV2ZW50dWFsbHkKKyMgICAgY2F1c2UgYWxsIFNj
YW5PcGVyYXRpb25zIC8gaHVwcCdlZCB0cmFuc2FjdGlvbnMgdG8gaGF2ZSBiZWVuIAorIyAgICBj
b25zdW1lZAorCitleHBsYWluCitTRUxFQ1QgU1RSQUlHSFRfSk9JTiBjb3VudCgqKSBGUk9NIAor
ICAgdDEgSk9JTiB0MiBPTiB0Mi5hPXQxLmEgd2hlcmUgdDIudXEgSVMgTlVMTDsKK1NFTEVDVCBT
VFJBSUdIVF9KT0lOIGNvdW50KCopIEZST00gCisgICB0MSBKT0lOIHQyIE9OIHQyLmE9dDEuYSB3
aGVyZSB0Mi51cSBJUyBOVUxMOworCitkcm9wIHRhYmxlIHQxLHQyOworCiAjIGVuZCBvZiB0ZXN0
cwoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9oYV9uZGJjbHVzdGVyLmNjJwotLS0gYS9zcWwvaGFf
bmRiY2x1c3Rlci5jYwkyMDExLTAxLTE0IDE1OjEyOjM5ICswMDAwCisrKyBiL3NxbC9oYV9uZGJj
bHVzdGVyLmNjCTIwMTEtMDEtMTcgMTI6MzE6MjkgKzAwMDAKQEAgLTM1OTgsNiArMzU5OCw3IEBA
IGludCBoYV9uZGJjbHVzdGVyOjpmdWxsX3RhYmxlX3NjYW4oY29uc3QKICAgICBtX3RoZF9uZGIt
Pm1fcHJ1bmVkX3NjYW5fY291bnQgKz0gKG9wLT5nZXRQcnVuZWQoKT8gMSA6IDApOwogICB9CiAg
IAorICBEQlVHX0FTU0VSVChtX2FjdGl2ZV9jdXJzb3I9PU5VTEwpOwogICBtX2FjdGl2ZV9jdXJz
b3I9IG9wOwogCiAgIGlmICh1c2VzX2Jsb2JfdmFsdWUodGFibGUtPnJlYWRfc2V0KSAmJgpAQCAt
NTQ0OCw2ICs1NDQ5LDkgQEAgaW50IGhhX25kYmNsdXN0ZXI6OnJlYWRfcmFuZ2VfZmlyc3RfdG9f
YgogICBEQlVHX0VOVEVSKCJoYV9uZGJjbHVzdGVyOjpyZWFkX3JhbmdlX2ZpcnN0X3RvX2J1ZiIp
OwogICBEQlVHX1BSSU5UKCJpbmZvIiwgKCJkZXNjOiAlZCwgc29ydGVkOiAlZCIsIGRlc2MsIHNv
cnRlZCkpOwogCisgIGlmIChtX2FjdGl2ZV9jdXJzb3IgJiYgKGVycm9yPSBjbG9zZV9zY2FuKCkp
KQorICAgIERCVUdfUkVUVVJOKGVycm9yKTsKKwogICBpZiAobV91c2VfcGFydGl0aW9uX3BydW5p
bmcpCiAgIHsKICAgICBnZXRfcGFydGl0aW9uX3NldCh0YWJsZSwgYnVmLCBhY3RpdmVfaW5kZXgs
IHN0YXJ0X2tleSwgJnBhcnRfc3BlYyk7CkBAIC01NDg2LDggKzU0OTAsNiBAQCBpbnQgaGFfbmRi
Y2x1c3Rlcjo6cmVhZF9yYW5nZV9maXJzdF90b19iCiAgICAgICAgIHN0YXJ0X2tleS0+bGVuZ3Ro
ID09IGtleV9pbmZvLT5rZXlfbGVuZ3RoICYmCiAgICAgICAgIHN0YXJ0X2tleS0+ZmxhZyA9PSBI
QV9SRUFEX0tFWV9FWEFDVCkKICAgICB7Ci0gICAgICBpZiAobV9hY3RpdmVfY3Vyc29yICYmIChl
cnJvcj0gY2xvc2Vfc2NhbigpKSkKLSAgICAgICAgREJVR19SRVRVUk4oZXJyb3IpOwogICAgICAg
aWYgKCFtX3RoZF9uZGItPnRyYW5zKQogICAgICAgICBpZiAodW5saWtlbHkoIXN0YXJ0X3RyYW5z
YWN0aW9uX2tleShhY3RpdmVfaW5kZXgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIHN0YXJ0X2tleS0+a2V5LCBlcnJvcikpKQpAQCAtNTUwMyw5ICs1NTA1LDYg
QEAgaW50IGhhX25kYmNsdXN0ZXI6OnJlYWRfcmFuZ2VfZmlyc3RfdG9fYgogICAgICAgICBzdGFy
dF9rZXktPmZsYWcgPT0gSEFfUkVBRF9LRVlfRVhBQ1QgJiYgCiAgICAgICAgICFjaGVja19udWxs
X2luX2tleShrZXlfaW5mbywgc3RhcnRfa2V5LT5rZXksIHN0YXJ0X2tleS0+bGVuZ3RoKSkKICAg
ICB7Ci0gICAgICBpZiAobV9hY3RpdmVfY3Vyc29yICYmIChlcnJvcj0gY2xvc2Vfc2NhbigpKSkK
LSAgICAgICAgREJVR19SRVRVUk4oZXJyb3IpOwotCiAgICAgICBpZiAoIW1fdGhkX25kYi0+dHJh
bnMpCiAgICAgICAgIGlmICh1bmxpa2VseSghc3RhcnRfdHJhbnNhY3Rpb25fa2V5KGFjdGl2ZV9p
bmRleCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRf
a2V5LT5rZXksIGVycm9yKSkpCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBl
bWFpbHMpLg==