From: marko.makela
Date: April 21 2010 9:40am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3409) Bug#50495
List-Archive: http://lists.mysql.com/commits/106211
X-Bug: 50495
Message-Id: <201004210940.o3L9ejOV009388@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2010942437=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjEwOTE2MTEtdXU0Nml5
Z212NXNpempydQoKIDM0MDkgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICBBZGp1c3Qg
dGVzdHMgZm9yIHRoZSBCdWcgIzUwNDk1IGZpeC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiLXppcC5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiLXppcC50ZXN0CiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWczNjE2OS50ZXN0Cj09PSBtb2RpZmll
ZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItemlwLnJlc3Vs
dCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiLXppcC5yZXN1
bHQJMjAxMC0wNC0wOSAxMjo1Njo1MSArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9k
Yl9wbHVnaW4vci9pbm5vZGItemlwLnJlc3VsdAkyMDEwLTA0LTIxIDA5OjQwOjMyICswMDAwCkBA
IC0xMjcsNiArMTI3LDEyIEBAIENSRUFURSBUQUJMRSB0MSgKIGMgVEVYVCBOT1QgTlVMTCwgZCBU
RVhUIE5PVCBOVUxMLAogUFJJTUFSWSBLRVkgKGMoNzY3KSxkKDc2NykpKQogRU5HSU5FPUlubm9E
QiBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZX0JMT0NLX1NJWkU9MSBDSEFSU0VUPUFTQ0lJOwor
RFJPUCBUQUJMRSB0MTsKK1NFVCBTRVNTSU9OIGlubm9kYl9zdHJpY3RfbW9kZSA9IG9uOworQ1JF
QVRFIFRBQkxFIHQxKAorYyBURVhUIE5PVCBOVUxMLCBkIFRFWFQgTk9UIE5VTEwsCitQUklNQVJZ
IEtFWSAoYyg3NjcpLGQoNzY3KSkpCitFTkdJTkU9SW5ub0RCIFJPV19GT1JNQVQ9Q09NUFJFU1NF
RCBLRVlfQkxPQ0tfU0laRT0xIENIQVJTRVQ9QVNDSUk7CiBFUlJPUiA0MjAwMDogUm93IHNpemUg
dG9vIGxhcmdlLiBUaGUgbWF4aW11bSByb3cgc2l6ZSBmb3IgdGhlIHVzZWQgdGFibGUgdHlwZSwg
bm90IGNvdW50aW5nIEJMT0JzLCBpcyA4MTI2LiBZb3UgaGF2ZSB0byBjaGFuZ2Ugc29tZSBjb2x1
bW5zIHRvIFRFWFQgb3IgQkxPQnMKIENSRUFURSBUQUJMRSB0MSgKIGMgVEVYVCBOT1QgTlVMTCwg
ZCBURVhUIE5PVCBOVUxMLAoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi90L2lubm9kYi16aXAudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3QvaW5ub2RiLXppcC50ZXN0CTIwMTAtMDQtMDkgMTI6NTY6NTEgKzAwMDAKKysr
IGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiLXppcC50ZXN0CTIwMTAt
MDQtMjEgMDk6NDA6MzIgKzAwMDAKQEAgLTg1LDggKzg1LDE0IEBAIFNFTEVDVCB0YWJsZV9zY2hl
bWEsIHRhYmxlX25hbWUsIHJvd19mb3IKIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLnRhYmxlcyBX
SEVSRSBlbmdpbmU9J2lubm9kYic7CiBkcm9wIHRhYmxlIHQxLHQyOwogCi0jIFRoZSBmb2xsb3dp
bmcgc2hvdWxkIGZhaWwgZXZlbiBpbiBub24tc3RyaWN0IG1vZGUuCisjIFRoZSBmb2xsb3dpbmcg
c2hvdWxkIG5vdCBmYWlsIGluIG5vbi1zdHJpY3QgbW9kZS4gKEJ1ZyAjNTA5NDUpCiBTRVQgU0VT
U0lPTiBpbm5vZGJfc3RyaWN0X21vZGUgPSBvZmY7CitDUkVBVEUgVEFCTEUgdDEoCisJYyBURVhU
IE5PVCBOVUxMLCBkIFRFWFQgTk9UIE5VTEwsCisJUFJJTUFSWSBLRVkgKGMoNzY3KSxkKDc2Nykp
KQorRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZX0JMT0NLX1NJWkU9MSBD
SEFSU0VUPUFTQ0lJOworRFJPUCBUQUJMRSB0MTsKK1NFVCBTRVNTSU9OIGlubm9kYl9zdHJpY3Rf
bW9kZSA9IG9uOwogLS1lcnJvciBFUl9UT09fQklHX1JPV1NJWkUKIENSRUFURSBUQUJMRSB0MSgK
IAljIFRFWFQgTk9UIE5VTEwsIGQgVEVYVCBOT1QgTlVMTCwKCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnMzYxNjkudGVzdCcKLS0t
IGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzM2MTY5LnRlc3QJ
MjAxMC0wNC0wOSAxMjo1Njo1MSArMDAwMAorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9w
bHVnaW4vdC9pbm5vZGJfYnVnMzYxNjkudGVzdAkyMDEwLTA0LTIxIDA5OjQwOjMyICswMDAwCkBA
IC0yNCw2ICsyNCw3IEBAIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlPU9OOwogIyBH
ZW5lcmF0aW5nIDEwIHRhYmxlcwogIyBDcmVhdGluZyBhIHRhYmxlIHdpdGggOTQgY29sdW1ucyBh
bmQgMjQgaW5kZXhlcwogRFJPUCBUQUJMRSBJRiBFWElTVFMgYHRhYmxlMGA7CitzZXQgaW5ub2Ri
X3N0cmljdF9tb2RlPW9uOwogLS1lcnJvciBFUl9UT09fQklHX1JPV1NJWkUKIENSRUFURSBUQUJM
RSBJRiBOT1QgRVhJU1RTIGB0YWJsZTBgCiAoYGNvbDBgIEJPT0wsCgo=

--===============2010942437==
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.1-innodb/
# testament_sha1: d2f09aaea905e02678ad89e7424556754a0458c0
# timestamp: 2010-04-21 12:40:40 +0300
# base_revision_id: marko.makela@stripped\
#   uu46iygmv5sizjru
# 
# Begin bundle
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


--===============2010942437==--