From: Magnus Blåudd
Date: October 19 2009 8:41pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3136)
List-Archive: http://lists.mysql.com/commits/87378
Message-Id: <20091019204114.8F63313405D@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_7ltVczf56+/3u3sHHaIaVg)"

--Boundary_(ID_7ltVczf56+/3u3sHHaIaVg)
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-transfer-encoding: BASE64
Content-disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvYnVnMzc5ODMvNy4wLyBi
YXNlZCBvbiByZXZpZDptYWdudXMuYmxhdWRkQHN1bi5jb20tMjAwOTEwMTkxMTU2
NTctd2tvZ201Nnpzdml2c3d3bA0KDQogMzEzNiBNYWdudXMgQmzDpXVkZAkyMDA5
LTEwLTE5IFttZXJnZV0NCiAgICAgIE1lcmdlDQoNCiAgICBhZGRlZDoNCiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvbmRiX3RlYW0vdC9idWczNzk4My5jbmYNCiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvbmRiX3RlYW0vdC9idWczNzk4My50ZXN0DQo9PT0g
YWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9uZGJfdGVhbS90L2J1ZzM3OTgz
LmNuZicNCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvbmRiX3RlYW0vdC9idWczNzk4
My5jbmYJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMA0KKysrIGIvbXlzcWwtdGVz
dC9zdWl0ZS9uZGJfdGVhbS90L2J1ZzM3OTgzLmNuZgkyMDA5LTEwLTE5IDIwOjIw
OjM5ICswMDAwDQpAQCAtMCwwICsxLDE5IEBADQorIWluY2x1ZGUgaW5jbHVkZS9k
ZWZhdWx0X215c3FsZC5jbmYNCishaW5jbHVkZSBpbmNsdWRlL2RlZmF1bHRfbmRi
ZC5jbmYNCisNCitbY2x1c3Rlcl9jb25maWddDQorRGF0YU1lbW9yeT0gICAgICAg
ICAgICAgICAgICAgIDUwME0NCitJbmRleE1lbW9yeT0gICAgICAgICAgICAgICAg
ICAgNTBNDQorRnJhZ21lbnRMb2dGaWxlU2l6ZT0gICAgICAgICAgIDI1Nk0NCitS
ZWRvQnVmZmVyPSAgICAgICAgICAgICAgICAgICAgMzJNDQorDQorW2NsdXN0ZXJf
Y29uZmlnLjFdDQorTm9PZlJlcGxpY2FzPSAgICAgICAgICAgICAgICAgIDINCitu
ZGJkPSwNCituZGJfbWdtZD0NCitteXNxbGQ9DQorDQorW215c3FsZF0NCisjIE1h
a2UgYWxsIG15c3FsZHMgdXNlIGNsdXN0ZXINCituZGJjbHVzdGVyDQorDQoNCj09
PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL25kYl90ZWFtL3QvYnVnMzc5
ODMudGVzdCcNCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvbmRiX3RlYW0vdC9idWcz
Nzk4My50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDANCisrKyBiL215c3Fs
LXRlc3Qvc3VpdGUvbmRiX3RlYW0vdC9idWczNzk4My50ZXN0CTIwMDktMTAtMTkg
MjA6MjA6MzkgKzAwMDANCkBAIC0wLDAgKzEsMzcgQEANCitzb3VyY2UgaW5jbHVk
ZS9oYXZlX25kYi5pbmM7DQorDQorQ1JFQVRFIFRBQkxFIGB0MWAgKA0KK2BjMWAg
aW50KDExKSBOT1QgTlVMTCBBVVRPX0lOQ1JFTUVOVCwNCitgYzNgIHRleHQsDQor
UFJJTUFSWSBLRVkgKGBjMWApIFVTSU5HIEJUUkVFDQorKSBFTkdJTkU9bmRiY2x1
c3RlciBERUZBVUxUIENIQVJTRVQ9dXRmODsNCisNCitkaXNhYmxlX3F1ZXJ5X2xv
ZzsNCitsZXQgJGk9MTAwMDsNCit3aGlsZSAoJGkpDQorew0KKyAgbGV0ICRqID0g
MjAwOw0KKyAgbGV0ICRzZXBhcmF0b3IgPSA7DQorICBsZXQgJHNxbCA9IElOU0VS
VCB0MSAoYzMpIFZBTFVFUzsNCisgIHdoaWxlKCRqKQ0KKyAgew0KKyAgICBsZXQg
JHNxbD0kc3FsJHNlcGFyYXRvcihSRVBFQVQoJ2tzODcnLCA1MTIqUkFORCgpKSk7
DQorICAgIGRlYyAkajsNCisgICAgbGV0ICRzZXBhcmF0b3IgPSAsOw0KKyAgfQ0K
KyAgZXZhbCAkc3FsOw0KKyAgZGVjICRpOw0KK30NCitlbmFibGVfcXVlcnlfbG9n
Ow0KKw0KK3NlbGVjdCBjb3VudCgqKSBmcm9tIHQxOw0KKw0KK3NldCBAc3RhcnQg
PSBub3coKTsNCitzZWxlY3QgQkVOQ0hNQVJLKDUsIChzZWxlY3QgY291bnQoKikg
ZnJvbSB0MSB3aGVyZSBsZW5ndGgoYzMpIDwgMjU2KSk7DQorc2V0IEBlbmQgPSBu
b3coKTsNCitzZWxlY3QgVElNRVNUQU1QRElGRihNSUNST1NFQ09ORCwgQHN0YXJ0
LCBAZW5kKTsNCitzZWxlY3QgVElNRURJRkYoQGVuZCwgQHN0YXJ0KTsNCisNCitk
cm9wIHRhYmxlIHQxOw0KKw0KK2V4aXQ7DQoNCg==

--Boundary_(ID_7ltVczf56+/3u3sHHaIaVg)
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/bug37983/7.0/
# testament_sha1: a452ca0d0ff5471d7409d01d1294ec34645b1c1e
# timestamp: 2009-10-19 22:41:13 +0200
# source_branch: file:///home/msvensson/mysql/bug37983/6.3/
# base_revision_id: magnus.blaudd@stripped\
#   wkogm56zsvivswwl
# 
# Begin bundle
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


--Boundary_(ID_7ltVczf56+/3u3sHHaIaVg)--