From: Sergey Petrunia
Date: August 25 2008 6:24pm
Subject: bzr push into mysql-6.0 branch (sergefp:2803 to 2804)
List-Archive: http://lists.mysql.com/commits/52606
Message-Id: <20080825182458.3B2C315A15E@pslp2.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: BASE64

IDI4MDQgU2VyZ2V5IFBldHJ1bmlhCTIwMDgtMDgtMjUgW21lcmdlXQ0KICAgICAg
TWVyZ2UgNS4xLW9wdCAtPiA2LjAtb3B0DQptb2RpZmllZDoNCiAgbXlzcWwtdGVz
dC9yL215aXNhbS5yZXN1bHQNCiAgbXlzcWwtdGVzdC90L215aXNhbS50ZXN0DQog
IHNxbC9vcHRfcmFuZ2UuY2MNCiAgc3RvcmFnZS9teWlzYW0vbWlfY3JlYXRlLmMN
Cg0KIDI4MDMgRGF2aSBBcm5hdXQJMjAwOC0wOC0yNiBbbWVyZ2VdDQogICAgICBN
ZXJnZSBvZiBteXNxbC02LjAgYnJhbmNoLiANCmFkZGVkOg0KICBteXNxbC10ZXN0
L2luY2x1ZGUvbXlzcWxiaW5sb2dfcm93X2VuZ2luZS5pbmMNCiAgbXlzcWwtdGVz
dC9yL215c3FsYmlubG9nX3Jvdy5yZXN1bHQNCiAgbXlzcWwtdGVzdC9yL215c3Fs
YmlubG9nX3Jvd19iaWcucmVzdWx0DQogIG15c3FsLXRlc3Qvci9teXNxbGJpbmxv
Z19yb3dfaW5ub2RiLnJlc3VsdA0KICBteXNxbC10ZXN0L3IvbXlzcWxiaW5sb2df
cm93X215aXNhbS5yZXN1bHQNCiAgbXlzcWwtdGVzdC9yL215c3FsYmlubG9nX3Jv
d190cmFucy5yZXN1bHQNCiAgbXlzcWwtdGVzdC90L215c3FsYmlubG9nX3Jvdy50
ZXN0DQogIG15c3FsLXRlc3QvdC9teXNxbGJpbmxvZ19yb3dfYmlnLnRlc3QNCiAg
bXlzcWwtdGVzdC90L215c3FsYmlubG9nX3Jvd19pbm5vZGIudGVzdA0KICBteXNx
bC10ZXN0L3QvbXlzcWxiaW5sb2dfcm93X215aXNhbS50ZXN0DQogIG15c3FsLXRl
c3QvdC9teXNxbGJpbmxvZ19yb3dfdHJhbnMudGVzdA0KbW9kaWZpZWQ6DQogIC5i
enJpZ25vcmUNCiAgY2xpZW50L01ha2VmaWxlLmFtDQogIGNsaWVudC9teXNxbGJp
bmxvZy5jYw0KICBpbmNsdWRlL215X2dsb2JhbC5oDQogIG15c3FsLXRlc3QvbXlz
cWwtdGVzdC1ydW4ucGwNCiAgbXlzcWwtdGVzdC9yL21hcmlhLnJlc3VsdA0KICBt
eXNxbC10ZXN0L3IvbWFyaWEyLnJlc3VsdA0KICBteXNxbC10ZXN0L3QvbWFyaWEu
dGVzdA0KICBteXNxbC10ZXN0L3QvbWFyaWEyLnRlc3QNCiAgbXlzcWwtdGVzdC92
YWxncmluZC5zdXBwDQogIG15c3lzL215X3ByZWFkLmMNCiAgc3FsL2hhbmRsZXIu
aA0KICBzcWwvbG9nX2V2ZW50LmNjDQogIHNxbC9sb2dfZXZlbnQuaA0KICBzcWwv
bWRsLmNjDQogIHNxbC9ycGxfdGJsbWFwLmNjDQogIHNxbC9ycGxfdGJsbWFwLmgN
CiAgc3FsL3JwbF91dGlsaXR5LmgNCiAgc3FsL3NxbF9iYXNlLmNjDQogIHNxbC9z
cWxfc2VsZWN0LmNjDQogIHNxbC9zcWxfdGFibGUuY2MNCiAgc3RvcmFnZS9tYXJp
YS9oYV9tYXJpYS5jYw0KICBzdG9yYWdlL21hcmlhL21hX2Jsb2NrcmVjLmMNCiAg
c3RvcmFnZS9tYXJpYS9tYV9jaGVjay5jDQogIHN0b3JhZ2UvbWFyaWEvbWFfY2hl
Y2twb2ludC5jDQogIHN0b3JhZ2UvbWFyaWEvbWFfY2xvc2UuYw0KICBzdG9yYWdl
L21hcmlhL21hX2NyZWF0ZS5jDQogIHN0b3JhZ2UvbWFyaWEvbWFfZGJ1Zy5jDQog
IHN0b3JhZ2UvbWFyaWEvbWFfZGVsZXRlLmMNCiAgc3RvcmFnZS9tYXJpYS9tYV9l
eHRyYS5jDQogIHN0b3JhZ2UvbWFyaWEvbWFfaW5mby5jDQogIHN0b3JhZ2UvbWFy
aWEvbWFfa2V5Y2FjaGUuYw0KICBzdG9yYWdlL21hcmlhL21hX2xvY2tpbmcuYw0K
ICBzdG9yYWdlL21hcmlhL21hX2xvZ2hhbmRsZXIuYw0KICBzdG9yYWdlL21hcmlh
L21hX29wZW4uYw0KICBzdG9yYWdlL21hcmlhL21hX3BhZ2VjYWNoZS5jDQogIHN0
b3JhZ2UvbWFyaWEvbWFfcmVjb3ZlcnkuYw0KICBzdG9yYWdlL21hcmlhL21hX3Nl
YXJjaC5jDQogIHN0b3JhZ2UvbWFyaWEvbWFfc3RhdGUuYw0KICBzdG9yYWdlL21h
cmlhL21hX3N0YXRlLmgNCiAgc3RvcmFnZS9tYXJpYS9tYV91cGRhdGUuYw0KICBz
dG9yYWdlL21hcmlhL21hX3dyaXRlLmMNCiAgc3RvcmFnZS9tYXJpYS9tYXJpYV9k
ZWYuaA0KICBzdG9yYWdlL21hcmlhL21hcmlhX2Z0ZHVtcC5jDQogIHN0b3JhZ2Uv
bWFyaWEvbWFyaWFfcGFjay5jDQogIHN0b3JhZ2UvbXlpc2FtL21pX3NlYXJjaC5j
DQoNCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvbXlpc2FtLnJlc3Vs
dCcNCi0tLSBhL215c3FsLXRlc3Qvci9teWlzYW0ucmVzdWx0CTIwMDgtMDYtMTcg
MjA6MDQ6MTkgKzAwMDANCisrKyBiL215c3FsLXRlc3Qvci9teWlzYW0ucmVzdWx0
CTIwMDgtMDgtMjUgMTg6MjM6MjcgKzAwMDANCkBAIC0xODQ4LDYgKzE4NDgsMjgg
QEAgY2hlY2tzdW0gdGFibGUgdDM7DQogVGFibGUJQ2hlY2tzdW0NCiB0ZXN0LnQz
CTMyNjI4NDg4Nw0KIGRyb3AgdGFibGUgdDEsdDIsdDM7DQorQ1JFQVRFIFRBQkxF
IHQxIChhIElOVCkgRU5HSU5FPU15SVNBTSBDSEVDS1NVTT0xIFJPV19GT1JNQVQ9
RFlOQU1JQzsNCitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDApOw0KK1VQREFURSB0
MSBTRVQgYT0xOw0KK1NFTEVDVCBhIEZST00gdDE7DQorYQ0KKzENCitDSEVDSyBU
QUJMRSB0MTsNCitUYWJsZQlPcAlNc2dfdHlwZQlNc2dfdGV4dA0KK3Rlc3QudDEJ
Y2hlY2sJc3RhdHVzCU9LDQorSU5TRVJUIElOVE8gdDEgVkFMVUVTICgwKSwgKDUp
LCAoNCksICgyKTsNCitVUERBVEUgdDEgU0VUIGE9MjsNCitTRUxFQ1QgYSBGUk9N
IHQxOw0KK2ENCisyDQorMg0KKzINCisyDQorMg0KK0NIRUNLIFRBQkxFIHQxOw0K
K1RhYmxlCU9wCU1zZ190eXBlCU1zZ190ZXh0DQordGVzdC50MQljaGVjawlzdGF0
dXMJT0sNCitEUk9QIFRBQkxFIHQxOw0KIEVuZCBvZiA1LjAgdGVzdHMNCiBjcmVh
dGUgdGFibGUgdDEgKGEgaW50IG5vdCBudWxsLCBrZXkgYGFgIChhKSBrZXlfYmxv
Y2tfc2l6ZT0xMDI0KTsNCiBzaG93IGNyZWF0ZSB0YWJsZSB0MTsNCg0KPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9teWlzYW0udGVzdCcNCi0tLSBhL215
c3FsLXRlc3QvdC9teWlzYW0udGVzdAkyMDA4LTA2LTE3IDIwOjA0OjE5ICswMDAw
DQorKysgYi9teXNxbC10ZXN0L3QvbXlpc2FtLnRlc3QJMjAwOC0wOC0yNSAxODoy
MzoyNyArMDAwMA0KQEAgLTExNzEsNiArMTE3MSw3IEBAIFNFTEVDVCAqIEZST00g
dDE7DQogDQogRFJPUCBUQUJMRSB0MSwgdDI7DQogDQorDQogIw0KICMgVGVzdCBv
ZiBCVUcjMzU1NzAgQ0hFQ0tTVU0gVEFCTEUgdW5yZWxpYWJsZSBpZiBMSU5FU1RS
SU5HIGZpZWxkDQogIyAoc2FtZSBjb250ZW50IC8gZGlmZmVyZW4gY2hlY2tzdW0p
DQpAQCAtMTE4Niw2ICsxMTg3LDIwIEBAIENSRUFURSBUQUJMRSB0MyBzZWxlY3Qg
KiBmcm9tIHQxOw0KIGNoZWNrc3VtIHRhYmxlIHQzOw0KIGRyb3AgdGFibGUgdDEs
dDIsdDM7DQogDQorIw0KKyMgQnVnIzM3MzEwOiAnb24gdXBkYXRlIENVUlJFTlRf
VElNRVNUQU1QJyBvcHRpb24gY3Jhc2hlcyB0aGUgdGFibGUNCisjDQorQ1JFQVRF
IFRBQkxFIHQxIChhIElOVCkgRU5HSU5FPU15SVNBTSBDSEVDS1NVTT0xIFJPV19G
T1JNQVQ9RFlOQU1JQzsNCitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDApOw0KK1VQ
REFURSB0MSBTRVQgYT0xOw0KK1NFTEVDVCBhIEZST00gdDE7DQorQ0hFQ0sgVEFC
TEUgdDE7DQorSU5TRVJUIElOVE8gdDEgVkFMVUVTICgwKSwgKDUpLCAoNCksICgy
KTsNCitVUERBVEUgdDEgU0VUIGE9MjsNCitTRUxFQ1QgYSBGUk9NIHQxOw0KK0NI
RUNLIFRBQkxFIHQxOw0KK0RST1AgVEFCTEUgdDE7IA0KKw0KIC0tZWNobyBFbmQg
b2YgNS4wIHRlc3RzDQogDQogDQoNCj09PSBtb2RpZmllZCBmaWxlICdzcWwvb3B0
X3JhbmdlLmNjJw0KLS0tIGEvc3FsL29wdF9yYW5nZS5jYwkyMDA4LTA3LTI1IDE1
OjEwOjE0ICswMDAwDQorKysgYi9zcWwvb3B0X3JhbmdlLmNjCTIwMDgtMDgtMjUg
MTg6MjM6MjcgKzAwMDANCkBAIC04NzEyLDcgKzg3MTIsMTAgQEAgUVVJQ0tfU0VM
RUNUX0RFU0M6OlFVSUNLX1NFTEVDVF9ERVNDKFFVSQ0KICAgdXNlZF9rZXlfcGFy
dHMgKHVzZWRfa2V5X3BhcnRzX2FyZykNCiB7DQogICBRVUlDS19SQU5HRSAqcjsN
Ci0gIC8qIFJldmVyc2UgTVJSIHNjYW5zIGFyZSBjdXJyZW50bHkgbm90IHN1cHBv
cnRlZCAqLw0KKyAgLyogDQorICAgIFVzZSBkZWZhdWx0IE1SUiBpbXBsZW1lbnRh
dGlvbiBmb3IgcmV2ZXJzZSBzY2Fucy4gTm8gdGFibGUgZW5naW5lDQorICAgIGN1
cnJlbnRseSBjYW4gZG8gYW4gTVJSIHNjYW4gd2l0aCBvdXRwdXQgaW4gcmV2ZXJz
ZSBpbmRleCBvcmRlci4NCisgICovDQogICBtcnJfYnVmX2Rlc2M9IE5VTEw7DQog
ICBtcnJfZmxhZ3MgfD0gSEFfTVJSX1VTRV9ERUZBVUxUX0lNUEw7DQogICBtcnJf
YnVmX3NpemU9IDA7DQoNCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL215aXNh
bS9taV9jcmVhdGUuYycNCi0tLSBhL3N0b3JhZ2UvbXlpc2FtL21pX2NyZWF0ZS5j
CTIwMDgtMDctMDkgMDc6MTI6NDMgKzAwMDANCisrKyBiL3N0b3JhZ2UvbXlpc2Ft
L21pX2NyZWF0ZS5jCTIwMDgtMDgtMjUgMTg6MjM6MjcgKzAwMDANCkBAIC0yMDAs
NyArMjAwLDcgQEAgaW50IG1pX2NyZWF0ZShjb25zdCBjaGFyICpuYW1lLHVpbnQg
a2V5cw0KICAgcGFja19ieXRlcz0gKHBhY2tlZCs3KS84Ow0KICAgaWYgKHBhY2tf
cmVjbGVuZ3RoICE9IElOVF9NQVgzMikNCiAgICAgcGFja19yZWNsZW5ndGgrPSBy
ZWNsZW5ndGgrcGFja2VkICsNCi0gICAgICB0ZXN0KHRlc3RfYWxsX2JpdHMob3B0
aW9ucywgSEFfT1BUSU9OX0NIRUNLU1VNIHwgSEFfUEFDS19SRUNPUkQpKTsNCisg
ICAgICB0ZXN0KHRlc3RfYWxsX2JpdHMob3B0aW9ucywgSEFfT1BUSU9OX0NIRUNL
U1VNIHwgSEFfT1BUSU9OX1BBQ0tfUkVDT1JEKSk7DQogICBtaW5fcGFja19sZW5n
dGgrPSBwYWNrX2J5dGVzOw0KIA0KICAgaWYgKCFjaS0+ZGF0YV9maWxlX2xlbmd0
aCAmJiBjaS0+bWF4X3Jvd3MpDQpAQCAtODYzLDcgKzg2Myw3IEBAIGVycl9ub19s
b2NrOg0KICAgICAodm9pZCkgbXlfY2xvc2UoZGZpbGUsTVlGKDApKTsNCiAgICAg
LyogZmFsbCB0aHJvdWdoICovDQogICBjYXNlIDI6DQotICAgIC8qIFFROiBU77+9
bnUgc2hvdWxkIGFkZCBhIGNhbGwgdG8gbXlfcmFpZF9kZWxldGUoKSBoZXJlICov
DQorICAgIC8qIFFROiBU77+977+977+9bnUgc2hvdWxkIGFkZCBhIGNhbGwgdG8g
bXlfcmFpZF9kZWxldGUoKSBoZXJlICovDQogICBpZiAoISAoZmxhZ3MgJiBIQV9E
T05UX1RPVUNIX0RBVEEpKQ0KICAgICBteV9kZWxldGVfd2l0aF9zeW1saW5rKGZu
X2Zvcm1hdChmaWxlbmFtZSxuYW1lLCIiLE1JX05BTUVfREVYVCwNCiAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTVlfVU5QQUNLX0ZJTEVOQU1F
IHwgTVlfQVBQRU5EX0VYVCksDQoNCg==