From: Marc Alff
Date: April 16 2010 2:24pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3160)
 Bug#46792
List-Archive: http://lists.mysql.com/commits/105891
X-Bug: 46792
Message-Id: <20100416142413.4214244FE38@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_tL3PUY0nMB2kHpD/EhGRgg)"

--Boundary_(ID_tL3PUY0nMB2kHpD/EhGRgg)
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-transfer-encoding: BASE64
Content-disposition: inline

I0F0IGZpbGU6Ly8vVXNlcnMvbWFsZmYvQlpSX1RSRUUvbXlzcWwtbmV4dC1tci1i
dWdmaXhpbmctNDY3OTIvIGJhc2VkIG9uIHJldmlkOmx1aXMuc29hcmVzQHN1bi5j
b20tMjAxMDA0MTYwMDA3MDAtbjI2N3ludTc3dmlzeDMxdA0KDQogMzE2MCBNYXJj
IEFsZmYJMjAxMC0wNC0xNg0KICAgICAgQnVnIzQ2NzkyIEhhcmQgY29kZWQgJ215
c3FsJyB0YWJsZSBzY2hlbWEgaW4gZXJyb3IgbWVzc2FnZXMNCiAgICAgIA0KICAg
ICAgUHJpb3IgdG8gdGhpcyBmaXgsIHRoZSBmb2xsb3dpbmcgZXJyb3IgbWVzc2Fn
ZXM6DQogICAgICAtIEVSX0NPTF9DT1VOVF9ET0VTTlRfTUFUQ0hfQ09SUlVQVEVE
DQogICAgICAtIEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEUNCiAgICAgIGRpZCBo
YXJkIGNvZGUgYSB0YWJsZSBzY2hlbWEgdG8gbXlzcWwuDQogICAgICANCiAgICAg
IFdpdGggdGhpcyBmaXgsIG5ldyBlcnJvciBtZXNzYWdlcyBoYXZlIGJlZW4gaW50
cm9kdWNlZDoNCiAgICAgIC0gRVJfQ09MX0NPVU5UX0RPRVNOVF9NQVRDSF9DT1JS
VVBURURfVjINCiAgICAgIC0gRVJfQ0FOTk9UX0xPQURfRlJPTV9UQUJMRV9WMg0K
ICAgICAgdGhhdCB1c2VzIGEgZ2VuZXJpYyAiJXMuJXMiIHRhYmxlIG5hbWUuDQog
ICAgICANCiAgICAgIFRoZSBvbGQgZXJyb3Igd2VyZSByZW5hbWVkIHRvIEVSX09C
U09MRVRFXy4uLiBmb3IgY2xhcml0eSwNCiAgICAgIGFuZCB0byBtYWludGFpbiBi
aW5hcnkgY29tcGF0aWJpbGl0eS4NCiAgICAgIA0KICAgICAgVGhpcyBmaXggYWxz
byBjaGFuZ2VkIFBGU19jaGVja19pbnRhY3Q6OnJlcG9ydF9lcnJvciwNCiAgICAg
IHRvIG1ha2Ugc3VyZSB0aGF0IGVycm9ycyBhcmUgcmVwb3J0ZWQgaW4gdGhlIHNl
cnZlciBsb2cuDQogICAgICBQcmV2aW91c2x5LCB0aGUgbWVzc2FnZSB3YXMgbG9z
dC4NCg0KICAgIG1vZGlmaWVkOg0KICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJm
c2NoZW1hL3IvdGFtcGVyZWRfcGVyZnNjaGVtYV90YWJsZTEucmVzdWx0DQogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC90YW1wZXJlZF9wZXJmc2No
ZW1hX3RhYmxlMS50ZXN0DQogICAgICBteXNxbC10ZXN0L3QvZXZlbnRzXzEudGVz
dA0KICAgICAgbXlzcWwtdGVzdC90L3NwLWRlc3RydWN0LnRlc3QNCiAgICAgIHNx
bC9ldmVudF9kYl9yZXBvc2l0b3J5LmNjDQogICAgICBzcWwvc2hhcmUvZXJybXNn
LXV0ZjgudHh0DQogICAgICBzcWwvc3AuY2MNCiAgICAgIHNxbC9zcWxfc2hvdy5j
Yw0KICAgICAgc3FsL3RhYmxlLmNjDQogICAgICBzdG9yYWdlL3BlcmZzY2hlbWEv
cGZzX2VuZ2luZV90YWJsZS5jYw0KPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRl
c3Qvc3VpdGUvcGVyZnNjaGVtYS9yL3RhbXBlcmVkX3BlcmZzY2hlbWFfdGFibGUx
LnJlc3VsdCcNCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS9yL3Rh
bXBlcmVkX3BlcmZzY2hlbWFfdGFibGUxLnJlc3VsdAkyMDEwLTAxLTEyIDAxOjQ3
OjI3ICswMDAwDQorKysgYi9teXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvci90
YW1wZXJlZF9wZXJmc2NoZW1hX3RhYmxlMS5yZXN1bHQJMjAxMC0wNC0xNiAxNDoy
NDowNiArMDAwMA0KQEAgLTEsNSArMSw1IEBADQogY2FsbCBtdHIuYWRkX3N1cHBy
ZXNzaW9uKA0KLSJDb2x1bW4gY291bnQgb2YgbXlzcWwuU0VUVVBfSU5TVFJVTUVO
VFMgaXMgd3JvbmcuICINCisiQ29sdW1uIGNvdW50IG9mIHBlcmZvcm1hbmNlX3Nj
aGVtYS5TRVRVUF9JTlNUUlVNRU5UUyBpcyB3cm9uZy4gIg0KICJFeHBlY3RlZCA0
LCBmb3VuZCAzLiBUaGUgdGFibGUgaXMgcHJvYmFibHkgY29ycnVwdGVkIik7DQog
c2VsZWN0ICogZnJvbSBwZXJmb3JtYW5jZV9zY2hlbWEuU0VUVVBfSU5TVFJVTUVO
VFMgbGltaXQgMTsNCiBFUlJPUiBIWTAwMDogTmF0aXZlIHRhYmxlICdwZXJmb3Jt
YW5jZV9zY2hlbWEnLidTRVRVUF9JTlNUUlVNRU5UUycgaGFzIHRoZSB3cm9uZyBz
dHJ1Y3R1cmUNCg0KPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUv
cGVyZnNjaGVtYS90L3RhbXBlcmVkX3BlcmZzY2hlbWFfdGFibGUxLnRlc3QnDQot
LS0gYS9teXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC90YW1wZXJlZF9wZXJm
c2NoZW1hX3RhYmxlMS50ZXN0CTIwMTAtMDEtMTIgMDE6NDc6MjcgKzAwMDANCisr
KyBiL215c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVtYS90L3RhbXBlcmVkX3BlcmZz
Y2hlbWFfdGFibGUxLnRlc3QJMjAxMC0wNC0xNiAxNDoyNDowNiArMDAwMA0KQEAg
LTI3LDEyICsyNyw4IEBADQogLS1zb3VyY2UgaW5jbHVkZS9ub3RfZW1iZWRkZWQu
aW5jDQogLS1zb3VyY2UgaW5jbHVkZS9oYXZlX3BlcmZzY2hlbWEuaW5jDQogDQot
IyBUaGUgbWVzc2FnZSBwcmludHMgJ215c3FsLlNFVFVQX0lOU1RSVU1FTlRTJw0K
LSMgaW5zdGVhZCBvZiAncGVyZm9ybWFuY2Vfc2NoZW1hLlNFVFVQX0lOU1RSVU1F
TlRTJywNCi0jIGR1ZSB0byBCdWcjNDY3OTINCi0NCiBjYWxsIG10ci5hZGRfc3Vw
cHJlc3Npb24oDQotIkNvbHVtbiBjb3VudCBvZiBteXNxbC5TRVRVUF9JTlNUUlVN
RU5UUyBpcyB3cm9uZy4gIg0KKyJDb2x1bW4gY291bnQgb2YgcGVyZm9ybWFuY2Vf
c2NoZW1hLlNFVFVQX0lOU1RSVU1FTlRTIGlzIHdyb25nLiAiDQogIkV4cGVjdGVk
IDQsIGZvdW5kIDMuIFRoZSB0YWJsZSBpcyBwcm9iYWJseSBjb3JydXB0ZWQiKTsN
CiANCiAtLWVycm9yIEVSX1dST05HX05BVElWRV9UQUJMRV9TVFJVQ1RVUkUNCg0K
PT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9ldmVudHNfMS50ZXN0Jw0K
LS0tIGEvbXlzcWwtdGVzdC90L2V2ZW50c18xLnRlc3QJMjAwOC0wMi0yMiAyMDoy
ODo1OSArMDAwMA0KKysrIGIvbXlzcWwtdGVzdC90L2V2ZW50c18xLnRlc3QJMjAx
MC0wNC0xNiAxNDoyNDowNiArMDAwMA0KQEAgLTMwMiw5ICszMDIsOSBAQCBDUkVB
VEUgRVZFTlQgaW50YWN0X2NoZWNrIE9OIFNDSEVEVUxFIEVWDQogLS1lY2hvIGV4
cGVjdHMgdG8gc2VlIGV2ZW50IHNjaGVtYSBuYW1lIHRoZXJlDQogLS1lY2hvIA0K
IEFMVEVSIFRBQkxFIG15c3FsLmV2ZW50IEFERCBkdW1teSBJTlQgRklSU1Q7DQot
LS1lcnJvciBFUl9DQU5OT1RfTE9BRF9GUk9NX1RBQkxFDQorLS1lcnJvciBFUl9D
QU5OT1RfTE9BRF9GUk9NX1RBQkxFX1YyDQogU0hPVyBFVkVOVFM7DQotLS1lcnJv
ciBFUl9DQU5OT1RfTE9BRF9GUk9NX1RBQkxFDQorLS1lcnJvciBFUl9DQU5OT1Rf
TE9BRF9GUk9NX1RBQkxFX1YyDQogU0VMRUNUIGV2ZW50X25hbWUgRlJPTSBJTkZP
Uk1BVElPTl9TQ0hFTUEuZXZlbnRzOw0KIC0tZXJyb3IgRVJfRVZFTlRfRE9FU19O
T1RfRVhJU1QNCiBTSE9XIENSRUFURSBFVkVOVCBpbnRhY3RfY2hlY2s7DQpAQCAt
MzQxLDE1ICszNDEsMTUgQEAgSU5TRVJUIElOVE8gZXZlbnRfbGlrZSBTRUxFQ1Qg
KiBGUk9NIG15cw0KIC0tZWNobw0KIC0tZWNobyANCiBBTFRFUiBUQUJMRSBteXNx
bC5ldmVudCBEUk9QIGNvbW1lbnQsIERST1Agc3RhcnRzOw0KLS0tZXJyb3IgRVJf
Q0FOTk9UX0xPQURfRlJPTV9UQUJMRQ0KKy0tZXJyb3IgRVJfQ0FOTk9UX0xPQURf
RlJPTV9UQUJMRV9WMg0KIFNIT1cgRVZFTlRTOw0KLS0tZXJyb3IgRVJfQ0FOTk9U
X0xPQURfRlJPTV9UQUJMRQ0KKy0tZXJyb3IgRVJfQ0FOTk9UX0xPQURfRlJPTV9U
QUJMRV9WMg0KIFNFTEVDVCBldmVudF9uYW1lIEZST00gSU5GT1JNQVRJT05fU0NI
RU1BLkVWRU5UUzsNCi0tLWVycm9yIEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEUN
CistLWVycm9yIEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEVfVjINCiBTSE9XIENS
RUFURSBFVkVOVCBpbnRhY3RfY2hlY2s7DQogLS1lcnJvciBFUl9FVkVOVF9ET0VT
X05PVF9FWElTVA0KIERST1AgRVZFTlQgbm9fc3VjaF9ldmVudDsNCi0tLWVycm9y
IEVSX0NPTF9DT1VOVF9ET0VTTlRfTUFUQ0hfQ09SUlVQVEVEDQorLS1lcnJvciBF
Ul9DT0xfQ09VTlRfRE9FU05UX01BVENIX0NPUlJVUFRFRF9WMg0KIENSRUFURSBF
VkVOVCBpbnRhY3RfY2hlY2tfMSBPTiBTQ0hFRFVMRSBFVkVSWSA1IEhPVVIgRE8g
U0VMRUNUIDU7DQogLS1lcnJvciBFUl9FVkVOVF9ET0VTX05PVF9FWElTVA0KIEFM
VEVSIEVWRU5UIGludGFjdF9jaGVja18xIE9OIFNDSEVEVUxFIEVWRVJZIDggSE9V
UiBETyBTRUxFQ1QgODsNCg0KPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qv
dC9zcC1kZXN0cnVjdC50ZXN0Jw0KLS0tIGEvbXlzcWwtdGVzdC90L3NwLWRlc3Ry
dWN0LnRlc3QJMjAxMC0wMy0wMyAwOToyNDo1MyArMDAwMA0KKysrIGIvbXlzcWwt
dGVzdC90L3NwLWRlc3RydWN0LnRlc3QJMjAxMC0wNC0xNiAxNDoyNDowNiArMDAw
MA0KQEAgLTQxLDEzICs0MSwxMyBAQCBjcmVhdGUgdHJpZ2dlciB0MV9haSBhZnRl
ciBpbnNlcnQgb24gdDEgDQogDQogIyBVbnN1cHBvcnRlZCB0YW1wZXJpbmcgd2l0
aCB0aGUgbXlzcWwucHJvYyBkZWZpbml0aW9uDQogYWx0ZXIgdGFibGUgbXlzcWwu
cHJvYyBkcm9wIHR5cGU7DQotLS1lcnJvciBFUl9DT0xfQ09VTlRfRE9FU05UX01B
VENIX0NPUlJVUFRFRA0KKy0tZXJyb3IgRVJfQ09MX0NPVU5UX0RPRVNOVF9NQVRD
SF9DT1JSVVBURURfVjINCiBjYWxsIGJ1ZzE0MjMzKCk7DQotLS1lcnJvciBFUl9D
T0xfQ09VTlRfRE9FU05UX01BVENIX0NPUlJVUFRFRA0KKy0tZXJyb3IgRVJfQ09M
X0NPVU5UX0RPRVNOVF9NQVRDSF9DT1JSVVBURURfVjINCiBjcmVhdGUgdmlldyB2
MSBhcyBzZWxlY3QgYnVnMTQyMzNfZigpOw0KLS0tZXJyb3IgRVJfQ09MX0NPVU5U
X0RPRVNOVF9NQVRDSF9DT1JSVVBURUQNCistLWVycm9yIEVSX0NPTF9DT1VOVF9E
T0VTTlRfTUFUQ0hfQ09SUlVQVEVEX1YyDQogaW5zZXJ0IGludG8gdDEgdmFsdWVz
ICgwKTsNCi0tLWVycm9yIEVSX0NPTF9DT1VOVF9ET0VTTlRfTUFUQ0hfQ09SUlVQ
VEVEDQorLS1lcnJvciBFUl9DT0xfQ09VTlRfRE9FU05UX01BVENIX0NPUlJVUFRF
RF9WMg0KIHNob3cgcHJvY2VkdXJlIHN0YXR1czsNCiANCiBmbHVzaCB0YWJsZSBt
eXNxbC5wcm9jOw0KQEAgLTE4NiwxMiArMTg2LDEyIEBAIFNIT1cgUFJPQ0VEVVJF
IFNUQVRVUzsNCiANCiBBTFRFUiBUQUJMRSBteXNxbC5wcm9jIE1PRElGWSBjb21t
ZW50IENIQVIgKDMyKTsNCiANCi0tLWVycm9yIEVSX0NBTk5PVF9MT0FEX0ZST01f
VEFCTEUNCistLWVycm9yIEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEVfVjINCiBD
UkVBVEUgUFJPQ0VEVVJFIHAyKCkNCiAgIFNFVCBAZm9vID0gMTA7DQogLS1lY2hv
ICMgUHJvY2VkdXJlIGxvYWRlZCBmcm9tIHRoZSBjYWNoZQ0KIENBTEwgcDEoKTsN
Ci0tLWVycm9yIEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEUNCistLWVycm9yIEVS
X0NBTk5PVF9MT0FEX0ZST01fVEFCTEVfVjINCiBTSE9XIFBST0NFRFVSRSBTVEFU
VVM7DQogDQogRFJPUCBUQUJMRSBteXNxbC5wcm9jOw0KDQo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3FsL2V2ZW50X2RiX3JlcG9zaXRvcnkuY2MnDQotLS0gYS9zcWwvZXZl
bnRfZGJfcmVwb3NpdG9yeS5jYwkyMDEwLTA0LTAxIDE5OjM0OjA5ICswMDAwDQor
KysgYi9zcWwvZXZlbnRfZGJfcmVwb3NpdG9yeS5jYwkyMDEwLTA0LTE2IDE0OjI0
OjA2ICswMDAwDQpAQCAtMjIwLDcgKzIyMCw4IEBAIG15c3FsX2V2ZW50X2ZpbGxf
cm93KFRIRCAqdGhkLA0KICAgICAgIFNhZmV0eTogdGhpcyBjYW4gb25seSBoYXBw
ZW4gaWYgc29tZW9uZSBzdGFydGVkIHRoZSBzZXJ2ZXINCiAgICAgICBhbmQgdGhl
biBhbHRlcmVkIG15c3FsLmV2ZW50Lg0KICAgICAqLw0KLSAgICBteV9lcnJvcihF
Ul9DT0xfQ09VTlRfRE9FU05UX01BVENIX0NPUlJVUFRFRCwgTVlGKDApLCB0YWJs
ZS0+YWxpYXMsDQorICAgIG15X2Vycm9yKEVSX0NPTF9DT1VOVF9ET0VTTlRfTUFU
Q0hfQ09SUlVQVEVEX1YyLCBNWUYoMCksDQorICAgICAgICAgICAgIHRhYmxlLT5z
LT5kYi5zdHIsIHRhYmxlLT5zLT50YWJsZV9uYW1lLnN0ciwNCiAgICAgICAgICAg
ICAgKGludCkgRVRfRklFTERfQ09VTlQsIHRhYmxlLT5zLT5maWVsZHMpOw0KICAg
ICBEQlVHX1JFVFVSTihUUlVFKTsNCiAgIH0NCkBAIC00MTUsNyArNDE2LDcgQEAg
RXZlbnRfZGJfcmVwb3NpdG9yeTo6aW5kZXhfcmVhZF9mb3JfZGJfZg0KICAgICAg
IGtleV9pbmZvLT5rZXlfcGFydFswXS5maWVsZCAhPSBldmVudF90YWJsZS0+Zmll
bGRbRVRfRklFTERfREJdKQ0KICAgew0KICAgICAvKiBDb3JydXB0ZWQgdGFibGU6
IG5vIGluZGV4IG9yIGluZGV4IG9uIGEgd3JvbmcgY29sdW1uICovDQotICAgIG15
X2Vycm9yKEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEUsIE1ZRigwKSwgImV2ZW50
Iik7DQorICAgIG15X2Vycm9yKEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEVfVjIs
IE1ZRigwKSwgIm15c3FsIiwgImV2ZW50Iik7DQogICAgIHJldD0gMTsNCiAgICAg
Z290byBlbmQ7DQogICB9DQpAQCAtMTAyNCw3ICsxMDI1LDcgQEAgRXZlbnRfZGJf
cmVwb3NpdG9yeTo6bG9hZF9uYW1lZF9ldmVudChUSA0KICAgICBpZiAoKHJldD0g
ZmluZF9uYW1lZF9ldmVudChkYm5hbWUsIG5hbWUsIHRhYmxlKSkpDQogICAgICAg
bXlfZXJyb3IoRVJfRVZFTlRfRE9FU19OT1RfRVhJU1QsIE1ZRigwKSwgbmFtZS5z
dHIpOw0KICAgICBlbHNlIGlmICgocmV0PSBldG4tPmxvYWRfZnJvbV9yb3codGhk
LCB0YWJsZSkpKQ0KLSAgICAgIG15X2Vycm9yKEVSX0NBTk5PVF9MT0FEX0ZST01f
VEFCTEUsIE1ZRigwKSwgImV2ZW50Iik7DQorICAgICAgbXlfZXJyb3IoRVJfQ0FO
Tk9UX0xPQURfRlJPTV9UQUJMRV9WMiwgTVlGKDApLCAibXlzcWwiLCAiZXZlbnQi
KTsNCiANCiAgICAgY2xvc2VfdGhyZWFkX3RhYmxlcyh0aGQpOw0KICAgfQ0KDQo9
PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NoYXJlL2Vycm1zZy11dGY4LnR4dCcNCi0t
LSBhL3NxbC9zaGFyZS9lcnJtc2ctdXRmOC50eHQJMjAxMC0wNC0xMyAyMjowNzow
OCArMDAwMA0KKysrIGIvc3FsL3NoYXJlL2Vycm1zZy11dGY4LnR4dAkyMDEwLTA0
LTE2IDE0OjI0OjA2ICswMDAwDQpAQCAtNTkwNSwxMiArNTkwNSwxNyBAQCBFUl9F
VkVOVF9PUEVOX1RBQkxFX0ZBSUxFRA0KIEVSX0VWRU5UX05FSVRIRVJfTV9FWFBS
X05PUl9NX0FUDQogICAgICAgICBlbmcgIk5vIGRhdGV0aW1lIGV4cHJlc3Npb24g
cHJvdmlkZWQiDQogICAgICAgICBnZXIgIktlaW4gREFURVRJTUUtQXVzZHJ1Y2sg
YW5nZWdlYmVuIg0KLUVSX0NPTF9DT1VOVF9ET0VTTlRfTUFUQ0hfQ09SUlVQVEVE
DQorDQorIyBPQlNPTEVURSwgVVNFIEVSX0NPTF9DT1VOVF9ET0VTTlRfTUFUQ0hf
Q09SUlVQVEVEX1YyDQorRVJfT0JTT0xFVEVfQ09MX0NPVU5UX0RPRVNOVF9NQVRD
SF9DT1JSVVBURUQNCiAgICAgICAgIGVuZyAiQ29sdW1uIGNvdW50IG9mIG15c3Fs
LiVzIGlzIHdyb25nLiBFeHBlY3RlZCAlZCwgZm91bmQgJWQuIFRoZSB0YWJsZSBp
cyBwcm9iYWJseSBjb3JydXB0ZWQiDQogICAgICAgICBnZXIgIlNwYWx0ZW5hbnph
aGwgdm9uIG15c3FsLiVzIGZhbHNjaC4gJWQgZXJ3YXJ0ZXQsIGFiZXIgJWQgZ2Vm
dW5kZW4uIFRhYmVsbGUgaXN0IHdhaHJzY2hlaW5saWNoIGJlc2Now6RkaWd0Ig0K
LUVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEUNCisNCisjIE9CU09MRVRFLCBVU0Ug
RVJfQ0FOTk9UX0xPQURfRlJPTV9UQUJMRV9WMg0KK0VSX09CU09MRVRFX0NBTk5P
VF9MT0FEX0ZST01fVEFCTEUNCiAgICAgICAgIGVuZyAiQ2Fubm90IGxvYWQgZnJv
bSBteXNxbC4lcy4gVGhlIHRhYmxlIGlzIHByb2JhYmx5IGNvcnJ1cHRlZCINCiAg
ICAgICAgIGdlciAiS2FubiBteXNxbC4lcyBuaWNodCBlaW5sZXNlbi4gVGFiZWxs
ZSBpc3Qgd2FocnNjaGVpbmxpY2ggYmVzY2jDpGRpZ3QiDQorDQogRVJfRVZFTlRf
Q0FOTk9UX0RFTEVURQ0KICAgICAgICAgZW5nICJGYWlsZWQgdG8gZGVsZXRlIHRo
ZSBldmVudCBmcm9tIG15c3FsLmV2ZW50Ig0KICAgICAgICAgZ2VyICJMw7ZzY2hl
biBkZXMgRXZlbnRzIGF1cyBteXNxbC5ldmVudCBmZWhsZ2VzY2hsYWdlbiINCkBA
IC02MzMwLDMgKzYzMzUsMTIgQEAgRVJfREFUQV9PVVRfT0ZfUkFOR0UgMjIwMDMg
DQogDQogRVJfV1JPTkdfU1BWQVJfVFlQRV9JTl9MSU1JVA0KICAgZW5nICJBIHZh
cmlhYmxlIG9mIGEgbm9uLWludGVnZXIgdHlwZSBpbiBMSU1JVCBjbGF1c2UiDQor
DQorRVJfQ09MX0NPVU5UX0RPRVNOVF9NQVRDSF9DT1JSVVBURURfVjINCisgICAg
ICAgIGVuZyAiQ29sdW1uIGNvdW50IG9mICVzLiVzIGlzIHdyb25nLiBFeHBlY3Rl
ZCAlZCwgZm91bmQgJWQuIFRoZSB0YWJsZSBpcyBwcm9iYWJseSBjb3JydXB0ZWQi
DQorICAgICAgICBnZXIgIlNwYWx0ZW5hbnphaGwgdm9uICVzLiVzIGZhbHNjaC4g
JWQgZXJ3YXJ0ZXQsIGFiZXIgJWQgZ2VmdW5kZW4uIFRhYmVsbGUgaXN0IHdhaHJz
Y2hlaW5saWNoIGJlc2Now6RkaWd0Ig0KKw0KK0VSX0NBTk5PVF9MT0FEX0ZST01f
VEFCTEVfVjINCisgICAgICAgIGVuZyAiQ2Fubm90IGxvYWQgZnJvbSAlcy4lcy4g
VGhlIHRhYmxlIGlzIHByb2JhYmx5IGNvcnJ1cHRlZCINCisgICAgICAgIGdlciAi
S2FubiAlcy4lcyBuaWNodCBlaW5sZXNlbi4gVGFiZWxsZSBpc3Qgd2FocnNjaGVp
bmxpY2ggYmVzY2jDpGRpZ3QiDQorDQoNCj09PSBtb2RpZmllZCBmaWxlICdzcWwv
c3AuY2MnDQotLS0gYS9zcWwvc3AuY2MJMjAxMC0wNC0wMSAxOTozNDowOSArMDAw
MA0KKysrIGIvc3FsL3NwLmNjCTIwMTAtMDQtMTYgMTQ6MjQ6MDYgKzAwMDANCkBA
IC0zNzQsNyArMzc0LDcgQEAgdm9pZCBQcm9jX3RhYmxlX2ludGFjdDo6cmVwb3J0
X2Vycm9yKHVpbg0KICAgaWYgKGNvZGUpDQogICAgIG15X21lc3NhZ2UoY29kZSwg
YnVmLCBNWUYoMCkpOw0KICAgZWxzZQ0KLSAgICBteV9lcnJvcihFUl9DQU5OT1Rf
TE9BRF9GUk9NX1RBQkxFLCBNWUYoMCksICJwcm9jIik7DQorICAgIG15X2Vycm9y
KEVSX0NBTk5PVF9MT0FEX0ZST01fVEFCTEVfVjIsIE1ZRigwKSwgIm15c3FsIiwg
InByb2MiKTsNCiANCiAgIGlmIChtX3ByaW50X29uY2UpDQogICB7DQoNCj09PSBt
b2RpZmllZCBmaWxlICdzcWwvc3FsX3Nob3cuY2MnDQotLS0gYS9zcWwvc3FsX3No
b3cuY2MJMjAxMC0wNC0wNyAxMjowMjoxOSArMDAwMA0KKysrIGIvc3FsL3NxbF9z
aG93LmNjCTIwMTAtMDQtMTYgMTQ6MjQ6MDYgKzAwMDANCkBAIC01NzQwLDcgKzU3
NDAsNyBAQCBjb3B5X2V2ZW50X3RvX3NjaGVtYV90YWJsZShUSEQgKnRoZCwgVEFC
DQogDQogICBpZiAoZXQubG9hZF9mcm9tX3Jvdyh0aGQsIGV2ZW50X3RhYmxlKSkN
CiAgIHsNCi0gICAgbXlfZXJyb3IoRVJfQ0FOTk9UX0xPQURfRlJPTV9UQUJMRSwg
TVlGKDApLCBldmVudF90YWJsZS0+YWxpYXMpOw0KKyAgICBteV9lcnJvcihFUl9D
QU5OT1RfTE9BRF9GUk9NX1RBQkxFX1YyLCBNWUYoMCksICJteXNxbCIsICJldmVu
dCIpOw0KICAgICBEQlVHX1JFVFVSTigxKTsNCiAgIH0NCiANCg0KPT09IG1vZGlm
aWVkIGZpbGUgJ3NxbC90YWJsZS5jYycNCi0tLSBhL3NxbC90YWJsZS5jYwkyMDEw
LTA0LTA3IDExOjU4OjQwICswMDAwDQorKysgYi9zcWwvdGFibGUuY2MJMjAxMC0w
NC0xNiAxNDoyNDowNiArMDAwMA0KQEAgLTI4OTUsOCArMjg5NSw5IEBAIFRhYmxl
X2NoZWNrX2ludGFjdDo6Y2hlY2soVEFCTEUgKnRhYmxlLCANCiAgICAgfQ0KICAg
ICBlbHNlIGlmIChNWVNRTF9WRVJTSU9OX0lEID09IHRhYmxlLT5zLT5teXNxbF92
ZXJzaW9uKQ0KICAgICB7DQotICAgICAgcmVwb3J0X2Vycm9yKEVSX0NPTF9DT1VO
VF9ET0VTTlRfTUFUQ0hfQ09SUlVQVEVELA0KLSAgICAgICAgICAgICAgICAgICBF
UihFUl9DT0xfQ09VTlRfRE9FU05UX01BVENIX0NPUlJVUFRFRCksIHRhYmxlLT5h
bGlhcywNCisgICAgICByZXBvcnRfZXJyb3IoRVJfQ09MX0NPVU5UX0RPRVNOVF9N
QVRDSF9DT1JSVVBURURfVjIsDQorICAgICAgICAgICAgICAgICAgIEVSKEVSX0NP
TF9DT1VOVF9ET0VTTlRfTUFUQ0hfQ09SUlVQVEVEX1YyKSwNCisgICAgICAgICAg
ICAgICAgICAgdGFibGUtPnMtPmRiLnN0ciwgdGFibGUtPnMtPnRhYmxlX25hbWUu
c3RyLA0KICAgICAgICAgICAgICAgICAgICB0YWJsZV9kZWYtPmNvdW50LCB0YWJs
ZS0+cy0+ZmllbGRzKTsNCiAgICAgICBEQlVHX1JFVFVSTihUUlVFKTsNCiAgICAg
fQ0KDQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9wZXJmc2NoZW1hL3Bmc19l
bmdpbmVfdGFibGUuY2MnDQotLS0gYS9zdG9yYWdlL3BlcmZzY2hlbWEvcGZzX2Vu
Z2luZV90YWJsZS5jYwkyMDEwLTAzLTMxIDE0OjA1OjMzICswMDAwDQorKysgYi9z
dG9yYWdlL3BlcmZzY2hlbWEvcGZzX2VuZ2luZV90YWJsZS5jYwkyMDEwLTA0LTE2
IDE0OjI0OjA2ICswMDAwDQpAQCAtMTA4LDcgKzEwOCwxMiBAQCB2b2lkIFBGU19j
aGVja19pbnRhY3Q6OnJlcG9ydF9lcnJvcih1aW50DQogICBteV92c25wcmludGYo
YnVmZiwgc2l6ZW9mKGJ1ZmYpLCBmbXQsIGFyZ3MpOw0KICAgdmFfZW5kKGFyZ3Mp
Ow0KIA0KLSAgbXlfbWVzc2FnZShjb2RlLCBidWZmLCBNWUYoMCkpOw0KKyAgLyoN
CisgICAgVGhpcyBpcyBhbiBpbnN0YWxsL3VwZ3JhZGUgaXNzdWU6DQorICAgIC0g
ZG8gbm90IHJlcG9ydCBpdCBpbiB0aGUgdXNlciBjb25uZWN0aW9uLCB0aGVyZSBp
cyBub25lIGluIG1haW4oKSwNCisgICAgLSByZXBvcnQgaXQgaW4gdGhlIHNlcnZl
ciBlcnJvciBsb2cuDQorICAqLw0KKyAgc3FsX3ByaW50X2Vycm9yKCIlcyIsIGJ1
ZmYpOw0KIH0NCiANCiAvKioNCg0K

--Boundary_(ID_tL3PUY0nMB2kHpD/EhGRgg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   46792/
# testament_sha1: 746250b954b5f3f1a1abb8ef6f1831431d4774d0
# timestamp: 2010-04-16 08:24:12 -0600
# base_revision_id: luis.soares@stripped\
#   n267ynu77visx31t
# 
# Begin bundle
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
yRxmXVcqMmyVCpMv+IH/F3JFOFCQ2CEY1A==


--Boundary_(ID_tL3PUY0nMB2kHpD/EhGRgg)--