From: magnus.blaudd
Date: May 18 2011 1:03pm
Subject: [Resend] bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4207)
 Bug#11885602
List-Archive: http://lists.mysql.com/commits/137638
X-Bug: 11885602
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4797546877672493495=="

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

W1RoaXMgY29tbWl0IGUtbWFpbCBpcyBhIHJlcGVhdC5dCgojQXQgZmlsZTovLy9ob21lL21zdmVu
c3Nvbi9teXNxbC9idWcxMTg4NTYwMi83LjEvIGJhc2VkIG9uIHJldmlkOmpvbmFzQG15c3FsLmNv
bS0yMDExMDUxODA2MDY0OS1oZXNjeTVkeGNyNG44bnpsCgogNDIwNyBNYWdudXMgQmzDpXVkZAky
MDExLTA1LTE4CiAgICAgIEJ1ZyMxMTg4NTYwMiAtIG15c3FsX3VwZ3JhZGUgZmFpbHMgdXBncmFk
aW5nIGZyb20gNy4xLjggdG8gbGF0ZXIgcmVsZWFzZQogICAgICAgLSBJdCB3YXMgYWxsb3dlZCB0
byBDUkVBVEUgVEFCTEUgd2hpY2ggd2FzIG5vdCBpbiBOREIsIGJ1dAogICAgICAgICBjcmVhdGlu
ZyBhIHZpZXcgb24gdGhhdCB0YWJsZSBmYWlsZWQuIEltcGxlbWVudCBuZGJpbmZvX29mZmxpbmUK
ICAgICAgICAgbW9kZSB3aGljaCBhbGxvd3MgdGFibGVzIHRvIGJlIGNyZWF0ZWQgYW5kIG9wZW5l
ZCBhbHRob3VnaCB0aGV5CiAgICAgICAgIGRvbid0IGV4aXN0cyBvciBoYXZlIGRpZmZlcmVudCB0
YWJsZSBkZWZpbml0aW9uLgogICAgICAgICBUaGlzIGlzIGV4YWN0bHkgdGhlIHNhbWUgYmVoYXZp
b3VyIGFzIHdoZW4gTkRCQ0xVU1RFUgogICAgICAgICBpcyBkaXNhYmxlZC4KICAgICAgICBTRUxF
Q1RzIG9uIGEgdGFibGUgd2hpY2ggaGFzZCBiZWVuIG9wZW5lZCBpbiBvZmZsaW5lIG1vZGUsIHJl
dHVybiBubwogICAgICAgIHJvd3MgYW5kIGEgd2FybmluZyBpcyBwcmludGVkKGxpa2UgYmVmb3Jl
KS4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9uZGIvci9uZGJpbmZvLnJl
c3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL25kYi90L25kYmluZm8udGVzdAogICAgICBzY3Jp
cHRzL215c3FsX3N5c3RlbV90YWJsZXMuc3FsCiAgICAgIHNxbC9oYV9uZGJpbmZvLmNjCiAgICAg
IHNxbC9oYV9uZGJpbmZvLmgKICAgICAgc3RvcmFnZS9uZGIvdG9vbHMvbmRiaW5mb19zcWwuY3Bw
Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL25kYi9yL25kYmluZm8ucmVzdWx0
JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL25kYi9yL25kYmluZm8ucmVzdWx0CTIwMTAtMTEtMDMg
MDk6NDk6MzkgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9uZGIvci9uZGJpbmZvLnJlc3Vs
dAkyMDExLTA1LTE4IDEyOjM3OjA2ICswMDAwCkBAIC0xMzUsNiArMTM1LDcgQEAgVmFyaWFibGVf
bmFtZQlWYWx1ZQogbmRiaW5mb19kYXRhYmFzZQluZGJpbmZvCiBuZGJpbmZvX21heF9ieXRlcwkw
CiBuZGJpbmZvX21heF9yb3dzCTEwCituZGJpbmZvX29mZmxpbmUJT0ZGCiBuZGJpbmZvX3Nob3df
aGlkZGVuCU9GRgogbmRiaW5mb190YWJsZV9wcmVmaXgJbmRiJAogbmRiaW5mb192ZXJzaW9uCU5E
Ql9WRVJTSU9OX0QKQEAgLTIzNiw0ICsyMzcsNTYgQEAgZnJvbSBuZGJpbmZvLmRpc2twYWdlYnVm
ZmVyOwogbm9kZV9pZAogMQogMgorCitzZXQgQEBuZGJpbmZvX29mZmxpbmU9MTsKK0VSUk9SIEhZ
MDAwOiBWYXJpYWJsZSAnbmRiaW5mb19vZmZsaW5lJyBpcyBhIEdMT0JBTCB2YXJpYWJsZSBhbmQg
c2hvdWxkIGJlIHNldCB3aXRoIFNFVCBHTE9CQUwKKworU0VMRUNUIERJU1RJTkNUKG5vZGVfaWQp
IEZST00gbmRiaW5mby5jb3VudGVycyBPUkRFUiBCWSBub2RlX2lkOworbm9kZV9pZAorMQorMgor
CitzZXQgQEBnbG9iYWwubmRiaW5mb19vZmZsaW5lPVRSVUU7CitzZWxlY3QgQEBuZGJpbmZvX29m
ZmxpbmU7CitAQG5kYmluZm9fb2ZmbGluZQorMQorCitDUkVBVEUgVEFCTEUgbmRiJGRvZXNfbm90
X2V4aXN0X2luX25kYigKKyAgbm9kZV9pZCBpbnQsCisgIG1lc3NhZ2UgdmFyY2hhcigyNTUpCisp
IEVOR0lORSA9IG5kYmluZm87CisKK0NSRUFURSBWSUVXIHZpZXdfb25fdGFibGVfd2hpY2hfZG9l
c19ub3RfZXhpc3RfaW5fbmRiIEFTCisgIFNFTEVDVCBub2RlX2lkLCBtZXNzYWdlCisgIEZST00g
bmRiaW5mby5uZGIkZG9lc19ub3RfZXhpc3RfaW5fbmRiOworCitTSE9XIENSRUFURSBUQUJMRSBu
ZGIkZG9lc19ub3RfZXhpc3RfaW5fbmRiOworVGFibGUJQ3JlYXRlIFRhYmxlCituZGIkZG9lc19u
b3RfZXhpc3RfaW5fbmRiCUNSRUFURSBUQUJMRSBgbmRiJGRvZXNfbm90X2V4aXN0X2luX25kYmAg
KAorICBgbm9kZV9pZGAgaW50KDExKSBERUZBVUxUIE5VTEwsCisgIGBtZXNzYWdlYCB2YXJjaGFy
KDI1NSkgREVGQVVMVCBOVUxMCispIEVOR0lORT1OREJJTkZPIERFRkFVTFQgQ0hBUlNFVD1sYXRp
bjEKKworU0VMRUNUICogRlJPTSB2aWV3X29uX3RhYmxlX3doaWNoX2RvZXNfbm90X2V4aXN0X2lu
X25kYjsKK25vZGVfaWQJbWVzc2FnZQorV2FybmluZ3M6CitOb3RlCTEJJ05EQklORk8nIGhhcyBi
ZWVuIHN0YXJ0ZWQgaW4gb2ZmbGluZSBtb2RlIHNpbmNlIHRoZSAnTkRCQ0xVU1RFUicgZW5naW5l
IGlzIGRpc2FibGVkIG9yIEBAZ2xvYmFsLm5kYmluZm9fb2ZmbGluZSBpcyB0dXJuZWQgb24gLSBu
byByb3dzIGNhbiBiZSByZXR1cm5lZAorU0VMRUNUICogRlJPTSBuZGIkZG9lc19ub3RfZXhpc3Rf
aW5fbmRiOworbm9kZV9pZAltZXNzYWdlCitXYXJuaW5nczoKK05vdGUJMQknTkRCSU5GTycgaGFz
IGJlZW4gc3RhcnRlZCBpbiBvZmZsaW5lIG1vZGUgc2luY2UgdGhlICdOREJDTFVTVEVSJyBlbmdp
bmUgaXMgZGlzYWJsZWQgb3IgQEBnbG9iYWwubmRiaW5mb19vZmZsaW5lIGlzIHR1cm5lZCBvbiAt
IG5vIHJvd3MgY2FuIGJlIHJldHVybmVkCitTRUxFQ1QgRElTVElOQ1Qobm9kZV9pZCkgRlJPTSBu
ZGJpbmZvLmNvdW50ZXJzIE9SREVSIEJZIG5vZGVfaWQ7Citub2RlX2lkCitXYXJuaW5nczoKK05v
dGUJMQknTkRCSU5GTycgaGFzIGJlZW4gc3RhcnRlZCBpbiBvZmZsaW5lIG1vZGUgc2luY2UgdGhl
ICdOREJDTFVTVEVSJyBlbmdpbmUgaXMgZGlzYWJsZWQgb3IgQEBnbG9iYWwubmRiaW5mb19vZmZs
aW5lIGlzIHR1cm5lZCBvbiAtIG5vIHJvd3MgY2FuIGJlIHJldHVybmVkCisKK0RST1AgVklFVyB2
aWV3X29uX3RhYmxlX3doaWNoX2RvZXNfbm90X2V4aXN0X2luX25kYjsKK0RST1AgVEFCTEUgbmRi
JGRvZXNfbm90X2V4aXN0X2luX25kYjsKKworc2V0IEBAZ2xvYmFsLm5kYmluZm9fb2ZmbGluZSA9
IEZBTFNFOworCitTRUxFQ1QgRElTVElOQ1Qobm9kZV9pZCkgRlJPTSBuZGJpbmZvLmNvdW50ZXJz
IE9SREVSIEJZIG5vZGVfaWQ7Citub2RlX2lkCisxCisyCiAKCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL25kYi90L25kYmluZm8udGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0
ZS9uZGIvdC9uZGJpbmZvLnRlc3QJMjAxMC0xMS0wMyAwOTo0OTozOSArMDAwMAorKysgYi9teXNx
bC10ZXN0L3N1aXRlL25kYi90L25kYmluZm8udGVzdAkyMDExLTA1LTE4IDEyOjM3OjA2ICswMDAw
CkBAIC0xNDgsNCArMTQ4LDUyIEBAIENSRUFURSBUQUJMRSBuZGIkdGVzdCAobm9kZV9pZCBpbnQg
QVVUT18KIHNlbGVjdCBkaXN0aW5jdCBub2RlX2lkCiBmcm9tIG5kYmluZm8uZGlza3BhZ2VidWZm
ZXI7CiAKKworIworIyBCVUcjMTE4ODU2MDIKKyMgLSBJdCB3YXMgYWxsb3dlZCB0byBDUkVBVEUg
VEFCTEUgd2hpY2ggd2FzIG5vdCBpbiBOREIsIGJ1dAorIyAgIGNyZWF0aW5nIGEgdmlldyBvbiB0
aGF0IHRhYmxlIGZhaWxlZC4gSW1wbGVtZW50IG5kYmluZm9fb2ZmbGluZQorIyAgIG1vZGUgd2hp
Y2ggYWxsb3dzIHRhYmxlcyB0byBiZSBjcmVhdGVkIGFuZCBvcGVuZWQgYWx0aG91Z2ggdGhleQor
IyAgIGRvbid0IGV4aXN0cyBvciBoYXZlIGRpZmZlcmVudCB0YWJsZSBkZWZpbml0aW9uLgorIyAg
IFRoaXMgaXMgZXhhY3RseSB0aGUgc2FtZSBiZWhhdmlvdXIgYXMgd2hlbiBOREJDTFVTVEVSCisj
ICAgaXMgZGlzYWJsZWQKKyMKKworIyBDaGVjayBuZGJpbmZvX29mZmxpbmUgaXMgR0xPQkFMIHZh
cmlhYmxlCistLWVycm9yIEVSX0dMT0JBTF9WQVJJQUJMRQorc2V0IEBAbmRiaW5mb19vZmZsaW5l
PTE7CisKKyMgUXVlcnkgdXNlZCB0byBjaGVjayB0aGF0IG9wZW4gdGFibGVzIGFyZSBjbG9zZWQK
KyMgd2hlbiBvZmZsaW5lIG1vZGUgaXMgdHVybmVkIG9uIGFuZCBvZmYKK2xldCAkcTEgPSBTRUxF
Q1QgRElTVElOQ1Qobm9kZV9pZCkgRlJPTSBuZGJpbmZvLmNvdW50ZXJzIE9SREVSIEJZIG5vZGVf
aWQ7CitldmFsICRxMTsKKworIyBUdXJuIG9uIG5kYmluZm9fb2ZmbGluZQorc2V0IEBAZ2xvYmFs
Lm5kYmluZm9fb2ZmbGluZT1UUlVFOworc2VsZWN0IEBAbmRiaW5mb19vZmZsaW5lOworCitDUkVB
VEUgVEFCTEUgbmRiJGRvZXNfbm90X2V4aXN0X2luX25kYigKKyAgbm9kZV9pZCBpbnQsCisgIG1l
c3NhZ2UgdmFyY2hhcigyNTUpCispIEVOR0lORSA9IG5kYmluZm87CisKK0NSRUFURSBWSUVXIHZp
ZXdfb25fdGFibGVfd2hpY2hfZG9lc19ub3RfZXhpc3RfaW5fbmRiIEFTCisgIFNFTEVDVCBub2Rl
X2lkLCBtZXNzYWdlCisgIEZST00gbmRiaW5mby5uZGIkZG9lc19ub3RfZXhpc3RfaW5fbmRiOwor
CitTSE9XIENSRUFURSBUQUJMRSBuZGIkZG9lc19ub3RfZXhpc3RfaW5fbmRiOworCisjIFNFTEVD
VHMgcmV0dXJuIG5vIHJvd3MgaW4gb2ZmbGluZSBtb2RlCitTRUxFQ1QgKiBGUk9NIHZpZXdfb25f
dGFibGVfd2hpY2hfZG9lc19ub3RfZXhpc3RfaW5fbmRiOworU0VMRUNUICogRlJPTSBuZGIkZG9l
c19ub3RfZXhpc3RfaW5fbmRiOworZXZhbCAkcTE7CisKK0RST1AgVklFVyB2aWV3X29uX3RhYmxl
X3doaWNoX2RvZXNfbm90X2V4aXN0X2luX25kYjsKK0RST1AgVEFCTEUgbmRiJGRvZXNfbm90X2V4
aXN0X2luX25kYjsKKworIyBSZXN0b3JlIG9yaWdpbmFsIHZhbHVlCitzZXQgQEBnbG9iYWwubmRi
aW5mb19vZmZsaW5lID0gRkFMU0U7CisKK2V2YWwgJHExOworCiAtLXNvdXJjZSBuZGJpbmZvX2Ry
b3AuaW5jCgo9PT0gbW9kaWZpZWQgZmlsZSAnc2NyaXB0cy9teXNxbF9zeXN0ZW1fdGFibGVzLnNx
bCcKLS0tIGEvc2NyaXB0cy9teXNxbF9zeXN0ZW1fdGFibGVzLnNxbAkyMDExLTA0LTEyIDE1OjAx
OjQ4ICswMDAwCisrKyBiL3NjcmlwdHMvbXlzcWxfc3lzdGVtX3RhYmxlcy5zcWwJMjAxMS0wNS0x
OCAxMjozNzowNiArMDAwMApAQCAtMTM1LDYgKzEzNSwxNCBAQCBQUkVQQVJFIHN0bXQgRlJPTSBA
c3RyOwogRVhFQ1VURSBzdG10OwogRFJPUCBQUkVQQVJFIHN0bXQ7CiAKKyMgU2V0IE5EQklORk8g
aW4gb2ZmbGluZSBtb2RlIGR1cmluZyAocmUpY3JlYXRlIG9mIHRhYmxlcworIyBhbmQgdmlld3Mg
dG8gYXZvaWQgZXJyb3JzIGNhdXNlZCBieSBubyBzdWNoIHRhYmxlIG9yCisjIGRpZmZlcmVudCB0
YWJsZSBkZWZpbml0aW9uIGluIE5EQgorU0VUIEBzdHI9SUYoQGhhdmVfbmRiaW5mbywnU0VUIEBA
Z2xvYmFsLm5kYmluZm9fb2ZmbGluZT1UUlVFJywnU0VUIEBkdW1teSA9IDAnKTsKK1BSRVBBUkUg
c3RtdCBGUk9NIEBzdHI7CitFWEVDVVRFIHN0bXQ7CitEUk9QIFBSRVBBUkUgc3RtdDsKKwogIyBE
cm9wIGFueSBvbGQgdmlld3MgaW4gbmRiaW5mbwogU0VUIEBzdHI9SUYoQGhhdmVfbmRiaW5mbywn
RFJPUCBWSUVXIElGIEVYSVNUUyBuZGJpbmZvLnRyYW5zcG9ydGVycycsJ1NFVCBAZHVtbXkgPSAw
Jyk7CiBQUkVQQVJFIHN0bXQgRlJPTSBAc3RyOwpAQCAtMzc3LDMgKzM4NSw5IEBAIFNFVCBAc3Ry
PUlGKEBoYXZlX25kYmluZm8sJ0NSRUFURSBPUiBSRVAKIFBSRVBBUkUgc3RtdCBGUk9NIEBzdHI7
CiBFWEVDVVRFIHN0bXQ7CiBEUk9QIFBSRVBBUkUgc3RtdDsKKworIyBGaW5hbGx5IHR1cm4gb2Zm
IG9mZmxpbmUgbW9kZQorU0VUIEBzdHI9SUYoQGhhdmVfbmRiaW5mbywnU0VUIEBAZ2xvYmFsLm5k
YmluZm9fb2ZmbGluZT1GQUxTRScsJ1NFVCBAZHVtbXkgPSAwJyk7CitQUkVQQVJFIHN0bXQgRlJP
TSBAc3RyOworRVhFQ1VURSBzdG10OworRFJPUCBQUkVQQVJFIHN0bXQ7Cgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3FsL2hhX25kYmluZm8uY2MnCi0tLSBhL3NxbC9oYV9uZGJpbmZvLmNjCTIwMTAtMTEt
MTAgMTQ6MTc6MTMgKzAwMDAKKysrIGIvc3FsL2hhX25kYmluZm8uY2MJMjAxMS0wNS0xOCAxMjoz
NzowNiArMDAwMApAQCAtOTIsNiArOTIsNDUgQEAgc3RhdGljIE1ZU1FMX1NZU1ZBUl9VSU5UKAog
ICAwICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogYmxvY2sgKi8KICk7CiAKK3N0
YXRpYyBteV9ib29sIG9wdF9vZmZsaW5lOworCitzdGF0aWMKK3ZvaWQKK25kYmluZm9fb2ZmbGlu
ZV91cGRhdGUoVEhEKiB0aGQsIHN0cnVjdCBzdF9teXNxbF9zeXNfdmFyKiB2YXIsCisgICAgICAg
ICAgICAgICAgICAgdm9pZCogdmFyX3B0ciwgY29uc3Qgdm9pZCogc2F2ZSkKK3sKKyAgREJVR19F
TlRFUigibmRiaW5mb19vZmZsaW5lX3VwZGF0ZSIpOworCisgIGNvbnN0IG15X2Jvb2wgbmV3X29m
ZmxpbmUgPQorICAgICgqKHN0YXRpY19jYXN0PGNvbnN0IG15X2Jvb2wqPihzYXZlKSkgIT0gMCk7
CisgIGlmIChuZXdfb2ZmbGluZSA9PSBvcHRfb2ZmbGluZSkKKyAgeworICAgIC8vIE5vIGNoYW5n
ZQorICAgIERCVUdfVk9JRF9SRVRVUk47CisgIH0KKworICAvLyBTZXQgb2ZmbGluZSBtb2RlLCBh
bnkgdGFibGVzIG9wZW5lZCBmcm9tIGhlcmUgb24gd2lsbAorICAvLyBiZSBvcGVuZWQgaW4gdGhl
IG5ldyBtb2RlCisgIG9wdF9vZmZsaW5lID0gbmV3X29mZmxpbmU7CisKKyAgLy8gQ2xvc2UgYW55
IG9wZW4gdGFibGVzIHdoaWNoIG1heSBiZSBpbiB0aGUgb2xkIG1vZGUKKyAgKHZvaWQpY2xvc2Vf
Y2FjaGVkX3RhYmxlcyh0aGQsIE5VTEwsIGZhbHNlLCB0cnVlLCBmYWxzZSk7CisKKyAgREJVR19W
T0lEX1JFVFVSTjsKK30KKworc3RhdGljIE1ZU1FMX1NZU1ZBUl9CT09MKAorICBvZmZsaW5lLCAg
ICAgICAgICAgICAgICAgICAgICAgICAgLyogbmFtZSAqLworICBvcHRfb2ZmbGluZSwgICAgICAg
ICAgICAgICAgICAgICAgLyogdmFyICovCisgIFBMVUdJTl9WQVJfTk9DTURPUFQsCisgICJTZXQg
bmRiaW5mbyBpbiBvZmZsaW5lIG1vZGUsIHRhYmxlcyBhbmQgdmlld3MgY2FuICIKKyAgImJlIG9w
ZW5lZCBldmVuIGlmIHRoZXkgZG9uJ3QgZXhpc3Qgb3IgaGF2ZSBkaWZmZXJlbnQgIgorICAiZGVm
aW5pdGlvbiBpbiBOREIuIE5vIHJvd3Mgd2lsbCBiZSByZXR1cm5lZC4iLAorICBOVUxMLCAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgLyogY2hlY2sgZnVuYy4gKi8KKyAgbmRiaW5mb19vZmZs
aW5lX3VwZGF0ZSwgICAgICAgICAgIC8qIHVwZGF0ZSBmdW5jLiAqLworICAwICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgLyogZGVmYXVsdCAqLworKTsKKwogCiBzdGF0aWMgTmRiSW5m
byogZ19uZGJpbmZvOwogCkBAIC0xMjQsMTAgKzE2MywxNSBAQCBzdHJ1Y3QgaGFfbmRiaW5mb19p
bXBsCiAgIFZlY3Rvcjxjb25zdCBOZGJJbmZvUmVjQXR0ciAqPiBtX2NvbHVtbnM7CiAgIGJvb2wg
bV9maXJzdF91c2U7CiAKKyAgLy8gSW5kaWNhdGVzIGlmIHRhYmxlIGhhcyBiZWVuIG9wZW5lZCBp
biBvZmZsaW5lIG1vZGUKKyAgLy8gY2FuIG9ubHkgYmUgcmVzZXQgYnkgY2xvc2luZyB0aGUgdGFi
bGUKKyAgYm9vbCBtX29mZmxpbmU7CisKICAgaGFfbmRiaW5mb19pbXBsKCkgOgogICAgIG1fdGFi
bGUoTlVMTCksCiAgICAgbV9zY2FuX29wKE5VTEwpLAotICAgIG1fZmlyc3RfdXNlKHRydWUpCisg
ICAgbV9maXJzdF91c2UodHJ1ZSksCisgICAgbV9vZmZsaW5lKGZhbHNlKQogICB7CiAgIH0KIH07
CkBAIC0yODksMTIgKzMzMywxOCBAQCBib29sIGhhX25kYmluZm86OmlzX29wZW4odm9pZCkgY29u
c3QKICAgcmV0dXJuIG1faW1wbC5tX3RhYmxlICE9IE5VTEw7CiB9CiAKK2Jvb2wgaGFfbmRiaW5m
bzo6aXNfb2ZmbGluZSh2b2lkKSBjb25zdAoreworICByZXR1cm4gbV9pbXBsLm1fb2ZmbGluZTsK
K30KKwogaW50IGhhX25kYmluZm86Om9wZW4oY29uc3QgY2hhciAqbmFtZSwgaW50IG1vZGUsIHVp
bnQgdGVzdF9pZl9sb2NrZWQpCiB7CiAgIERCVUdfRU5URVIoImhhX25kYmluZm86Om9wZW4iKTsK
ICAgREJVR19QUklOVCgiZW50ZXIiLCAoIm5hbWU6ICVzLCBtb2RlOiAlZCIsIG5hbWUsIG1vZGUp
KTsKIAogICBhc3NlcnQoaXNfY2xvc2VkKCkpOworICBhc3NlcnQoIWlzX29mZmxpbmUoKSk7IC8v
IENsb3NlZCB0YWJsZSBjYW4gbm90IGJlIG9mZmxpbmUKIAogICBpZiAobW9kZSA9PSBPX1JEV1Ip
CiAgIHsKQEAgLTMwNyw5ICszNTcsMTEgQEAgaW50IGhhX25kYmluZm86Om9wZW4oY29uc3QgY2hh
ciAqbmFtZSwgaQogICAgIERCVUdfQVNTRVJUKGZhbHNlKTsKICAgfQogCi0gIGlmIChuZGJjbHVz
dGVyX2lzX2Rpc2FibGVkKCkpCisgIGlmIChvcHRfb2ZmbGluZSB8fAorICAgICAgbmRiY2x1c3Rl
cl9pc19kaXNhYmxlZCgpKQogICB7Ci0gICAgLy8gQWxsb3cgdGFibGUgdG8gYmUgb3BlbmVkIHdp
dGggbmRiY2x1c3RlciBkaXNhYmxlZAorICAgIC8vIE1hcmsgdGFibGUgYXMgYmVpbmcgb2ZmbGlu
ZSBhbmQgYWxsb3cgaXQgdG8gYmUgb3BlbmVkCisgICAgbV9pbXBsLm1fb2ZmbGluZSA9IHRydWU7
CiAgICAgREJVR19SRVRVUk4oMCk7CiAgIH0KIApAQCAtMzc4LDcgKzQzMCw3IEBAIGludCBoYV9u
ZGJpbmZvOjpjbG9zZSh2b2lkKQogewogICBEQlVHX0VOVEVSKCJoYV9uZGJpbmZvOjpjbG9zZSIp
OwogCi0gIGlmIChuZGJjbHVzdGVyX2lzX2Rpc2FibGVkKCkpCisgIGlmIChpc19vZmZsaW5lKCkp
CiAgICAgREJVR19SRVRVUk4oMCk7CiAKICAgYXNzZXJ0KGlzX29wZW4oKSk7CkBAIC0zOTUsMTIg
KzQ0NywxMyBAQCBpbnQgaGFfbmRiaW5mbzo6cm5kX2luaXQoYm9vbCBzY2FuKQogICBEQlVHX0VO
VEVSKCJoYV9uZGJpbmZvOjpybmRfaW5pdCIpOwogICBEQlVHX1BSSU5UKCJpbmZvIiwgKCJzY2Fu
OiAlZCIsIHNjYW4pKTsKIAotICBpZiAobmRiY2x1c3Rlcl9pc19kaXNhYmxlZCgpKQorICBpZiAo
aXNfb2ZmbGluZSgpKQogICB7CiAgICAgcHVzaF93YXJuaW5nKGN1cnJlbnRfdGhkLCBNWVNRTF9F
UlJPUjo6V0FSTl9MRVZFTF9OT1RFLCAxLAotICAgICAgICAgICAgICAgICAiJ05EQklORk8nIGhh
cyBiZWVuIHN0YXJ0ZWQgIgotICAgICAgICAgICAgICAgICAiaW4gbGltaXRlZCBtb2RlIHNpbmNl
IHRoZSAnTkRCQ0xVU1RFUicgIgotICAgICAgICAgICAgICAgICAiZW5naW5lIGlzIGRpc2FibGVk
IC0gbm8gcm93cyBjYW4gYmUgcmV0dXJuZWQiKTsKKyAgICAgICAgICAgICAgICAgIidOREJJTkZP
JyBoYXMgYmVlbiBzdGFydGVkIGluIG9mZmxpbmUgbW9kZSAiCisgICAgICAgICAgICAgICAgICJz
aW5jZSB0aGUgJ05EQkNMVVNURVInIGVuZ2luZSBpcyBkaXNhYmxlZCAiCisgICAgICAgICAgICAg
ICAgICJvciBAQGdsb2JhbC5uZGJpbmZvX29mZmxpbmUgaXMgdHVybmVkIG9uICIKKyAgICAgICAg
ICAgICAgICAgIi0gbm8gcm93cyBjYW4gYmUgcmV0dXJuZWQiKTsKICAgICBEQlVHX1JFVFVSTigw
KTsKICAgfQogCkBAIC00NjYsNyArNTE5LDcgQEAgaW50IGhhX25kYmluZm86OnJuZF9lbmQoKQog
ewogICBEQlVHX0VOVEVSKCJoYV9uZGJpbmZvOjpybmRfZW5kIik7CiAKLSAgaWYgKG5kYmNsdXN0
ZXJfaXNfZGlzYWJsZWQoKSkKKyAgaWYgKGlzX29mZmxpbmUoKSkKICAgICBEQlVHX1JFVFVSTigw
KTsKIAogICBhc3NlcnQoaXNfb3BlbigpKTsKQEAgLTQ4Niw3ICs1MzksNyBAQCBpbnQgaGFfbmRi
aW5mbzo6cm5kX25leHQodWNoYXIgKmJ1ZikKICAgaW50IGVycjsKICAgREJVR19FTlRFUigiaGFf
bmRiaW5mbzo6cm5kX25leHQiKTsKIAotICBpZiAobmRiY2x1c3Rlcl9pc19kaXNhYmxlZCgpKQor
ICBpZiAoaXNfb2ZmbGluZSgpKQogICAgIERCVUdfUkVUVVJOKEhBX0VSUl9FTkRfT0ZfRklMRSk7
CiAKICAgYXNzZXJ0KGlzX29wZW4oKSk7CkBAIC03MTIsNiArNzY1LDcgQEAgc3RydWN0IHN0X215
c3FsX3N5c192YXIqIG5kYmluZm9fc3lzdGVtXwogICBNWVNRTF9TWVNWQVIoZGF0YWJhc2UpLAog
ICBNWVNRTF9TWVNWQVIodGFibGVfcHJlZml4KSwKICAgTVlTUUxfU1lTVkFSKHZlcnNpb24pLAor
ICBNWVNRTF9TWVNWQVIob2ZmbGluZSksCiAKICAgTlVMTAogfTsKCj09PSBtb2RpZmllZCBmaWxl
ICdzcWwvaGFfbmRiaW5mby5oJwotLS0gYS9zcWwvaGFfbmRiaW5mby5oCTIwMTEtMDItMDEgMTQ6
NTg6MjEgKzAwMDAKKysrIGIvc3FsL2hhX25kYmluZm8uaAkyMDExLTA1LTE4IDEyOjM3OjA2ICsw
MDAwCkBAIC04Myw2ICs4Myw4IEBAIHByaXZhdGU6CiAgIGJvb2wgaXNfb3Blbih2b2lkKSBjb25z
dDsKICAgYm9vbCBpc19jbG9zZWQodm9pZCkgY29uc3QgeyByZXR1cm4gISBpc19vcGVuKCk7IH07
CiAKKyAgYm9vbCBpc19vZmZsaW5lKHZvaWQpIGNvbnN0OworCiAgIHN0cnVjdCBoYV9uZGJpbmZv
X2ltcGwmIG1faW1wbDsKIAogfTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi90b29s
cy9uZGJpbmZvX3NxbC5jcHAnCi0tLSBhL3N0b3JhZ2UvbmRiL3Rvb2xzL25kYmluZm9fc3FsLmNw
cAkyMDExLTA0LTEyIDEzOjU5OjMyICswMDAwCisrKyBiL3N0b3JhZ2UvbmRiL3Rvb2xzL25kYmlu
Zm9fc3FsLmNwcAkyMDExLTA1LTE4IDEyOjM3OjA2ICswMDAwCkBAIC0zMjcsNiArMzI3LDEyIEBA
IGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndil7CiAgIHNxbC5hc3NmbXQoIkNSRUFURSBE
QVRBQkFTRSBJRiBOT1QgRVhJU1RTIGAlc2AiLCBvcHRfbmRiaW5mb19kYik7CiAgIHByaW50X2Nv
bmRpdGlvbmFsX3NxbChzcWwpOwogCisgIHByaW50ZigiIyBTZXQgTkRCSU5GTyBpbiBvZmZsaW5l
IG1vZGUgZHVyaW5nIChyZSljcmVhdGUgb2YgdGFibGVzXG4iKTsKKyAgcHJpbnRmKCIjIGFuZCB2
aWV3cyB0byBhdm9pZCBlcnJvcnMgY2F1c2VkIGJ5IG5vIHN1Y2ggdGFibGUgb3JcbiIpOworICBw
cmludGYoIiMgZGlmZmVyZW50IHRhYmxlIGRlZmluaXRpb24gaW4gTkRCXG4iKTsKKyAgc3FsLmFz
c2ZtdCgiU0VUIEBAZ2xvYmFsLm5kYmluZm9fb2ZmbGluZT1UUlVFIik7CisgIHByaW50X2NvbmRp
dGlvbmFsX3NxbChzcWwpOworCiAgIHByaW50ZigiIyBEcm9wIGFueSBvbGQgdmlld3MgaW4gJXNc
biIsIG9wdF9uZGJpbmZvX2RiKTsKICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1fdmlld3M7
IGkrKykKICAgewpAQCAtNDMwLDYgKzQzNiwxMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioq
IGFyZ3YpewogICAgIHByaW50X2NvbmRpdGlvbmFsX3NxbChzcWwpOwogICB9CiAKKyAgcHJpbnRm
KCIjIEZpbmFsbHkgdHVybiBvZmYgb2ZmbGluZSBtb2RlXG4iKTsKKyAgc3FsLmFzc2ZtdCgiU0VU
IEBAZ2xvYmFsLm5kYmluZm9fb2ZmbGluZT1GQUxTRSIpOworICBwcmludF9jb25kaXRpb25hbF9z
cWwoc3FsKTsKKwogICByZXR1cm4gMDsKIH0KIAoK

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   jfg2ifng9urgiicp
# target_branch: file:///home/msvensson/mysql/bug11885602/7.1/
# testament_sha1: 2e96af33175ddf6edd2d870416c267a51b9a0013
# timestamp: 2011-05-18 15:04:01 +0200
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
nChIb05kFQA=


--===============4797546877672493495==--