From: Magne Mahre
Date: November 20 2009 1:10pm
Subject: bzr commit into mysql-5.6-next-mr branch (magne.mahre:2924) Bug#6063
 Bug#7088
List-Archive: http://lists.mysql.com/commits/91082
X-Bug: 6063,7088
Message-Id: <0KTE004XESLKN5Q0@bgo1sminn1.broadpark.no>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_CELmyF24wsCau8rhaIdi1A)"

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

I0F0IGZpbGU6Ly8vZGF0YS96L215c3FsLW5leHQtbXItcnVudGltZS8gYmFzZWQgb24gcmV2aWQ6
ZGF2aS5hcm5hdXRAc3VuLmNvbS0yMDA5MTExOTIzNDgwOC14Ympwa3dheGp0NXg1YzBiCgogMjky
NCBNYWduZSBNYWhyZQkyMDA5LTExLTIwCiAgICAgIEVuYWJsZSB0ZXN0IGNhc2VzIGZvciBCdWcj
NjA2MyBhbmQgQnVnIzcwODguCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9zcC5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L3NwLnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs
LXRlc3Qvci9zcC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9zcC5yZXN1bHQJMjAwOS0xMS0x
OSAyMzo0ODowOCArMDAwMAorKysgYi9teXNxbC10ZXN0L3Ivc3AucmVzdWx0CTIwMDktMTEtMjAg
MTM6MTA6MjAgKzAwMDAKQEAgLTMzMjEsOSArMzMyMSw0MyBAQCBjYWxsIGJ1ZzExNTI5KCl8CiBj
YWxsIGJ1ZzExNTI5KCl8CiBkZWxldGUgZnJvbSB0MXwKIGRyb3AgcHJvY2VkdXJlIGJ1ZzExNTI5
fAorc2V0IGNoYXJhY3RlciBzZXQgdXRmOHwKIGRyb3AgcHJvY2VkdXJlIGlmIGV4aXN0cyBidWc2
MDYzfAogZHJvcCBwcm9jZWR1cmUgaWYgZXhpc3RzIGJ1ZzcwODhfMXwKIGRyb3AgcHJvY2VkdXJl
IGlmIGV4aXN0cyBidWc3MDg4XzJ8CitjcmVhdGUgcHJvY2VkdXJlIGJ1ZzYwNjMoKQorYmVnaW4K
K2zDomJlbDogYmVnaW4gZW5kOworbGFiZWw6IGJlZ2luIGVuZDsKK2xhYmVsMTogYmVnaW4gZW5k
OworZW5kfAorY3JlYXRlIHByb2NlZHVyZSBidWc3MDg4XzEoKQorbGFiZWwxOiBiZWdpbiBlbmQg
bGFiZWwxfAorY3JlYXRlIHByb2NlZHVyZSBidWc3MDg4XzIoKQorbMOkYmVsMTogYmVnaW4gZW5k
fAorY2FsbCBidWc2MDYzKCl8CitjYWxsIGJ1ZzcwODhfMSgpfAorY2FsbCBidWc3MDg4XzIoKXwK
K3NldCBjaGFyYWN0ZXIgc2V0IGRlZmF1bHR8CitzaG93IGNyZWF0ZSBwcm9jZWR1cmUgYnVnNjA2
M3wKK1Byb2NlZHVyZQlzcWxfbW9kZQlDcmVhdGUgUHJvY2VkdXJlCWNoYXJhY3Rlcl9zZXRfY2xp
ZW50CWNvbGxhdGlvbl9jb25uZWN0aW9uCURhdGFiYXNlIENvbGxhdGlvbgorYnVnNjA2MwkJQ1JF
QVRFIERFRklORVI9YHJvb3RgQGBsb2NhbGhvc3RgIFBST0NFRFVSRSBgYnVnNjA2M2AoKQorYmVn
aW4KK2zvv71sOiBiZWdpbiBlbmQ7CitsYWJlbDogYmVnaW4gZW5kOworbGFiZWwxOiBiZWdpbiBl
bmQ7CitlbmQJdXRmOAlsYXRpbjFfc3dlZGlzaF9jaQlsYXRpbjFfc3dlZGlzaF9jaQorc2hvdyBj
cmVhdGUgcHJvY2VkdXJlIGJ1ZzcwODhfMXwKK1Byb2NlZHVyZQlzcWxfbW9kZQlDcmVhdGUgUHJv
Y2VkdXJlCWNoYXJhY3Rlcl9zZXRfY2xpZW50CWNvbGxhdGlvbl9jb25uZWN0aW9uCURhdGFiYXNl
IENvbGxhdGlvbgorYnVnNzA4OF8xCQlDUkVBVEUgREVGSU5FUj1gcm9vdGBAYGxvY2FsaG9zdGAg
UFJPQ0VEVVJFIGBidWc3MDg4XzFgKCkKK2xhYmVsMTogYmVnaW4gZW5kIGxhYmVsMQl1dGY4CWxh
dGluMV9zd2VkaXNoX2NpCWxhdGluMV9zd2VkaXNoX2NpCitzaG93IGNyZWF0ZSBwcm9jZWR1cmUg
YnVnNzA4OF8yfAorUHJvY2VkdXJlCXNxbF9tb2RlCUNyZWF0ZSBQcm9jZWR1cmUJY2hhcmFjdGVy
X3NldF9jbGllbnQJY29sbGF0aW9uX2Nvbm5lY3Rpb24JRGF0YWJhc2UgQ29sbGF0aW9uCitidWc3
MDg4XzIJCUNSRUFURSBERUZJTkVSPWByb290YEBgbG9jYWxob3N0YCBQUk9DRURVUkUgYGJ1Zzcw
ODhfMmAoKQorbO+/vWwxOiBiZWdpbiBlbmQJdXRmOAlsYXRpbjFfc3dlZGlzaF9jaQlsYXRpbjFf
c3dlZGlzaF9jaQorZHJvcCBwcm9jZWR1cmUgYnVnNjA2M3wKK2Ryb3AgcHJvY2VkdXJlIGJ1Zzcw
ODhfMXwKK2Ryb3AgcHJvY2VkdXJlIGJ1ZzcwODhfMnwKIGRyb3AgcHJvY2VkdXJlIGlmIGV4aXN0
cyBidWc5NTY1X3N1YnwKIGRyb3AgcHJvY2VkdXJlIGlmIGV4aXN0cyBidWc5NTY1fAogY3JlYXRl
IHByb2NlZHVyZSBidWc5NTY1X3N1YigpCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC90
L3NwLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9zcC50ZXN0CTIwMDktMTEtMTkgMjM6NDg6MDgg
KzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L3NwLnRlc3QJMjAwOS0xMS0yMCAxMzoxMDoyMCArMDAw
MApAQCAtNDA2MSwzNCArNDA2MSw0MSBAQCBkcm9wIHByb2NlZHVyZSBidWcxMTUyOXwKICMgQlVH
IzYwNjM6IFN0b3JlZCBwcm9jZWR1cmUgbGFiZWxzIGFyZSBzdWJqZWN0IHRvIHJlc3RyaWN0aW9u
cyAocGFydGlhbCkKICMgQlVHIzcwODg6IFN0b3JlZCBwcm9jZWR1cmVzOiBsYWJlbHMgd29uJ3Qg
d29yayBpZiBjaGFyYWN0ZXIgc2V0IGlzIHV0ZjgKICMKKworc2V0IGNoYXJhY3RlciBzZXQgdXRm
OHwKKwogLS1kaXNhYmxlX3dhcm5pbmdzCiBkcm9wIHByb2NlZHVyZSBpZiBleGlzdHMgYnVnNjA2
M3wKIGRyb3AgcHJvY2VkdXJlIGlmIGV4aXN0cyBidWc3MDg4XzF8CiBkcm9wIHByb2NlZHVyZSBp
ZiBleGlzdHMgYnVnNzA4OF8yfAogLS1lbmFibGVfd2FybmluZ3MKIAotLS1kaXNhYmxlX3BhcnNp
bmcgIyB0ZW1wb3JhcmlseSBkaXNhYmxlZCB1bnRpbCBCYXIgZml4ZXMgQlVHIzExOTg2CiBjcmVh
dGUgcHJvY2VkdXJlIGJ1ZzYwNjMoKQotICBsw6JiZWw6IGJlZ2luIGVuZHwKLWNhbGwgYnVnNjA2
MygpfAotIyBRUSBLbm93biBidWc6IHRoaXMgd2lsbCBub3Qgc2hvdyB0aGUgbGFiZWwgY29ycmVj
dGx5Lgotc2hvdyBjcmVhdGUgcHJvY2VkdXJlIGJ1ZzYwNjN8CitiZWdpbgorICBsw6JiZWw6IGJl
Z2luIGVuZDsKKyAgbGFiZWw6IGJlZ2luIGVuZDsKKyAgbGFiZWwxOiBiZWdpbiBlbmQ7CitlbmR8
CiAKLXNldCBjaGFyYWN0ZXIgc2V0IHV0Zjh8CiBjcmVhdGUgcHJvY2VkdXJlIGJ1ZzcwODhfMSgp
CiAgIGxhYmVsMTogYmVnaW4gZW5kIGxhYmVsMXwKKwogY3JlYXRlIHByb2NlZHVyZSBidWc3MDg4
XzIoKQogICBsw6RiZWwxOiBiZWdpbiBlbmR8CisKK2NhbGwgYnVnNjA2MygpfAogY2FsbCBidWc3
MDg4XzEoKXwKIGNhbGwgYnVnNzA4OF8yKCl8CisKIHNldCBjaGFyYWN0ZXIgc2V0IGRlZmF1bHR8
CisKK3Nob3cgY3JlYXRlIHByb2NlZHVyZSBidWc2MDYzfAogc2hvdyBjcmVhdGUgcHJvY2VkdXJl
IGJ1ZzcwODhfMXwKIHNob3cgY3JlYXRlIHByb2NlZHVyZSBidWc3MDg4XzJ8CiAKIGRyb3AgcHJv
Y2VkdXJlIGJ1ZzYwNjN8CiBkcm9wIHByb2NlZHVyZSBidWc3MDg4XzF8CiBkcm9wIHByb2NlZHVy
ZSBidWc3MDg4XzJ8Ci0tLWVuYWJsZV9wYXJzaW5nCiAKICMKICMgQlVHIzk1NjU6ICJXcm9uZyBs
b2NraW5nIGluIHN0b3JlZCBwcm9jZWR1cmUgaWYgYSBzdWItc2VxdWVudCBwcm9jZWR1cmUKCg==

--Boundary_(ID_CELmyF24wsCau8rhaIdi1A)
MIME-version: 1.0
Content-type: text/bzr-bundle; charset=us-ascii;
 name="bzr/magne.mahre@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/magne.mahre@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magne.mahre@stripped
# target_branch: file:///data/z/mysql-next-mr-runtime/
# testament_sha1: 321bd582972ff9b2541512de26d22d0327778e9b
# timestamp: 2009-11-20 14:10:32 +0100
# source_branch: file:///data/z/mysql-6.0-codebase-bugfixing/
# base_revision_id: davi.arnaut@stripped\
#   xbjpkwaxjt5x5c0b
# 
# Begin bundle
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


--Boundary_(ID_CELmyF24wsCau8rhaIdi1A)--