From: Dmitry Lenev
Date: June 9 2011 1:16pm
Subject: bzr push into mysql-trunk branch (Dmitry.Lenev:3172 to 3173) Bug#11759990
List-Archive: http://lists.mysql.com/commits/138954
X-Bug: 11759990
Message-Id: <20110609131647.4A8437405D3@bandersnatch>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMxNzMgRG1pdHJ5IExlbmV2CTIwMTEtMDYtMDkgW21lcmdlXQogICAgICBNZXJnZWQgZml4IGZv
ciBidWcgIzExNzU5OTkwIC0gIjUyMzU0OiAnQ1JFQVRFIFRBQkxFCiAgICAgIC4uIExJS0UgLi4u
ICcgU1RBVEVNRU5UUyBGQUlMIiBpbnRvIG15c3FsLXRydW5rLgoKICAgIG1vZGlmaWVkOgogICAg
ICBteXNxbC10ZXN0L3Ivc3ltbGluay5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L3N5bWxpbmsu
dGVzdAogICAgICBzcWwvc3FsX3RhYmxlLmNjCiAzMTcyIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDYt
MDkgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjUgdG8gbXlzcWwtdHJ1bmsuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9yZW0wcmVjLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cuYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4
L3RyeDByZWMuYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3N5bWxpbmsucmVzdWx0
JwotLS0gYS9teXNxbC10ZXN0L3Ivc3ltbGluay5yZXN1bHQJMjAxMS0wMS0zMSAwOTozNDozOSAr
MDAwMAorKysgYi9teXNxbC10ZXN0L3Ivc3ltbGluay5yZXN1bHQJMjAxMS0wNi0wOSAxMjo1NDox
MiArMDAwMApAQCAtMTg4LDMgKzE4OCwyOCBAQCBEUk9QIFRBQkxFIHVzZXI7CiBGTFVTSCBUQUJM
RSBteXNxbC51c2VyOwogU0VMRUNUICogRlJPTSBteXNxbC51c2VyOwogRW5kIG9mIDUuMSB0ZXN0
cworIworIyBUZXN0IGZvciBidWcgIzExNzU5OTkwIC0gIjUyMzU0OiAnQ1JFQVRFIFRBQkxFIC4u
IExJS0UgLi4uICcKKyMgICAgICAgICAgICAgICAgICAgICAgICAgICBTVEFURU1FTlRTIEZBSUwi
LgorIworZHJvcCB0YWJsZSBpZiBleGlzdHMgdDEsIHQyOworY3JlYXRlIHRhYmxlIHQxIChhIGlu
dCBwcmltYXJ5IGtleSkgZW5naW5lPW15aXNhbQorZGF0YSBkaXJlY3Rvcnk9Ik1ZU1FMVEVTVF9W
QVJESVIvdG1wIgorICAgICAgaW5kZXggZGlyZWN0b3J5PSJNWVNRTFRFU1RfVkFSRElSL3J1biI7
CitzaG93IGNyZWF0ZSB0YWJsZSB0MTsKK1RhYmxlCUNyZWF0ZSBUYWJsZQordDEJQ1JFQVRFIFRB
QkxFIGB0MWAgKAorICBgYWAgaW50KDExKSBOT1QgTlVMTCwKKyAgUFJJTUFSWSBLRVkgKGBhYCkK
KykgRU5HSU5FPU15SVNBTSBERUZBVUxUIENIQVJTRVQ9bGF0aW4xIERBVEEgRElSRUNUT1JZPSdN
WVNRTFRFU1RfVkFSRElSL3RtcC8nIElOREVYIERJUkVDVE9SWT0nTVlTUUxURVNUX1ZBUkRJUi9y
dW4vJworIyBDUkVBVEUgVEFCTEUgTElLRSBzdGF0ZW1lbnQgb24gdGFibGUgd2l0aCBJTkRFWC9E
QVRBIERJUkVDVE9SWQorIyBvcHRpb25zIHNob3VsZCBub3QgZmFpbC4gUGVyIGRvY3VtZW50YXRp
b24gbmV3bHkgY3JlYXRlZCB0YWJsZQorIyBzaG91bGQgbm90IGluaGVyaXQgdmFsdWUgb2YgdGhl
c2Ugb3B0aW9ucyBmcm9tIHRoZSBvcmlnaW5hbCB0YWJsZS4KK2NyZWF0ZSB0YWJsZSB0MiBsaWtl
IHQxOworc2hvdyBjcmVhdGUgdGFibGUgdDI7CitUYWJsZQlDcmVhdGUgVGFibGUKK3QyCUNSRUFU
RSBUQUJMRSBgdDJgICgKKyAgYGFgIGludCgxMSkgTk9UIE5VTEwsCisgIFBSSU1BUlkgS0VZIChg
YWApCispIEVOR0lORT1NeUlTQU0gREVGQVVMVCBDSEFSU0VUPWxhdGluMQorZHJvcCB0YWJsZXMg
dDEsIHQyOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9zeW1saW5rLnRlc3QnCi0t
LSBhL215c3FsLXRlc3QvdC9zeW1saW5rLnRlc3QJMjAxMS0wMS0zMSAwOTozNDozOSArMDAwMAor
KysgYi9teXNxbC10ZXN0L3Qvc3ltbGluay50ZXN0CTIwMTEtMDYtMDkgMTI6NTQ6MTIgKzAwMDAK
QEAgLTI3NywzICsyNzcsMjQgQEAgU0VMRUNUICogRlJPTSBteXNxbC51c2VyOwogLS1yZW1vdmVf
ZmlsZSAkTVlTUUxfVE1QX0RJUi9teXNxbAogCiAtLWVjaG8gRW5kIG9mIDUuMSB0ZXN0cworCisK
Ky0tZWNobyAjCistLWVjaG8gIyBUZXN0IGZvciBidWcgIzExNzU5OTkwIC0gIjUyMzU0OiAnQ1JF
QVRFIFRBQkxFIC4uIExJS0UgLi4uICcKKy0tZWNobyAjICAgICAgICAgICAgICAgICAgICAgICAg
ICAgU1RBVEVNRU5UUyBGQUlMIi4KKy0tZWNobyAjCistLWRpc2FibGVfd2FybmluZ3MKK2Ryb3Ag
dGFibGUgaWYgZXhpc3RzIHQxLCB0MjsKKy0tZW5hYmxlX3dhcm5pbmdzCistLXJlcGxhY2VfcmVz
dWx0ICRNWVNRTFRFU1RfVkFSRElSIE1ZU1FMVEVTVF9WQVJESVIKK2V2YWwgY3JlYXRlIHRhYmxl
IHQxIChhIGludCBwcmltYXJ5IGtleSkgZW5naW5lPW15aXNhbQorICAgICAgZGF0YSBkaXJlY3Rv
cnk9IiRNWVNRTFRFU1RfVkFSRElSL3RtcCIKKyAgICAgIGluZGV4IGRpcmVjdG9yeT0iJE1ZU1FM
VEVTVF9WQVJESVIvcnVuIjsKKy0tcmVwbGFjZV9yZXN1bHQgJE1ZU1FMVEVTVF9WQVJESVIgTVlT
UUxURVNUX1ZBUkRJUgorc2hvdyBjcmVhdGUgdGFibGUgdDE7CistLWVjaG8gIyBDUkVBVEUgVEFC
TEUgTElLRSBzdGF0ZW1lbnQgb24gdGFibGUgd2l0aCBJTkRFWC9EQVRBIERJUkVDVE9SWQorLS1l
Y2hvICMgb3B0aW9ucyBzaG91bGQgbm90IGZhaWwuIFBlciBkb2N1bWVudGF0aW9uIG5ld2x5IGNy
ZWF0ZWQgdGFibGUKKy0tZWNobyAjIHNob3VsZCBub3QgaW5oZXJpdCB2YWx1ZSBvZiB0aGVzZSBv
cHRpb25zIGZyb20gdGhlIG9yaWdpbmFsIHRhYmxlLgorY3JlYXRlIHRhYmxlIHQyIGxpa2UgdDE7
CitzaG93IGNyZWF0ZSB0YWJsZSB0MjsKK2Ryb3AgdGFibGVzIHQxLCB0MjsKCj09PSBtb2RpZmll
ZCBmaWxlICdzcWwvc3FsX3RhYmxlLmNjJwotLS0gYS9zcWwvc3FsX3RhYmxlLmNjCTIwMTEtMDYt
MDkgMDg6NTg6NDEgKzAwMDAKKysrIGIvc3FsL3NxbF90YWJsZS5jYwkyMDExLTA2LTA5IDEzOjE1
OjI5ICswMDAwCkBAIC00Nzg2LDYgKzQ3ODYsMTEgQEAgYm9vbCBteXNxbF9jcmVhdGVfbGlrZV90
YWJsZShUSEQqIHRoZCwgVAogICBsb2NhbF9jcmVhdGVfaW5mby5vcHRpb25zfD0gY3JlYXRlX2lu
Zm8tPm9wdGlvbnMgJiBIQV9MRVhfQ1JFQVRFX1RNUF9UQUJMRTsKICAgLyogUmVzZXQgYXV0by1p
bmNyZW1lbnQgY291bnRlciBmb3IgdGhlIG5ldyB0YWJsZS4gKi8KICAgbG9jYWxfY3JlYXRlX2lu
Zm8uYXV0b19pbmNyZW1lbnRfdmFsdWU9IDA7CisgIC8qCisgICAgRG8gbm90IGluaGVyaXQgdmFs
dWVzIG9mIERBVEEgYW5kIElOREVYIERJUkVDVE9SWSBvcHRpb25zIGZyb20KKyAgICB0aGUgb3Jp
Z2luYWwgdGFibGUuIFRoaXMgaXMgZG9jdW1lbnRlZCBiZWhhdmlvci4KKyAgKi8KKyAgbG9jYWxf
Y3JlYXRlX2luZm8uZGF0YV9maWxlX25hbWU9IGxvY2FsX2NyZWF0ZV9pbmZvLmluZGV4X2ZpbGVf
bmFtZT0gTlVMTDsKIAogICBpZiAoKHJlcz0gbXlzcWxfY3JlYXRlX3RhYmxlX25vX2xvY2sodGhk
LCB0YWJsZS0+ZGIsIHRhYmxlLT50YWJsZV9uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgJmxvY2FsX2NyZWF0ZV9pbmZvLCAmbG9jYWxfYWx0ZXJfaW5mbywKCk5v
IGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku