From: Dmitry Lenev
Date: June 9 2011 12:54pm
Subject: bzr push into mysql-5.5 branch (Dmitry.Lenev:3433 to 3434) Bug#11759990
List-Archive: http://lists.mysql.com/commits/138951
X-Bug: 11759990
Message-Id: <20110609125428.9D96C7405D3@bandersnatch>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0MzQgRG1pdHJ5IExlbmV2CTIwMTEtMDYtMDkKICAgICAgRml4IGZvciBidWcgIzExNzU5OTkw
IC0gIjUyMzU0OiAnQ1JFQVRFIFRBQkxFIC4uIExJS0UgLi4uICcKICAgICAgU1RBVEVNRU5UUyBG
QUlMIi4KICAgICAgCiAgICAgIEF0dGVtcHQgdG8gZXhlY3V0ZSBDUkVBVEUgVEFCTEUgTElLRSBz
dGF0ZW1lbnQgb24gYSBNeUlTQU0KICAgICAgdGFibGUgd2l0aCBJTkRFWCBvciBEQVRBIERJUkVD
VE9SWSBvcHRpb25zIHNwZWNpZmllZCBhcyBhCiAgICAgIHNvdXJjZSByZXN1bHRlZCBpbiAiTXlJ
U0FNIHRhYmxlICcuLi4nIGlzIGluIHVzZS4uLiIgZXJyb3IuCiAgICAgIEFjY29yZGluZyB0byBv
dXIgZG9jdW1lbnRhdGlvbiBzdWNoIGEgc3RhdGVtZW50IHNob3VsZCBjcmVhdGUKICAgICAgYSBj
b3B5IG9mIHNvdXJjZSB0YWJsZSB3aXRoIERBVEEvSU5ERVggRElSRUNUT1JZIG9wdGlvbnMKICAg
ICAgb21pdHRlZC4KICAgICAgCiAgICAgIFRoZSBwcm9ibGVtIHdhcyB0aGF0IG5ldyBpbXBsZW1l
bnRhdGlvbiBvZiBDUkVBVEUgVEFCTEUgTElLRQogICAgICBzdGF0ZW1lbnQgaW4gNS41IHRyaWVk
IHRvIGNvcHkgdmFsdWUgb2YgSU5ERVggYW5kIERBVEEgRElSRUNUT1JZCiAgICAgIHBhcmFtZXRl
cnMgZnJvbSB0aGUgc291cmNlIHRhYmxlLiBTaW5jZSBpbiBkZXNjcmlwdGlvbiBvZiBzb3VyY2UK
ICAgICAgdGFibGUgdGhpcyBwYXJhbWV0ZXJzIGFsc28gaW5jbHVkZWQgbmFtZSBvZiB0aGlzIHRh
YmxlLCBhdHRlbXB0CiAgICAgIHRvIGNyZWF0ZSB0YXJnZXQgdGFibGUgd2l0aCB0aGVzZSBwYXJh
bWV0ZXIgbGVkIHRvIGZpbGUgbmFtZQogICAgICBjb25mbGljdCBhbmQgZXJyb3IuCiAgICAgIAog
ICAgICBUaGlzIGZpeCBhZGRyZXNzZXMgdGhlIHByb2JsZW0gYnkgcHJlc2VydmluZyBkb2N1bWVu
dGVkIGFuZAogICAgICBiYWNrd2FyZC1jb21wYXRpYmxlIGJlaGF2aW9yLiBJLmUuIGJ5IGVuc3Vy
aW5nIHRoYXQgY29udGVudHMKICAgICAgb2YgREFUQS9JTkRFWCBESVJFQ1RPUlkgY2xhdXNlcyBm
b3IgdGhlIHNvdXJjZSB0YWJsZSBpcwogICAgICBpZ25vcmVkIHdoZW4gdGFyZ2V0IHRhYmxlIGlz
IGNyZWF0ZWQuCiAgICAgQCBteXNxbC10ZXN0L3Ivc3ltbGluay5yZXN1bHQKICAgICAgICBBZGRl
ZCB0ZXN0IGZvciBidWcgIzExNzU5OTkwIC0gIjUyMzU0OiAnQ1JFQVRFIFRBQkxFIC4uCiAgICAg
ICAgTElLRSAuLi4gJyBTVEFURU1FTlRTIEZBSUwiLgogICAgIEAgbXlzcWwtdGVzdC90L3N5bWxp
bmsudGVzdAogICAgICAgIEFkZGVkIHRlc3QgZm9yIGJ1ZyAjMTE3NTk5OTAgLSAiNTIzNTQ6ICdD
UkVBVEUgVEFCTEUgLi4KICAgICAgICBMSUtFIC4uLiAnIFNUQVRFTUVOVFMgRkFJTCIuCiAgICAg
QCBzcWwvc3FsX3RhYmxlLmNjCiAgICAgICAgQ2hhbmdlZCBDUkVBVEUgVEFCTEUgTElLRSBpbXBs
ZW1lbnRhdGlvbiB0byBpZ25vcmUgY29udGVudHMKICAgICAgICBvZiBEQVRBL0lOREVYIERJUkVD
VE9SWSBjbGF1c2VzIGZvciBzb3VyY2UgdGFibGUgd2hlbiB0YXJnZXQKICAgICAgICB0YWJsZSBp
cyBjcmVhdGVkLiBUaGlzIGlzIGRvY3VtZW50ZWQgYW5kIGJhY2t3YXJkLWNvbXBhdGlibGUKICAg
ICAgICBiZWhhdmlvci4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL3N5bWxpbmsu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9zeW1saW5rLnRlc3QKICAgICAgc3FsL3NxbF90YWJs
ZS5jYwogMzQzMyBNYXJrbyBNw6RrZWzDpAkyMDExLTA2LTA5IFttZXJnZV0KICAgICAgTWVyZ2Ug
bXlzcWwtNS4xIHRvIG15c3FsLTUuNS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVj
LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaWMKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB2
ZXJzLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCj09PSBtb2RpZmllZCBm
aWxlICdteXNxbC10ZXN0L3Ivc3ltbGluay5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9zeW1s
aW5rLnJlc3VsdAkyMDExLTAxLTMxIDA5OjM0OjM5ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9z
eW1saW5rLnJlc3VsdAkyMDExLTA2LTA5IDEyOjU0OjEyICswMDAwCkBAIC0xODgsMyArMTg4LDI4
IEBAIERST1AgVEFCTEUgdXNlcjsKIEZMVVNIIFRBQkxFIG15c3FsLnVzZXI7CiBTRUxFQ1QgKiBG
Uk9NIG15c3FsLnVzZXI7CiBFbmQgb2YgNS4xIHRlc3RzCisjCisjIFRlc3QgZm9yIGJ1ZyAjMTE3
NTk5OTAgLSAiNTIzNTQ6ICdDUkVBVEUgVEFCTEUgLi4gTElLRSAuLi4gJworIyAgICAgICAgICAg
ICAgICAgICAgICAgICAgIFNUQVRFTUVOVFMgRkFJTCIuCisjCitkcm9wIHRhYmxlIGlmIGV4aXN0
cyB0MSwgdDI7CitjcmVhdGUgdGFibGUgdDEgKGEgaW50IHByaW1hcnkga2V5KSBlbmdpbmU9bXlp
c2FtCitkYXRhIGRpcmVjdG9yeT0iTVlTUUxURVNUX1ZBUkRJUi90bXAiCisgICAgICBpbmRleCBk
aXJlY3Rvcnk9Ik1ZU1FMVEVTVF9WQVJESVIvcnVuIjsKK3Nob3cgY3JlYXRlIHRhYmxlIHQxOwor
VGFibGUJQ3JlYXRlIFRhYmxlCit0MQlDUkVBVEUgVEFCTEUgYHQxYCAoCisgIGBhYCBpbnQoMTEp
IE5PVCBOVUxMLAorICBQUklNQVJZIEtFWSAoYGFgKQorKSBFTkdJTkU9TXlJU0FNIERFRkFVTFQg
Q0hBUlNFVD1sYXRpbjEgREFUQSBESVJFQ1RPUlk9J01ZU1FMVEVTVF9WQVJESVIvdG1wLycgSU5E
RVggRElSRUNUT1JZPSdNWVNRTFRFU1RfVkFSRElSL3J1bi8nCisjIENSRUFURSBUQUJMRSBMSUtF
IHN0YXRlbWVudCBvbiB0YWJsZSB3aXRoIElOREVYL0RBVEEgRElSRUNUT1JZCisjIG9wdGlvbnMg
c2hvdWxkIG5vdCBmYWlsLiBQZXIgZG9jdW1lbnRhdGlvbiBuZXdseSBjcmVhdGVkIHRhYmxlCisj
IHNob3VsZCBub3QgaW5oZXJpdCB2YWx1ZSBvZiB0aGVzZSBvcHRpb25zIGZyb20gdGhlIG9yaWdp
bmFsIHRhYmxlLgorY3JlYXRlIHRhYmxlIHQyIGxpa2UgdDE7CitzaG93IGNyZWF0ZSB0YWJsZSB0
MjsKK1RhYmxlCUNyZWF0ZSBUYWJsZQordDIJQ1JFQVRFIFRBQkxFIGB0MmAgKAorICBgYWAgaW50
KDExKSBOT1QgTlVMTCwKKyAgUFJJTUFSWSBLRVkgKGBhYCkKKykgRU5HSU5FPU15SVNBTSBERUZB
VUxUIENIQVJTRVQ9bGF0aW4xCitkcm9wIHRhYmxlcyB0MSwgdDI7Cgo9PT0gbW9kaWZpZWQgZmls
ZSAnbXlzcWwtdGVzdC90L3N5bWxpbmsudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L3N5bWxpbmsu
dGVzdAkyMDExLTAxLTMxIDA5OjM0OjM5ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9zeW1saW5r
LnRlc3QJMjAxMS0wNi0wOSAxMjo1NDoxMiArMDAwMApAQCAtMjc3LDMgKzI3NywyNCBAQCBTRUxF
Q1QgKiBGUk9NIG15c3FsLnVzZXI7CiAtLXJlbW92ZV9maWxlICRNWVNRTF9UTVBfRElSL215c3Fs
CiAKIC0tZWNobyBFbmQgb2YgNS4xIHRlc3RzCisKKworLS1lY2hvICMKKy0tZWNobyAjIFRlc3Qg
Zm9yIGJ1ZyAjMTE3NTk5OTAgLSAiNTIzNTQ6ICdDUkVBVEUgVEFCTEUgLi4gTElLRSAuLi4gJwor
LS1lY2hvICMgICAgICAgICAgICAgICAgICAgICAgICAgICBTVEFURU1FTlRTIEZBSUwiLgorLS1l
Y2hvICMKKy0tZGlzYWJsZV93YXJuaW5ncworZHJvcCB0YWJsZSBpZiBleGlzdHMgdDEsIHQyOwor
LS1lbmFibGVfd2FybmluZ3MKKy0tcmVwbGFjZV9yZXN1bHQgJE1ZU1FMVEVTVF9WQVJESVIgTVlT
UUxURVNUX1ZBUkRJUgorZXZhbCBjcmVhdGUgdGFibGUgdDEgKGEgaW50IHByaW1hcnkga2V5KSBl
bmdpbmU9bXlpc2FtCisgICAgICBkYXRhIGRpcmVjdG9yeT0iJE1ZU1FMVEVTVF9WQVJESVIvdG1w
IgorICAgICAgaW5kZXggZGlyZWN0b3J5PSIkTVlTUUxURVNUX1ZBUkRJUi9ydW4iOworLS1yZXBs
YWNlX3Jlc3VsdCAkTVlTUUxURVNUX1ZBUkRJUiBNWVNRTFRFU1RfVkFSRElSCitzaG93IGNyZWF0
ZSB0YWJsZSB0MTsKKy0tZWNobyAjIENSRUFURSBUQUJMRSBMSUtFIHN0YXRlbWVudCBvbiB0YWJs
ZSB3aXRoIElOREVYL0RBVEEgRElSRUNUT1JZCistLWVjaG8gIyBvcHRpb25zIHNob3VsZCBub3Qg
ZmFpbC4gUGVyIGRvY3VtZW50YXRpb24gbmV3bHkgY3JlYXRlZCB0YWJsZQorLS1lY2hvICMgc2hv
dWxkIG5vdCBpbmhlcml0IHZhbHVlIG9mIHRoZXNlIG9wdGlvbnMgZnJvbSB0aGUgb3JpZ2luYWwg
dGFibGUuCitjcmVhdGUgdGFibGUgdDIgbGlrZSB0MTsKK3Nob3cgY3JlYXRlIHRhYmxlIHQyOwor
ZHJvcCB0YWJsZXMgdDEsIHQyOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfdGFibGUuY2Mn
Ci0tLSBhL3NxbC9zcWxfdGFibGUuY2MJMjAxMS0wNi0wMSAwODowNjo1NSArMDAwMAorKysgYi9z
cWwvc3FsX3RhYmxlLmNjCTIwMTEtMDYtMDkgMTI6NTQ6MTIgKzAwMDAKQEAgLTQ1ODIsNiArNDU4
MiwxMSBAQCBib29sIG15c3FsX2NyZWF0ZV9saWtlX3RhYmxlKFRIRCogdGhkLCBUCiAgIGxvY2Fs
X2NyZWF0ZV9pbmZvLm9wdGlvbnN8PSBjcmVhdGVfaW5mby0+b3B0aW9ucyAmIEhBX0xFWF9DUkVB
VEVfVE1QX1RBQkxFOwogICAvKiBSZXNldCBhdXRvLWluY3JlbWVudCBjb3VudGVyIGZvciB0aGUg
bmV3IHRhYmxlLiAqLwogICBsb2NhbF9jcmVhdGVfaW5mby5hdXRvX2luY3JlbWVudF92YWx1ZT0g
MDsKKyAgLyoKKyAgICBEbyBub3QgaW5oZXJpdCB2YWx1ZXMgb2YgREFUQSBhbmQgSU5ERVggRElS
RUNUT1JZIG9wdGlvbnMgZnJvbQorICAgIHRoZSBvcmlnaW5hbCB0YWJsZS4gVGhpcyBpcyBkb2N1
bWVudGVkIGJlaGF2aW9yLgorICAqLworICBsb2NhbF9jcmVhdGVfaW5mby5kYXRhX2ZpbGVfbmFt
ZT0gbG9jYWxfY3JlYXRlX2luZm8uaW5kZXhfZmlsZV9uYW1lPSBOVUxMOwogCiAgIGlmICgocmVz
PSBteXNxbF9jcmVhdGVfdGFibGVfbm9fbG9jayh0aGQsIHRhYmxlLT5kYiwgdGFibGUtPnRhYmxl
X25hbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbG9jYWxfY3Jl
YXRlX2luZm8sICZsb2NhbF9hbHRlcl9pbmZvLAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3Mg
Zm9yIHB1c2ggZW1haWxzKS4=