From: marko.makela
Date: February 17 2011 8:25pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3713) Bug#60049
List-Archive: http://lists.mysql.com/commits/131580
X-Bug: 60049
Message-Id: <201102172025.p1HI9Xpg029128@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0950054501=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjE3MTcwOTUzLTk1Mnhi
dTQ1d3cxcnBsNDYKCiAzNzEzIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMTcKICAgICAgQWxsb3cg
MzAgc2Vjb25kcyBmb3Igc2xvdyBzaHV0ZG93biBpbiB0aGUgQnVnICM2MDA0OSB0ZXN0LgoKICAg
IG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0
OS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc2
MDA0OS50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lu
bm9kYl9idWc2MDA0OS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9k
Yl9idWc2MDA0OS50ZXN0CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAyMTcxNzA5
NTMtOTUyeGJ1NDV3dzFycGw0NgorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9k
Yl9idWc2MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE3MjAy
NTMzLWcyMGlmd2dkcGM2NGNka3gKQEAgLTEzLDcgKzEzLDcgQEAgbGV0ICRNWVNRTERfREFUQURJ
Uj1gc2VsZWN0IEBAZGF0YWRpcmA7CiAKICMgU2h1dCBkb3duIHRoZSBzZXJ2ZXIKIC0tIGV4ZWMg
ZWNobyAid2FpdCIgPiAkTVlTUUxURVNUX1ZBUkRJUi90bXAvbXlzcWxkLjEuZXhwZWN0Ci0tLSBz
aHV0ZG93bl9zZXJ2ZXIgMTAKKy0tIHNodXRkb3duX3NlcnZlciAzMAogLS0gc291cmNlIGluY2x1
ZGUvd2FpdF91bnRpbF9kaXNjb25uZWN0ZWQuaW5jCiAKICMgQ2hlY2sgdGhlIHRhaWwgb2YgSURf
SU5EIChTWVNfVEFCTEVTLklEKQoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc2MDA0OS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1
aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNjAwNDkudGVzdAlyZXZpZDp2YXNpbC5kaW1v
dkBvcmFjbGUuY29tLTIwMTEwMjE3MTcwOTUzLTk1MnhidTQ1d3cxcnBsNDYKKysrIGIvbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTcyMDI1MzMtZzIwaWZ3Z2RwYzY0Y2RreApAQCAt
MTMsNyArMTMsNyBAQCBsZXQgJE1ZU1FMRF9EQVRBRElSPWBzZWxlY3QgQEBkYXRhZGlyYDsKIAog
IyBTaHV0IGRvd24gdGhlIHNlcnZlcgogLS0gZXhlYyBlY2hvICJ3YWl0IiA+ICRNWVNRTFRFU1Rf
VkFSRElSL3RtcC9teXNxbGQuMS5leHBlY3QKLS0tIHNodXRkb3duX3NlcnZlciAxMAorLS0gc2h1
dGRvd25fc2VydmVyIDMwCiAtLSBzb3VyY2UgaW5jbHVkZS93YWl0X3VudGlsX2Rpc2Nvbm5lY3Rl
ZC5pbmMKIAogIyBDaGVjayB0aGUgdGFpbCBvZiBJRF9JTkQgKFNZU19UQUJMRVMuSUQpCgo=

--===============0950054501==
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: 78bbd9320330787fc0855cb70604438ed7a5475f
# timestamp: 2011-02-17 22:25:42 +0200
# base_revision_id: vasil.dimov@stripped\
#   952xbu45ww1rpl46
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQECGCAAAh1flAAQWGP/93IC
AAC////wBAAIAFAEU8dFCcZUQHhJSCNHppA9U21Tynpqemk9Mo00AaBKmqbJPUeo8UyNAaAAADQB
Kak2pip5qnqHqNGDUAHqAA0CJAAA0AAAAAABJEQBHomTTIAmKQbakz1JoLJQ4Q5VEIxmaoWPncCp
CcrtW2SsvZYgaSAiCBz3qPC5UBxaQ7lTFsMh940Ieu3zpGYeihz8wu2wJZfGl+BF7OJv2eQgwjoV
yOJst9MHtCrORwvWIwHQxpxifeWlPXKfUJe1XzSKBbTca7KSomSG1uyuSzMfY8RkBIdIKSADkAHN
5qvDEYrnmmiYlrIjNAmjKMB5OpgIk5eBTT37HJIzrcwETrmce8UgeFENl3h7/xNrHD7L81z4laGB
jamSH246HjELSgyx+Cjt5UCbhKrhcwgYDkdwI7g3shSGPztHAmu5mGLIlVlwWybb+oLCgxHgrUiS
sKEQMB5WtkIvnUgWtQyIuz3aLCAi6TcC06q2KnkxsV3FQ1G22DCpIrBPcTgWXlRMTZ1FhgOb6SRS
FuuNYsgLVPWOapQqHZPqCVAYfPAWfHDirwMLrgxkSpG2NooFyKGWjINsSiFlRNZSFRQWn8BzKK9W
Yys01lR1hEoNhOxpKN1RHod3LZxkqjeVEOjHnaDYYyqRNB3H5be4cq31yZRT4NWxrYApJ2mxKasb
NtmfSUEcZ4CbX7HRqNzJgyvokyS+3RyRQFGT0ESLsZCQO6MVxusLEiHaB54iVD+VZslRBIwvHj5X
D2uS/dKRWmLmYeO+BvbAlFLyrzRmeXOWdV2FclZoMR5E8DAnowHc7znreB00l9t2tjBKB6EqfJ/W
Xms2FdgfScHyijcBqMDuXGavUwHlegLK6937m/wOAdSEsCTRN8U5a95UZy5J7TOh0NtL7HM13cin
VMcdVTI/qI9wWSxTAzREIad3BhwqikzVI5johjia+B5NDMaUUWrmfo7Hyb2Xm9qAMLzoBEK0BoqN
8IoCeQn4NJVgbUZiyZpumyQzNSqwGqApCRUlqHT5HVjGN/PB+dyOKKrozJ5jQehWWJH33oqBUgXK
YLVoHIdIkpRokwG7O1+RTV7egr8IX2LRn9JGZxOKYfhtXyWEcDhW6jFVQ+jTIc6k8URGwgOByAvE
7Ay+OwLodycC7I7bklUhvrMV/6JeUOuzq/JWHwnx3MMEAIKbGxVdKMun95qmp1e6QeopU95L4p8z
gqVhCX8qeZhlhA+pRdPZqrGvYcgrVoiBSWMTbKkFKGi9NZ1YOLQc7BDJPqp8Ct3sDNVhpqLEWhBg
evhotntxTRbsvksVirVhijdMeFIvJi0CZe15S9JtZOjMTFLZSoMIQeEhr8A+vxdyRThQkAECGCA=


--===============0950054501==--