From: marko.makela
Date: May 11 2010 3:39pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3079)
List-Archive: http://lists.mysql.com/commits/107992
Message-Id: <201005111539.o4BE1MlE008668@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1969442387=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUxMTExNDQyMi00YmozdHRm
ODVqdXdvZzJqCgogMzA3OSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTExCiAgICAgIE1lcmdlIGZy
b20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgICAgcmV2bm86IDM0
NTYKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTEx
MDQ1MDAtYzZremQwYmc1czQycDhlOQogICAgICAgIHBhcmVudDogdmFzaWwuZGltb3ZAb3JhY2xl
LmNvbS0yMDEwMDUxMDEzMjg1Mi1jejQ1N3Vxdmo4aWl5OW1tCiAgICAgICAgY29tbWl0dGVyOiBN
YXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+CiAgICAgICAgYnJhbmNoIG5p
Y2s6IG15c3FsLTUuMS1pbm5vZGIyCiAgICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0wNS0xMSAx
Mzo0NTowMCArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICBSZW1vdmUgYSBzdHJheSBl
eHByZXNzaW9uLiBTcG90dGVkIGJ5IFN1bm55IEJhaW5zLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTB6aXAuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9wYWdlL3BhZ2UwemlwLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9w
YWdlMHppcC5jCTIwMTAtMDQtMTkgMTU6NDQ6MTUgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9wYWdlL3BhZ2UwemlwLmMJMjAxMC0wNS0xMSAxNTozOToxOSArMDAwMApAQCAtNTcxLDcgKzU3
MSw3IEBAIHBhZ2VfemlwX2Rpcl9lbmNvZGUoCiAJLyogVHJhdmVyc2UgdGhlIGxpc3Qgb2Ygc3Rv
cmVkIHJlY29yZHMgaW4gdGhlIGNvbGxhdGlvbiBvcmRlciwKIAlzdGFydGluZyBmcm9tIHRoZSBm
aXJzdCB1c2VyIHJlY29yZC4gKi8KIAotCXJlYyA9IHBhZ2UgKyBQQUdFX05FV19JTkZJTVVNLCBU
UlVFOworCXJlYyA9IHBhZ2UgKyBQQUdFX05FV19JTkZJTVVNOwogCiAJaSA9IDA7CiAKCg==

--===============1969442387==
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/mysql/5.5-innodb/
# testament_sha1: 018155b4870bc3491f31b2e75f3cec233c0e2b81
# timestamp: 2010-05-11 18:39:28 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   4bj3ttf85juwog2j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdzPe48AAgRfgEAwW2v//3Oj
XoC////wUAR48D3MOgGi7VhJU00jFPKaeKbU201Q/VD1BoAADQDTQ5gEwEyMAIxMTCYTBDTE0wGm
pomhR4p+qMxT00mgBoAAPJpPUAEkkyapt6qep+qDagDTQA0ADQAaMgSSCCYTAmiaYmBEymwFGhtR
oaaKEoc5a66bbDfIO6uOV90UsuezZSYFJDmqmVoAtWJVeYIqATh3jO7KNtSSL/ZMWxiObLBxLmsk
/ag/e32rLR6mhzTqgFiY95zPbfjzvaSl7LlDCJNGFldtIhEtVZWdAHGDgOgfD/sTn9n9H0NRgujL
5lWkLeEqRWHNUE3cE88aA0RF2circ8g8na29XoVYckEl5JPvl80SSjEonJ1TPe7Xutrhc+IxMChA
FsB8DlEOco7cTS6YJEwRhkmXPprJgvUVcszDmrH6mSLY8qPJz1mYIiGFWWzBJGEKYxp6HtOJvUyZ
5Z8rRPdKOBio3Vl+OSuvsZIaC8ghVmL1VQ4zBH1CIYegDxyQx9pptHOINO7RJSceBS9KMDTCgqrQ
4iwtN4XQpJyElEypUZOYMjHnYpxtWqyBplLDKXpZxfrX0uNeEp3VtSMnFhtC5iLFcosYWjLwdMoV
VybttxO0g4kM5OYW0mwLs5ClTlwfhKWkIFmy1w8L7iszDFCixplpyleE+hYkQpoTGaZwUm85Vm+O
28JhZ2vE7VQShbSQvp4XVd/S27z8rNee691j1tsWCjKYBGEkDzoiMwxw9zBhcWNmi/BzrpxsYecR
zHH5nV3vi4kexaRTnGklCE1wiBILoXLrwLkTVh+Rj7xZCxzW9ZTRP/rWdeQ5mBsvaGpp3h4G0OJi
eiD34cEKtyVSeHy+qD9rSwijPvnSxJkHAGUmbneHcO8DEwIkDEJDo5VZbvdO7+0NTigMs4e3gFh7
AxaH4lOuVy6njITUIVZGo25/IqMyesh2ZL1CcKfQKDQVhJ+lm3i8GEmX5+xc7bCzDePK8TlQQDlx
htoOEPdI+7i5MjbnnOnbqCpbDPeszEjhHZOoYUhu1DjjxHmBMmCQ0lZ/HGomFhreHPlvVfLBkKXI
X8ms59hrE2sGqZbhViuWmsqMY+Qomsx31BqCKiGVQVfShaPvrjLOLWEUotQQKm4Z3rEwcniuM0X2
VoN8TgvSHcT4LAsT0Dp0JlN37y6N/AS8EGc07D8k1qpIP661mPrQPCyY5GvxFQSSnWwDyEqIhBnb
44wBpeoN0KUMyGT38Eh4nou+E2SSgI3vR9kLoE652KplqJUbmEZWeiHsHvvVmMoCjTm1TTEXhkJM
r3A6AwIuzclaVLdTE1GVTOTmkOrNiNgVkmJQUDBu9oDNatD2JjMHURZJ8i04kwpgrYnfR4naQH65
aM6vFcFTARVYTTM7EWUqHWonV/XVblmPGuVwr0Zx+dWzYoPGh3CkUOCgE2/Tbk04snv1QG6Sd0p1
x5neqXf4u5IpwoSG5nvceA==


--===============1969442387==--