From: Dmitry Shulga
Date: June 9 2011 5:25pm
Subject: bzr push into mysql-5.1 branch (Dmitry.Shulga:3639 to 3640) Bug#57156
 Bug#11764334
List-Archive: http://lists.mysql.com/commits/138983
X-Bug: 57156,11764334
Message-Id: <201106091725.p59HPhAc013409@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4550560203747804752=="

--===============4550560203747804752==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDM2NDAgRG1pdHJ5IFNodWxnYQkyMDExLTA2LTEwCiAgICAgIEZpeGVkIGJ1ZyMxMTc2NDMzNCAo
Zm9ybWVybHkgYnVnIzU3MTU2KTogQUxURVIgRVZFTlQgQ0hBTkdFUwogICAgICBUSEUgRVZFTlQg
U1RBVFVTLgogICAgICAKICAgICAgQW55IEFMVEVSIEVWRU5UIHN0YXRlbWVudCBvbiBhIGRpc2Fi
bGVkIGV2ZW50IGVuYWJsZWQgaXQgYmFjawogICAgICAodW5sZXNzIHRoaXMgQUxURVIgRVZFTlQg
c3RhdGVtZW50IGV4cGxpY2l0bHkgZGlzYWJsZWQgdGhlIGV2ZW50KS4KICAgICAgCiAgICAgIFRo
ZSBwcm9ibGVtIHdhcyB0aGF0IGR1cmluZyBwcm9jZXNzaW5nIG9mIGFuIEFMVEVSIEVWRU5UIHN0
YXRlbWVudAogICAgICB2YWx1ZSBvZiBzdGF0dXMgZmllbGQgd2FzIG92ZXJ3cml0dGVuIHVuY29u
ZGl0aW9uYWxseSBldmVuIGlmIG5ldwogICAgICB2YWx1ZSB3YXMgbm90IHNwZWNpZmllZCBleHBs
aWNpdGx5LiBBcyBhIGNvbnNlcXVlbmNlIHRoaXMgZmllbGQKICAgICAgd2FzIHNldCB0byBkZWZh
dWx0IHZhbHVlIGZvciBzdGF0dXMgd2hpY2ggY29ycmVzcG9uZHMgdG8gRU5BQkxFLgogICAgICAK
ICAgICAgVGhlIHNvbHV0aW9uIGlzIHRvIGNoZWNrIGlmIHN0YXR1cyBmaWVsZCB3YXMgZXhwbGlj
aXRseSBzcGVjaWZpZWQgaW4KICAgICAgQUxURVIgRVZFTlQgc3RhdGVtZW50IGJlZm9yZSBhc3Np
Z25pbmcgbmV3IHZhbHVlIHRvIHN0YXR1cyBmaWVsZC4KICAgICBAIG15c3FsLXRlc3Qvci9ldmVu
dHNfYnVncy5yZXN1bHQKICAgICAgICB0ZXN0J3MgcmVzdWx0IGZvciBCdWcjMTE3NjQzMzQgd2Fz
IGFkZGVkLgogICAgIEAgbXlzcWwtdGVzdC90L2V2ZW50c19idWdzLnRlc3QKICAgICAgICBuZXcg
dGVzdCBmb3IgQnVnIzExNzY0MzM0IHdhcyBhZGRlZC4KICAgICBAIHNxbC9ldmVudF9kYl9yZXBv
c2l0b3J5LmNjCiAgICAgICAgbXlzcWxfZXZlbnRfZmlsbF9yb3coKSB3YXMgbW9kaWZpZWQ6IHNl
dCB2YWx1ZSBmb3Igc3RhdHVzIGZpZWxkCiAgICAgICAgaW4gZXZlbnRzIHRhYmxlcyBvbmx5IGlu
IGNhc2UgaWYgc3RhdGVtZW50IENSRUFURSBFVkVOVAogICAgICAgIGlzIGJlaW5nIHByb2Nlc3Nl
ZCBvciBpZiB0aGlzIHZhbHVlIHdhcyBzZXQgaW4gQUxURVIgRVZFTlQKICAgICAgICBzdGF0ZW1l
bnQuCiAgICAgICAgRXZlbnRfZGJfcmVwb3NpdG9yeTo6Y3JlYXRlX2V2ZW50IHdhcyBtb2RpZmll
ZDogcmVtb3ZlZCByZWR1bmRhbnQKICAgICAgICBzZXR0aW5nIG9mIHN0YXR1cyBmaWVsZCBhZnRl
ciByZXR1cm4gZnJvbSBjYWxsIHRvIG15c3FsX2V2ZW50X2ZpbGxfcm93KCkuCiAgICAgQCBzcWwv
ZXZlbnRfcGFyc2VfZGF0YS5oCiAgICAgICAgRXZlbnRfcGFyc2VfZGF0YSBzdHJ1Y3R1cmUgd2Fz
IG1vZGlmaWVkOiBhZGRlZCBmbGFnCiAgICAgICAgc3RhdHVzX2NoYW5nZWQgdGhhdCBpcyBzZXQg
dG8gdHJ1ZSBpZiBzdGF0dXMncyB2YWx1ZQogICAgICAgIHdhcyBjaGFuZ2VkIGluIEFMVEVSIEVW
RU5UIHN0YXRlbWVudC4KICAgICBAIHNxbC9zcWxfeWFjYy55eQogICAgICAgIFNldCBmbGFnIHN0
YXR1c19jaGFuZ2VkIGlmIHN0YXR1cyB3YXMgc2V0IGluIEFMVEVSIEVWRU5UCiAgICAgICAgc3Rh
dGVtZW50LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvZXZlbnRzX2J1Z3MucmVz
dWx0CiAgICAgIG15c3FsLXRlc3QvdC9ldmVudHNfYnVncy50ZXN0CiAgICAgIHNxbC9ldmVudF9k
Yl9yZXBvc2l0b3J5LmNjCiAgICAgIHNxbC9ldmVudF9wYXJzZV9kYXRhLmNjCiAgICAgIHNxbC9l
dmVudF9wYXJzZV9kYXRhLmgKICAgICAgc3FsL3NxbF95YWNjLnl5CiAzNjM5IE1hcmtvIE3DpGtl
bMOkCTIwMTEtMDYtMDkKICAgICAgQkxPQiBpbnN0cnVtZW50YXRpb24gZm9yIEJ1ZyMxMjYxMjE4
NCBSYWNlIGNvbmRpdGlvbiBpbiByb3dfdXBkX2NsdXN0X3JlYygpCiAgICAgIAogICAgICBJZiBV
TklWX0RFQlVHIG9yIFVOSVZfQkxPQl9MSUdIVF9ERUJVRyBpcyBlbmFibGVkLCBhZGQKICAgICAg
IXJlY19vZmZzX2FueV9udWxsX2V4dGVybigpIGFzc2VydGlvbnMsIGVuc3VyaW5nIHRoYXQgcmVj
b3JkcyBkbyBub3QKICAgICAgY29udGFpbiBudWxsIHBvaW50ZXJzIHRvIGV4dGVybmFsbHkgc3Rv
cmVkIGNvbHVtbnMgaW4gaW5hcHByb3ByaWF0ZQogICAgICBwbGFjZXMuCiAgICAgIAogICAgICBi
dHJfY3VyX29wdGltaXN0aWNfdXBkYXRlKCk6IEFzc2VydCAhcmVjX29mZnNfYW55X251bGxfZXh0
ZXJuKCkuCiAgICAgIEluY29tcGxldGUgcmVjb3JkcyBtdXN0IG5ldmVyIGJlIHVwZGF0ZWQgb3Ig
ZGVsZXRlZC4gVGhpcyBhc3NlcnRpb24KICAgICAgd2lsbCBjb3ZlciBhbHNvIHRoZSBwZXNzaW1p
c3RpYyByb3V0ZS4KICAgICAgCiAgICAgIHJvd19idWlsZCgpOiBBc3NlcnQgIXJlY19vZmZzX2Fu
eV9udWxsX2V4dGVybigpLiBTZWFyY2ggdHVwbGVzIG11c3QKICAgICAgbmV2ZXIgYmUgYnVpbHQg
ZnJvbSBpbmNvbXBsZXRlIGluZGV4IGVudHJpZXMuCiAgICAgIAogICAgICByb3dfcmVjX3RvX2lu
ZGV4X2VudHJ5KCk6IEFzc2VydCAhcmVjX29mZnNfYW55X251bGxfZXh0ZXJuKCkgdW5sZXNzCiAg
ICAgIFJPV19DT1BZX0RBVEEgaXMgcmVxdWVzdGVkLiBST1dfQ09QWV9EQVRBIGlzIHVzZWQgZm9y
CiAgICAgIG11bHRpLXZlcnNpb25pbmcsIGFuZCB0aGVyZWZvcmUgaXQgbWlnaHQgYmUgdmFsaWQg
dG8gY29weSB0aGUgbW9zdAogICAgICByZWNlbnQgKHVuY29tbWl0dGVkKSB2ZXJzaW9uIHdoaWxl
IGl0IGNvbnRhaW5zIGEgbnVsbCBwb2ludGVyIHRvCiAgICAgIG9mZi1wYWdlIGNvbHVtbnMuCiAg
ICAgIAogICAgICByb3dfdmVyc19idWlsZF9mb3JfY29uc2lzdGVudF9yZWFkKCksCiAgICAgIHJv
d192ZXJzX2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVhZCgpOiBBc3NlcnQgIXJlY19vZmZz
X2FueV9udWxsX2V4dGVybigpCiAgICAgIG9uIGFsbCB2ZXJzaW9ucyBleGNlcHQgdGhlIG1vc3Qg
cmVjZW50IG9uZS4KICAgICAgCiAgICAgIHRyeF91bmRvX3ByZXZfdmVyc2lvbl9idWlsZCgpOiBB
c3NlcnQgIXJlY19vZmZzX2FueV9udWxsX2V4dGVybigpIG9uCiAgICAgIHRoZSBwcmV2aW91cyB2
ZXJzaW9uLgogICAgICAKICAgICAgcmI6NjgyIGFwcHJvdmVkIGJ5IFN1bm55IEJhaW5zCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHR5cGVzLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL3JlbTByZWMuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcmVtMHJlYy5p
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzByb3cuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5j
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwogICAgICBzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1
ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JlbTByZWMuaAogICAgICBz
dG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9yZW0wcmVjLmljCiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yb3cvcm93MHJvdy5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cv
cm93MHZlcnMuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDByZWMuYwo9PT0g
bW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL2V2ZW50c19idWdzLnJlc3VsdCcKLS0tIGEvbXlz
cWwtdGVzdC9yL2V2ZW50c19idWdzLnJlc3VsdAkyMDExLTA1LTI3IDA5OjIzOjA4ICswMDAwCisr
KyBiL215c3FsLXRlc3Qvci9ldmVudHNfYnVncy5yZXN1bHQJMjAxMS0wNi0wOSAxNzowMzoxNyAr
MDAwMApAQCAtNDE5LDcgKzQxOSw3IEBAIFNFVCBUSU1FX1pPTkU9ICcrMDQ6MDAnOwogQUxURVIg
RVZFTlQgZTEgRE8gU0VMRUNUIDI7CiBTSE9XIEVWRU5UUzsKIERiCU5hbWUJRGVmaW5lcglUaW1l
IHpvbmUJVHlwZQlFeGVjdXRlIGF0CUludGVydmFsIHZhbHVlCUludGVydmFsIGZpZWxkCVN0YXJ0
cwlFbmRzCVN0YXR1cwlPcmlnaW5hdG9yCWNoYXJhY3Rlcl9zZXRfY2xpZW50CWNvbGxhdGlvbl9j
b25uZWN0aW9uCURhdGFiYXNlIENvbGxhdGlvbgotZXZlbnRzX3Rlc3QJZTEJcm9vdEBsb2NhbGhv
c3QJLTAzOjAwCVJFQ1VSUklORwlOVUxMCTEJREFZCTIwMDUtMTItMzEgMjA6NTg6NTkJMjAzMC0w
MS0wMyAwMDowMDowMAlFTkFCTEVECTEJbGF0aW4xCWxhdGluMV9zd2VkaXNoX2NpCWxhdGluMV9z
d2VkaXNoX2NpCitldmVudHNfdGVzdAllMQlyb290QGxvY2FsaG9zdAktMDM6MDAJUkVDVVJSSU5H
CU5VTEwJMQlEQVkJMjAwNS0xMi0zMSAyMDo1ODo1OQkyMDMwLTAxLTAzIDAwOjAwOjAwCURJU0FC
TEVECTEJbGF0aW4xCWxhdGluMV9zd2VkaXNoX2NpCWxhdGluMV9zd2VkaXNoX2NpCiBEUk9QIEVW
RU5UIGUxOwogU0VUIFRJTUVfWk9ORT0nKzA1OjAwJzsKIENSRUFURSBFVkVOVCBlMSBPTiBTQ0hF
RFVMRSBFVkVSWSAxIERBWSBTVEFSVFMgJzIwMDYtMDEtMDEgMDA6MDA6MDAnIERPCkBAIC03OTYs
NiArNzk2LDIwIEBAIENPVU5UKCopCiBEUk9QIEVWRU5UIElGIEVYSVNUUyBldmVudF9CdWcxMjU0
NjkzODsKIERST1AgVEFCTEUgdGFibGVfYnVnMTI1NDY5Mzg7CiBTRVQgR0xPQkFMIEVWRU5UX1ND
SEVEVUxFUiA9IE9GRjsKK0RST1AgREFUQUJBU0UgSUYgRVhJU1RTIGV2ZW50X3Rlc3QxMTc2NDMz
NDsKK0NSRUFURSBEQVRBQkFTRSBldmVudF90ZXN0MTE3NjQzMzQ7CitVU0UgZXZlbnRfdGVzdDEx
NzY0MzM0OworQ1JFQVRFIEVWRU5UIGV2MSBPTiBTQ0hFRFVMRSBFVkVSWSAzIFNFQ09ORCBESVNB
QkxFIERPIFNFTEVDVCAxOworU0hPVyBFVkVOVFMgSU4gZXZlbnRfdGVzdDExNzY0MzM0IFdIRVJF
IE5BTUU9J2V2MSc7CitEYglOYW1lCURlZmluZXIJVGltZSB6b25lCVR5cGUJRXhlY3V0ZSBhdAlJ
bnRlcnZhbCB2YWx1ZQlJbnRlcnZhbCBmaWVsZAlTdGFydHMJRW5kcwlTdGF0dXMJT3JpZ2luYXRv
cgljaGFyYWN0ZXJfc2V0X2NsaWVudAljb2xsYXRpb25fY29ubmVjdGlvbglEYXRhYmFzZSBDb2xs
YXRpb24KK2V2ZW50X3Rlc3QxMTc2NDMzNAlldjEJcm9vdEBsb2NhbGhvc3QJU1lTVEVNCVJFQ1VS
UklORwlOVUxMCTMJU0VDT05ECTIwMTEtMDYtMDkgMTk6NTk6MDEJTlVMTAlESVNBQkxFRAkxCWxh
dGluMQlsYXRpbjFfc3dlZGlzaF9jaQlsYXRpbjFfc3dlZGlzaF9jaQorQUxURVIgRVZFTlQgZXYx
IE9OIFNDSEVEVUxFIEVWRVJZIDQgU0VDT05EOworU0hPVyBFVkVOVFMgSU4gZXZlbnRfdGVzdDEx
NzY0MzM0IFdIRVJFIE5BTUU9J2V2MSc7CitEYglOYW1lCURlZmluZXIJVGltZSB6b25lCVR5cGUJ
RXhlY3V0ZSBhdAlJbnRlcnZhbCB2YWx1ZQlJbnRlcnZhbCBmaWVsZAlTdGFydHMJRW5kcwlTdGF0
dXMJT3JpZ2luYXRvcgljaGFyYWN0ZXJfc2V0X2NsaWVudAljb2xsYXRpb25fY29ubmVjdGlvbglE
YXRhYmFzZSBDb2xsYXRpb24KK2V2ZW50X3Rlc3QxMTc2NDMzNAlldjEJcm9vdEBsb2NhbGhvc3QJ
U1lTVEVNCVJFQ1VSUklORwlOVUxMCTQJU0VDT05ECTIwMTEtMDYtMDkgMTk6NTk6MDEJTlVMTAlE
SVNBQkxFRAkxCWxhdGluMQlsYXRpbjFfc3dlZGlzaF9jaQlsYXRpbjFfc3dlZGlzaF9jaQorRFJP
UCBFVkVOVCBldjE7CitEUk9QIERBVEFCQVNFIGV2ZW50X3Rlc3QxMTc2NDMzNDsKK1VTRSB0ZXN0
OwogRFJPUCBEQVRBQkFTRSBldmVudHNfdGVzdDsKIFNFVCBHTE9CQUwgZXZlbnRfc2NoZWR1bGVy
PSAnT04nOwogU0VUIEBAZ2xvYmFsLmNvbmN1cnJlbnRfaW5zZXJ0PSBAY29uY3VycmVudF9pbnNl
cnQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC90L2V2ZW50c19idWdzLnRlc3QnCi0t
LSBhL215c3FsLXRlc3QvdC9ldmVudHNfYnVncy50ZXN0CTIwMTEtMDUtMjcgMDk6MjM6MDggKzAw
MDAKKysrIGIvbXlzcWwtdGVzdC90L2V2ZW50c19idWdzLnRlc3QJMjAxMS0wNi0wOSAxNzowMzox
NyArMDAwMApAQCAtMTI4Niw2ICsxMjg2LDIxIEBAIERST1AgRVZFTlQgSUYgRVhJU1RTIGV2ZW50
X0J1ZzEyNTQ2OTM4OwogRFJPUCBUQUJMRSB0YWJsZV9idWcxMjU0NjkzODsKIFNFVCBHTE9CQUwg
RVZFTlRfU0NIRURVTEVSID0gT0ZGOwogCisjCisjIEJ1ZyMxMTc2NDMzNCAtIDU3MTU2OiBBTFRF
UiBFVkVOVCBDSEFOR0VTIFRIRSBFVkVOVCBTVEFUVVMKKyMKKy0tZGlzYWJsZV93YXJuaW5ncwor
RFJPUCBEQVRBQkFTRSBJRiBFWElTVFMgZXZlbnRfdGVzdDExNzY0MzM0OworLS1lbmFibGVfd2Fy
bmluZ3MKK0NSRUFURSBEQVRBQkFTRSBldmVudF90ZXN0MTE3NjQzMzQ7CitVU0UgZXZlbnRfdGVz
dDExNzY0MzM0OworQ1JFQVRFIEVWRU5UIGV2MSBPTiBTQ0hFRFVMRSBFVkVSWSAzIFNFQ09ORCBE
SVNBQkxFIERPIFNFTEVDVCAxOworU0hPVyBFVkVOVFMgSU4gZXZlbnRfdGVzdDExNzY0MzM0IFdI
RVJFIE5BTUU9J2V2MSc7CitBTFRFUiBFVkVOVCBldjEgT04gU0NIRURVTEUgRVZFUlkgNCBTRUNP
TkQ7CitTSE9XIEVWRU5UUyBJTiBldmVudF90ZXN0MTE3NjQzMzQgV0hFUkUgTkFNRT0nZXYxJzsK
K0RST1AgRVZFTlQgZXYxOworRFJPUCBEQVRBQkFTRSBldmVudF90ZXN0MTE3NjQzMzQ7CitVU0Ug
dGVzdDsgCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKICMKICMgRW5kIG9mIHRlc3RzCgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3FsL2V2ZW50X2RiX3JlcG9zaXRvcnkuY2MnCi0tLSBhL3NxbC9ldmVudF9kYl9y
ZXBvc2l0b3J5LmNjCTIwMTEtMDUtMjcgMDk6MjM6MDggKzAwMDAKKysrIGIvc3FsL2V2ZW50X2Ri
X3JlcG9zaXRvcnkuY2MJMjAxMS0wNi0wOSAxNzowMzoxNyArMDAwMApAQCAtMjI2LDkgKzIyNiwx
NiBAQCBteXNxbF9ldmVudF9maWxsX3JvdyhUSEQgKnRoZCwKICAgaWYgKGZpZWxkc1tmX251bT0g
RVRfRklFTERfTkFNRV0tPnN0b3JlKGV0LT5uYW1lLnN0ciwgZXQtPm5hbWUubGVuZ3RoLCBzY3Mp
KQogICAgIGdvdG8gZXJyX3RydW5jYXRlOwogCi0gIC8qIGJvdGggT05fQ09NUExFVElPTiBhbmQg
U1RBVFVTIGFyZSBOT1QgTlVMTCB0aHVzIG5vdCBjYWxsaW5nIHNldF9ub3RudWxsKCkqLworICAv
KiBPTl9DT01QTEVUSU9OIGZpZWxkIGlzIE5PVCBOVUxMIHRodXMgbm90IGNhbGxpbmcgc2V0X25v
dG51bGwoKSovCiAgIHJzfD0gZmllbGRzW0VUX0ZJRUxEX09OX0NPTVBMRVRJT05dLT5zdG9yZSgo
bG9uZ2xvbmcpZXQtPm9uX2NvbXBsZXRpb24sIFRSVUUpOwotICByc3w9IGZpZWxkc1tFVF9GSUVM
RF9TVEFUVVNdLT5zdG9yZSgobG9uZ2xvbmcpZXQtPnN0YXR1cywgVFJVRSk7CisKKyAgLyoKKyAg
ICBTZXQgU1RBVFVTIHZhbHVlIHVuY29uZGl0aW9uYWxseSBpbiBjYXNlIG9mIENSRUFURSBFVkVO
VC4KKyAgICBGb3IgQUxURVIgRVZFTlQgc2V0IGl0IG9ubHkgaWYgdmFsdWUgb2YgdGhpcyBmaWVs
ZCB3YXMgY2hhbmdlZC4KKyAgICBTaW5jZSBTVEFUVVMgZmllbGQgaXMgTk9UIE5VTEwgY2FsbCB0
byBzZXRfbm90bnVsbCgpIGlzIG5vdCBuZWVkZWQuCisgICovCisgIGlmICghaXNfdXBkYXRlIHx8
IGV0LT5zdGF0dXNfY2hhbmdlZCkKKyAgICByc3w9IGZpZWxkc1tFVF9GSUVMRF9TVEFUVVNdLT5z
dG9yZSgobG9uZ2xvbmcpZXQtPnN0YXR1cywgVFJVRSk7CiAgIHJzfD0gZmllbGRzW0VUX0ZJRUxE
X09SSUdJTkFUT1JdLT5zdG9yZSgobG9uZ2xvbmcpZXQtPm9yaWdpbmF0b3IsIFRSVUUpOwogCiAg
IC8qCkBAIC02OTQsOCArNzAxLDYgQEAgRXZlbnRfZGJfcmVwb3NpdG9yeTo6Y3JlYXRlX2V2ZW50
KFRIRCAqdAogICBpZiAobXlzcWxfZXZlbnRfZmlsbF9yb3codGhkLCB0YWJsZSwgcGFyc2VfZGF0
YSwgc3AsIHNhdmVkX21vZGUsIEZBTFNFKSkKICAgICBnb3RvIGVuZDsKIAotICB0YWJsZS0+Zmll
bGRbRVRfRklFTERfU1RBVFVTXS0+c3RvcmUoKGxvbmdsb25nKXBhcnNlX2RhdGEtPnN0YXR1cywg
VFJVRSk7Ci0KICAgaWYgKChyZXQ9IHRhYmxlLT5maWxlLT5oYV93cml0ZV9yb3codGFibGUtPnJl
Y29yZFswXSkpKQogICB7CiAgICAgdGFibGUtPmZpbGUtPnByaW50X2Vycm9yKHJldCwgTVlGKDAp
KTsKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvZXZlbnRfcGFyc2VfZGF0YS5jYycKLS0tIGEvc3Fs
L2V2ZW50X3BhcnNlX2RhdGEuY2MJMjAwOS0wMi0xMyAxNjo0MTo0NyArMDAwMAorKysgYi9zcWwv
ZXZlbnRfcGFyc2VfZGF0YS5jYwkyMDExLTA2LTA5IDE3OjAzOjE3ICswMDAwCkBAIC00Niw5ICs0
Niw4IEBAIEV2ZW50X3BhcnNlX2RhdGE6Om5ld19pbnN0YW5jZShUSEQgKnRoZCkKIAogRXZlbnRf
cGFyc2VfZGF0YTo6RXZlbnRfcGFyc2VfZGF0YSgpCiAgIDpvbl9jb21wbGV0aW9uKEV2ZW50X3Bh
cnNlX2RhdGE6Ok9OX0NPTVBMRVRJT05fREVGQVVMVCksCi0gIHN0YXR1cyhFdmVudF9wYXJzZV9k
YXRhOjpFTkFCTEVEKSwKLSAgZG9fbm90X2NyZWF0ZShGQUxTRSksCi0gIGJvZHlfY2hhbmdlZChG
QUxTRSksCisgIHN0YXR1cyhFdmVudF9wYXJzZV9kYXRhOjpFTkFCTEVEKSwgc3RhdHVzX2NoYW5n
ZWQoZmFsc2UpLAorICBkb19ub3RfY3JlYXRlKEZBTFNFKSwgYm9keV9jaGFuZ2VkKEZBTFNFKSwK
ICAgaXRlbV9zdGFydHMoTlVMTCksIGl0ZW1fZW5kcyhOVUxMKSwgaXRlbV9leGVjdXRlX2F0KE5V
TEwpLAogICBzdGFydHNfbnVsbChUUlVFKSwgZW5kc19udWxsKFRSVUUpLCBleGVjdXRlX2F0X251
bGwoVFJVRSksCiAgIGl0ZW1fZXhwcmVzc2lvbihOVUxMKSwgZXhwcmVzc2lvbigwKQpAQCAtMTQw
LDYgKzEzOSw3IEBAIEV2ZW50X3BhcnNlX2RhdGE6OmNoZWNrX2lmX2luX3RoZV9wYXN0KFQKICAg
ZWxzZSBpZiAoc3RhdHVzID09IEV2ZW50X3BhcnNlX2RhdGE6OkVOQUJMRUQpCiAgIHsKICAgICBz
dGF0dXM9IEV2ZW50X3BhcnNlX2RhdGE6OkRJU0FCTEVEOworICAgIHN0YXR1c19jaGFuZ2VkPSB0
cnVlOwogICAgIHB1c2hfd2FybmluZyh0aGQsIE1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX05PVEUs
CiAgICAgICAgICAgICAgICAgIEVSX0VWRU5UX0VYRUNfVElNRV9JTl9USEVfUEFTVCwKICAgICAg
ICAgICAgICAgICAgRVIoRVJfRVZFTlRfRVhFQ19USU1FX0lOX1RIRV9QQVNUKSk7CkBAIC01Njks
NyArNTY5LDEwIEBAIHZvaWQgRXZlbnRfcGFyc2VfZGF0YTo6Y2hlY2tfb3JpZ2luYXRvcl8KICAg
ICBEQlVHX1BSSU5UKCJpbmZvIiwgKCJJbnZva2VkIG9iamVjdCBzdGF0dXMgc2V0IHRvIFNMQVZF
U0lERV9ESVNBQkxFRC4iKSk7CiAgICAgaWYgKChzdGF0dXMgPT0gRXZlbnRfcGFyc2VfZGF0YTo6
RU5BQkxFRCkgfHwKICAgICAgICAgKHN0YXR1cyA9PSBFdmVudF9wYXJzZV9kYXRhOjpESVNBQkxF
RCkpCi0gICAgICBzdGF0dXMgPSBFdmVudF9wYXJzZV9kYXRhOjpTTEFWRVNJREVfRElTQUJMRUQ7
CisgICAgeworICAgICAgc3RhdHVzPSBFdmVudF9wYXJzZV9kYXRhOjpTTEFWRVNJREVfRElTQUJM
RUQ7CisgICAgICBzdGF0dXNfY2hhbmdlZD0gdHJ1ZTsKKyAgICB9CiAgICAgb3JpZ2luYXRvciA9
IHRoZC0+c2VydmVyX2lkOwogICB9CiAgIGVsc2UKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvZXZl
bnRfcGFyc2VfZGF0YS5oJwotLS0gYS9zcWwvZXZlbnRfcGFyc2VfZGF0YS5oCTIwMDgtMTEtMTAg
MjA6MjE6NDkgKzAwMDAKKysrIGIvc3FsL2V2ZW50X3BhcnNlX2RhdGEuaAkyMDExLTA2LTA5IDE3
OjAzOjE3ICswMDAwCkBAIC00OSw2ICs0OSw3IEBAIHB1YmxpYzoKIAogICBpbnQgb25fY29tcGxl
dGlvbjsKICAgaW50IHN0YXR1czsKKyAgYm9vbCBzdGF0dXNfY2hhbmdlZDsKICAgbG9uZ2xvbmcg
b3JpZ2luYXRvcjsKICAgLyoKICAgICBkb19ub3RfY3JlYXRlIHdpbGwgYmUgc2V0IGlmIFNUQVJU
UyB0aW1lIGlzIGluIHRoZSBwYXN0IGFuZAoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfeWFj
Yy55eScKLS0tIGEvc3FsL3NxbF95YWNjLnl5CTIwMTAtMTAtMTMgMDU6Mjg6NTggKzAwMDAKKysr
IGIvc3FsL3NxbF95YWNjLnl5CTIwMTEtMDYtMDkgMTc6MDM6MTcgKzAwMDAKQEAgLTIwMjQsMTYg
KzIwMjQsMTkgQEAgb3B0X2V2X3N0YXR1czoKICAgICAgICAgfCBFTkFCTEVfU1lNCiAgICAgICAg
ICAgewogICAgICAgICAgICAgTGV4LT5ldmVudF9wYXJzZV9kYXRhLT5zdGF0dXM9IEV2ZW50X3Bh
cnNlX2RhdGE6OkVOQUJMRUQ7CisgICAgICAgICAgICBMZXgtPmV2ZW50X3BhcnNlX2RhdGEtPnN0
YXR1c19jaGFuZ2VkPSB0cnVlOwogICAgICAgICAgICAgJCQ9IDE7CiAgICAgICAgICAgfQogICAg
ICAgICB8IERJU0FCTEVfU1lNIE9OIFNMQVZFCiAgICAgICAgICAgewogICAgICAgICAgICAgTGV4
LT5ldmVudF9wYXJzZV9kYXRhLT5zdGF0dXM9IEV2ZW50X3BhcnNlX2RhdGE6OlNMQVZFU0lERV9E
SVNBQkxFRDsKKyAgICAgICAgICAgIExleC0+ZXZlbnRfcGFyc2VfZGF0YS0+c3RhdHVzX2NoYW5n
ZWQ9IHRydWU7IAogICAgICAgICAgICAgJCQ9IDE7CiAgICAgICAgICAgfQogICAgICAgICB8IERJ
U0FCTEVfU1lNCiAgICAgICAgICAgewogICAgICAgICAgICAgTGV4LT5ldmVudF9wYXJzZV9kYXRh
LT5zdGF0dXM9IEV2ZW50X3BhcnNlX2RhdGE6OkRJU0FCTEVEOworICAgICAgICAgICAgTGV4LT5l
dmVudF9wYXJzZV9kYXRhLT5zdGF0dXNfY2hhbmdlZD0gdHJ1ZTsKICAgICAgICAgICAgICQkPSAx
OwogICAgICAgICAgIH0KICAgICAgICAgOwoK

--===============4550560203747804752==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   u4v9mvdajfyr2y91
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug11764334/
# testament_sha1: 8ed37d5f0d30ed7206b1c0af55870efe7faf04c9
# timestamp: 2011-06-10 00:25:37 +0700
# base_revision_id: marko.makela@stripped\
#   rhfwxtmyedcp5il6
# 
# Begin bundle
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
/vU+D/i7kinChICQS0P4


--===============4550560203747804752==--