From: Magnus Blåudd
Date: September 28 2009 12:40pm
Subject: bzr commit into mysql-5.0-bugteam branch (magnus.blaudd:2816) Bug#42850
List-Archive: http://lists.mysql.com/commits/84840
X-Bug: 42850
Message-Id: <20090928124029.607A113405F@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_P7PIKj8zcoQRDTygLW/O4A)"

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

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNS4wLWJ1Z3RlYW0vIGJh
c2VkIG9uIHJldmlkOmpvcm9Ac3VuLmNvbS0yMDA5MDkxMTEyNTIwOC15MmY4bnRi
b3Q3aTk1NjFlDQoNCiAyODE2IE1hZ251cyBCbMOldWRkCTIwMDktMDktMjggW21l
cmdlXQ0KICAgICAgTWVyZ2UgYnVnIzQyODUwIHRvIDUuMA0KDQogICAgbW9kaWZp
ZWQ6DQogICAgICBjbGllbnQvbXlzcWx0ZXN0LmMNCiAgICAgIG15c3lzL215X3Ro
cl9pbml0LmMNCj09PSBtb2RpZmllZCBmaWxlICdjbGllbnQvbXlzcWx0ZXN0LmMn
DQotLS0gYS9jbGllbnQvbXlzcWx0ZXN0LmMJMjAwOS0wOC0yOCAxNTo1MTozMSAr
MDAwMA0KKysrIGIvY2xpZW50L215c3FsdGVzdC5jCTIwMDktMDktMDkgMTg6NTI6
MTcgKzAwMDANCkBAIC0xNDA2LDcgKzE0MDYsNyBAQCB2b2lkIHNob3dfZGlmZihE
WU5BTUlDX1NUUklORyogZHMsDQogICBlbHNlDQogICAgIGRpZmZfbmFtZSA9IDA7
DQogI2Vsc2UNCi0gIGRpZmZfbmFtZSA9ICJkaWZmIjsgICAgICAgICAgIC8vIE90
aGVyd2lzZSBhbHdheXMgYXNzdW1lIGl0J3MgY2FsbGVkIGRpZmYNCisgIGRpZmZf
bmFtZSA9ICJkaWZmIjsgICAgICAgICAgIC8qIE90aGVyd2lzZSBhbHdheXMgYXNz
dW1lIGl0J3MgY2FsbGVkIGRpZmYgKi8NCiAjZW5kaWYNCiANCiAgIGlmIChkaWZm
X25hbWUpDQoNCj09PSBtb2RpZmllZCBmaWxlICdteXN5cy9teV90aHJfaW5pdC5j
Jw0KLS0tIGEvbXlzeXMvbXlfdGhyX2luaXQuYwkyMDA3LTA4LTE2IDE0OjI1OjQ4
ICswMDAwDQorKysgYi9teXN5cy9teV90aHJfaW5pdC5jCTIwMDktMDktMjQgMDY6
MzA6MzEgKzAwMDANCkBAIC0xMDcsMTAgKzEwNywxMSBAQCBteV9ib29sIG15X3Ro
cmVhZF9nbG9iYWxfaW5pdCh2b2lkKQ0KICAgICBwdGhyZWFkX2F0dHJfdCAgZHVt
bXlfdGhyZWFkX2F0dHI7DQogDQogICAgIHB0aHJlYWRfYXR0cl9pbml0KCZkdW1t
eV90aHJlYWRfYXR0cik7DQotICAgIHB0aHJlYWRfYXR0cl9zZXRkZXRhY2hzdGF0
ZSgmZHVtbXlfdGhyZWFkX2F0dHIsIFBUSFJFQURfQ1JFQVRFX0RFVEFDSEVEKTsN
CisgICAgcHRocmVhZF9hdHRyX3NldGRldGFjaHN0YXRlKCZkdW1teV90aHJlYWRf
YXR0ciwgUFRIUkVBRF9DUkVBVEVfSk9JTkFCTEUpOw0KIA0KLSAgICBwdGhyZWFk
X2NyZWF0ZSgmZHVtbXlfdGhyZWFkLCZkdW1teV90aHJlYWRfYXR0ciwNCi0gICAg
ICAgICAgICAgICAgICAgbnB0bF9wdGhyZWFkX2V4aXRfaGFja19oYW5kbGVyLCBO
VUxMKTsNCisgICAgaWYgKHB0aHJlYWRfY3JlYXRlKCZkdW1teV90aHJlYWQsJmR1
bW15X3RocmVhZF9hdHRyLA0KKyAgICAgICAgICAgICAgICAgICAgICAgbnB0bF9w
dGhyZWFkX2V4aXRfaGFja19oYW5kbGVyLCBOVUxMKSA9PSAwKQ0KKyAgICAgICh2
b2lkKXB0aHJlYWRfam9pbihkdW1teV90aHJlYWQsIE5VTEwpOw0KICAgfQ0KICNl
bmRpZiAvKiBUQVJHRVRfT1NfTElOVVggKi8NCiANCg0K

--Boundary_(ID_P7PIKj8zcoQRDTygLW/O4A)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/magnus.blaudd@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/magnus.blaudd@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped
# target_branch: file:///home/msvensson/mysql/5.0-bugteam/
# testament_sha1: e77e37389483d646fa1a61c5b435feb2bf71ba5e
# timestamp: 2009-09-28 14:40:29 +0200
# source_branch: file:///home/msvensson/mysql/5.0-bug42850/
# base_revision_id: joro@stripped
# 
# Begin bundle
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
tII0DiSY/xdyRThQkLCDLs4=


--Boundary_(ID_P7PIKj8zcoQRDTygLW/O4A)--