From: marko.makela
Date: February 17 2011 7:45am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3711) Bug#60049
List-Archive: http://lists.mysql.com/commits/131501
X-Bug: 60049
Message-Id: <201102170745.p1H7dqRK027598@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0737538794=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNjEzMzQxNi1vaWV1
N2RtY3k5amxvbjc3CgogMzcxMSBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTE3CiAgICAgIERpc2Fi
bGUgdGhlIEJ1ZyAjNjAwNDkgdGVzdCBvbiBlbWJlZGRlZCwgYXMgaXQgcmVxdWlyZXMgc2VydmVy
IHJlc3RhcnQuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3Qv
aW5ub2RiX2J1ZzYwMDQ5LnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTAyMTYxMzM0MTYtb2lldTdkbWN5OWpsb243NworKysgYi9teXNxbC10ZXN0L3N1aXRl
L2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTEwMjE3MDc0NTA3LWhvOW0xZWpqbDRzN3V4emQKQEAgLTIsNiArMiw3IEBACiAjIFRo
aXMgdGVzdCByZXF1aXJlcyBhIGZyZXNoIHNlcnZlciBzdGFydC11cCBhbmQgYSBzbG93IHNodXRk
b3duLgogIyBUaGlzIHdhcyBhIHN1c3BlY3RlZCBidWcgKG5vdCBhIGJ1ZykuCiAKKy0tIHNvdXJj
ZSBpbmNsdWRlL25vdF9lbWJlZGRlZC5pbmMKIC0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2Ri
LmluYwogCiBDUkVBVEUgVEFCTEUgdChhIElOVClFTkdJTkU9SW5ub0RCOwoKPT09IG1vZGlmaWVk
IGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc2MDA0OS50
ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNjAw
NDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNjEzMzQxNi1vaWV1
N2RtY3k5amxvbjc3CisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9k
Yl9idWc2MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE3MDc0
NTA3LWhvOW0xZWpqbDRzN3V4emQKQEAgLTIsNiArMiw3IEBACiAjIFRoaXMgdGVzdCByZXF1aXJl
cyBhIGZyZXNoIHNlcnZlciBzdGFydC11cCBhbmQgYSBzbG93IHNodXRkb3duLgogIyBUaGlzIHdh
cyBhIHN1c3BlY3RlZCBidWcgKG5vdCBhIGJ1ZykuCiAKKy0tIHNvdXJjZSBpbmNsdWRlL25vdF9l
bWJlZGRlZC5pbmMKIC0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiX3BsdWdpbi5pbmMKIAog
Q1JFQVRFIFRBQkxFIHQoYSBJTlQpRU5HSU5FPUlubm9EQjsKCg==

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# testament_sha1: e7025533c80da2a7327fc7b7b397c4cc535e3602
# timestamp: 2011-02-17 09:45:21 +0200
# base_revision_id: marko.makela@stripped\
#   oieu7dmcy9jlon77
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfxAfE4AAhlflAAQWGf/91YC
AAC////wBAAIAFAEPulB1WXKKtaOEkkSeI0PUMJoyHqBNPSAGmgJSpkabTKegaIGhpoAAAASJChp
onpqZNHqekaAPUAGg0GAAAAAGg0AaAaASSCaYSGQyU8RgimnqP1IekaBU0XU89zLLLK9EDVvqCkQ
JM/fBzve/WYFRkwx5wR8TxVtxcO9hIjfhqurkef7xyN1pZugiIUuczyC7HtwxoNDKxKHsh7IPUm+
xxHU8sHyhUORzxPUDSWOR+8ka9Jz578BKuw5CUhbh5rpILRSNbdByklFY/ccxoCRCQdrOk156NpM
NAFqBmWHGLIvYZfWZdjJRYugagL+OHOxexa+iAgdPkw8QSBz5P3axpj2RU/gPK+88wmhkLbty9sh
+biqfu29gOjD+nU+lGEG9APnWzI4EK/1fkmgXKaZGKHo0cY2uIpripqU4l5qgOIEjgXhryhKaIq2
FQNIw5ECP840gwsCgyhyuOTpnEDIfcBrFBCtpChO4kL4DWXCUgcxBvDSJLipKVEKDpoqLrpYmRsO
hucES/NrysEDWA04OgBv9H6+6JBlqaD94mRZUhjQcS7BD2MjtqiHPIoeXLBRGqSeEgUPHe2wdIZB
V1B1mzJ6UM2NctQxNiZE36ke4H3SqyAsb1VaHS0VsljgHjdFkRjyPBbMLCoZrLxrq9jbcJYso029
1fZNxcLOTM0EI290gYuK2gxxv5iX+uKE/j6iU89CMEbhL3/MxMY4GGeCX4oJSUOXM42vmKWNkYoi
uVRYLPwWctSgQGOBRjjyG82mk6XT2vZhJx0OolnoRcbmTejDiuqFhEY6igyBIGgjQDHiWW0qVWG3
qpIpTPwZjcd44AqPvvIhy6xlBbc8wmjfiTpzCjl1e96jVezXoaOvga3ygTZYNm+XHqkufI5LumRK
6ayfjBpIW4EmidEhyIESI9qy6t2/SaypNOuxyKjUx4vbnzGFiFk0UupFnKZrrwMjYiJylUxlzQ12
KOSzE83dxj1Rhb7H2Zmr+ONElKLO+9GOKGAvqOjwPMDgjYbhLtai5JSBIBVFXiDwfFBJwU27NCiP
ml5Ip1QtgEBneglyI2GxMi/Sql0I3mYxaTlzTmq6TSLyCjSk9MhwHIDUWE9gZduqS9APJIDHM6WR
oktdSKGV8h+iXFGRdHKc0QK562GByjql24M0v3WSMD5kg7zIpWyavdy7U8SSVFk/ZCMWZOd8H6AS
tjHC2TlYuQxIO1xtvESQ0XWpNjqwZ/SOwedgiNKdvAubgZpzpYoioPYHU5akbKn34i4Xyax+oFVZ
aFMYwfLC0hUBAjK0LK1MMADki4/hvn+LuSKcKEh+ID4nAA==


--===============0737538794==--