From: marko.makela
Date: May 12 2010 6:09am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3461)
List-Archive: http://lists.mysql.com/commits/108066
Message-Id: <201005120609.o4C68RVU011853@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0901331274=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMDUzOTI1LW92d21w
bzA4MzhmczJyb28KCiAzNDYxIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgRG9jdW1l
bnQgcmVjZW50IGZpeGVzIGluIENoYW5nZUxvZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxv
ZwkyMDEwLTA1LTA1IDExOjUwOjExICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9D
aGFuZ2VMb2cJMjAxMC0wNS0xMiAwNjowOToyMiArMDAwMApAQCAtMSwzICsxLDE5IEBACisyMDEw
LTA1LTEyCVRoZSBJbm5vREIgVGVhbQorCisJKiByb3cvcm93MG1lcmdlLmM6CisJRml4IEJ1ZyM1
MzQ3MSByb3dfbWVyZ2VfZHJvcF90ZW1wX2luZGV4ZXMoKSByZWZlcnMgZnJlZWQgbWVtb3J5LCBT
RUdWcworCisyMDEwLTA1LTExCVRoZSBJbm5vREIgVGVhbQorCisJKiBteXNxbC10ZXN0L2lubm9k
Yl9idWc1MzI5MC50ZXN0LCBteXNxbC10ZXN0L2lubm9kYl9idWc1MzI5MC5yZXN1bHQsCisJaW5j
bHVkZS9yZW0wY21wLmgsIHJlbS9yZW0wY21wLmMsIHJvdy9yb3cwbWVyZ2UuYzoKKwlGaXggQnVn
IzUzMjkwIHdyb25nIGR1cGxpY2F0ZSBrZXkgZXJyb3Igd2hlbiBhZGRpbmcgYSB1bmlxdWUgaW5k
ZXgKKwl2aWEgZmFzdCBhbHRlciB0YWJsZQorCisyMDEwLTA1LTExCVRoZSBJbm5vREIgVGVhbQor
CSogYnVmL2J1ZjBscnUuYywgaW5jbHVkZS9idWYwYnVmLmljOgorCUZpeCBCdWcjNTMzMDcgdmFs
Z3JpbmQ6IHdhcm5pbmdzIGluIG1haW4ucGFydGl0aW9uX2lubm9kYl9wbHVnaW4KKwogMjAxMC0w
NS0wNQlUaGUgSW5ub0RCIFRlYW0KIAogCSogcm93L3JvdzBtZXJnZS5jOgoK

--===============0901331274==
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-innodb2/
# testament_sha1: 3d022b78f82505764e5b581ca3384b78101aaed4
# timestamp: 2010-05-12 09:09:30 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   ovwmpo0838fs2roo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTfiBPEAAddfgEAwW3f//1+m
DQC/7//wUASMvapcns4rx2rdvcEkiKn6YSm/SU80aaMUyj9Emm1D1B+qfqmjIASUgm0Mg1NEbSDT
QYQNNAAABKJkJo1NBppT1PRqeUyNDT9U0DIyaAPUEkiCYkwR6QMBG0Jk9TQaZNDCaYSSQ0TaATCK
emSeUfqNTymmh6mTQANOx4oFLjFjaofyIy+XlNm4Hjj9j02+gukUQye0Vcr4kreiBJrOmm0+haun
wP08mhYyQxSWtMNnWmMbvPBv930hL76Td4qVm62xe6NP3C3mk34UhPCbhflxfHmx3ZNsLvM3FlX3
onS1vEdxmXmWHn98PbE3x6e5W3cnUupVxpCP/ZxH6IayWoy1NT3CoUUw6mPH+5dqE1G1I7ZijUSv
vH4x+AYOdyLc+i4MXwRmGxWUQSXZFxEbykjtRWVAdIiiP1TK9e4UQRX2ntO+kjtHlNoVs3GW+R/g
4L2SOfJr7B6aS267CRN0BykLmnQ5ZHwJy0HeTEhpfsVbCBrN7nCuns6JkiRBeWio8SM8r5FDqMh8
Q5XBEHHyCgiGG7lMYTTTlqHbR7lgb1InlJlw2lpWMKW7VrfaLebzaMcqTo+wjVKpYu+jzFEODm7r
FHWEuOdV1SkiHFxbAuGWXMaKUbbZOTF6pJzOwVFTMhrFeOPPMqK6Mo9UjiuqEzTBFeRKMbJQaKSp
TuqkknC0SSOGowcmayaVei0NVb0UxSNpmCR7VXh0jqJ4KVz+nPYMdEYPkob+oy6mlAksG1nFEPFH
vVMfmBfpUdfXTFxnPdMSRqUGkYIVvykJZTdfY94Y4Y7tGNo3Y6ULy81JHc3KcZRwJGkaUwrJQ2gs
Attk0ygParUZni8HJGON8a1a2FrzLsjUxpIjAax9LZjlp4nmZrkQMt51HOqIZ+xm0nYaSQ8cZCEv
e4fEyQ4dcTpF3PhOMXUk5UQUaYgKUuNAZlRoVh1u0FJaayvGFuc6aHD4kSRMzYkw7PUZFnZwJzK4
piQ8YFf6uI5r56iEi9QTE91DY5NKYhkuGyKVYccN0Ppw24vmNCamdgKCNVyXRm70BvMDsPVvwmIC
w6Gs6G0rIVGXslVF7g0LnDjGMakzFZgRA5wOelxd48DfycjnqdOJ14fsHZc1T0iKlRNoog6GzvFI
Xle4HmFirbrwCh80J8+7wI/xfJmsS7GpJtQEXditMlWw8qkijgKyE4KmEWPApk5Iz3aqQyijaXK1
D68ZF6OgVCRBWcEi71/BjrHJr1oJa7DB+7Sa667CDqjNY+VZOn6HDAPKZFAggYZyHeFq1/KAMKV6
YT2QydRKyRsUj19WCd5/goFeCggzekfpIzCpUu1MQnUqJSM4sR6iyyxX6JCQMNlsSg+aYbvFljZB
U69+6DD2iSWZYskIioaLFZrllYo6AmtaCpTL88Fg6MYZXDxqAng44uDzljqZXJqxmxN26Niw1AM9
duxPK2CYKsKcDRCKmZokfqapO1ZV3Zywft14DmqFQzCQVPcteY8N4ZJh+IrBVz4Z5nyPzqN/S4XX
aB9fUly0OnOabkKSoGDtbXYwzXTq13bfKPe3Ulr0/8XckU4UJA34gTxA


--===============0901331274==--