From: marko.makela
Date: February 17 2011 7:57am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3710 to 3711) Bug#60049
List-Archive: http://lists.mysql.com/commits/131554
X-Bug: 60049
Message-Id: <201102170757.p1H6LBeM002159@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1184910956=="

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

IDM3MTEgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNwogICAgICBEaXNhYmxlIHRoZSBCdWcgIzYw
MDQ5IHRlc3Qgb24gZW1iZWRkZWQsIGFzIGl0IHJlcXVpcmVzIHNlcnZlciByZXN0YXJ0LgoKICAg
IG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0
OS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc2
MDA0OS50ZXN0CiAzNzEwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMTYKICAgICAgTWFrZSB0aGUg
aW1wbGljaXQgdW5wYWNrIHBhcmFtZXRlciBleHBsaWNpdCBpbiB0aGUgQnVnICM2MDA0OSB0ZXN0
LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9i
dWc2MDA0OS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9k
Yl9idWc2MDA0OS50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYl9idWc2MDA0OS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYl9idWc2MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MjE2MTMzNDE2LW9pZXU3ZG1jeTlqbG9uNzcKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGJfYnVnNjAwNDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDIxNzA3NDUwNy1obzltMWVqamw0czd1eHpkCkBAIC0yLDYgKzIsNyBAQAogIyBUaGlzIHRlc3Qg
cmVxdWlyZXMgYSBmcmVzaCBzZXJ2ZXIgc3RhcnQtdXAgYW5kIGEgc2xvdyBzaHV0ZG93bi4KICMg
VGhpcyB3YXMgYSBzdXNwZWN0ZWQgYnVnIChub3QgYSBidWcpLgogCistLSBzb3VyY2UgaW5jbHVk
ZS9ub3RfZW1iZWRkZWQuaW5jCiAtLSBzb3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYi5pbmMKIAog
Q1JFQVRFIFRBQkxFIHQoYSBJTlQpRU5HSU5FPUlubm9EQjsKCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNjAwNDkudGVzdCcKLS0t
IGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTYxMzM0MTYtb2lldTdkbWN5OWps
b243NworKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNjAw
NDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNzA3NDUwNy1obzlt
MWVqamw0czd1eHpkCkBAIC0yLDYgKzIsNyBAQAogIyBUaGlzIHRlc3QgcmVxdWlyZXMgYSBmcmVz
aCBzZXJ2ZXIgc3RhcnQtdXAgYW5kIGEgc2xvdyBzaHV0ZG93bi4KICMgVGhpcyB3YXMgYSBzdXNw
ZWN0ZWQgYnVnIChub3QgYSBidWcpLgogCistLSBzb3VyY2UgaW5jbHVkZS9ub3RfZW1iZWRkZWQu
aW5jCiAtLSBzb3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYl9wbHVnaW4uaW5jCiAKIENSRUFURSBU
QUJMRSB0KGEgSU5UKUVOR0lORT1Jbm5vREI7Cgo=

--===============1184910956==
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:57:34 +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==


--===============1184910956==--