From: marko.makela
Date: June 22 2010 10:05am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3111)
List-Archive: http://lists.mysql.com/commits/111743
Message-Id: <201006221005.o5MA25OC021925@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0973424066=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjA3NTgyMi0zM2xl
OTQwcDNlazhycDQ2CgogMzExMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIGJ1Zl9m
bHVzaF9pbnNlcnRfaW5fZmx1c2hfcmJ0KCk6IFNpbGVuY2UgYSBHQ0Mgd2FybmluZwogICAgICBh
Ym91dCBkZXJlZmVyZW5jaW5nIGEgdHlwZS1wdW5uZWQgcG9pbnRlciBpbiBhbiBhc3NpZ25tZW50
LgogICAgICBVc2UgbWVtY3B5IGluc3RlYWQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGZsdS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjIwNzU4MjItMzNsZTk0MHAzZWs4cnA0
NgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA2MjIxMDA1MjctbzZlZHRqaGZ3cDA4dXJidQpAQCAtMTE0LDcgKzEx
NCw3IEBAIGJ1Zl9mbHVzaF9pbnNlcnRfaW5fZmx1c2hfcmJ0KAogCXBfbm9kZSA9IHJidF9wcmV2
KGJ1Zl9wb29sLT5mbHVzaF9yYnQsIGNfbm9kZSk7CiAKIAlpZiAocF9ub2RlICE9IE5VTEwpIHsK
LQkJcHJldiA9ICpyYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHBfbm9kZSk7CisJCW1lbWNweSgmcHJl
diwgcmJ0X3ZhbHVlKGJ1Zl9wYWdlX3QqLCBwX25vZGUpLCBzaXplb2YgcHJldik7CiAJCXV0X2Eo
cHJldiAhPSBOVUxMKTsKIAl9CiAKCg==

--===============0973424066==
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.5-innodb/
# testament_sha1: 76ac77fc06bdff993a445fd3740a4ab0fea893a4
# timestamp: 2010-06-22 13:05:34 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   33le940p3ek8rp46
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdt42HQAAYzflAAwU3f//1uC
CgC//9/wBAAIAFADnTwACQAMpoSnhTT9GqPCmaeqPJqGmj1GQyaeoAcwCYATAACYAAmAAcwCYATA
ACYAAmAART9KAgMTIyAyZNMmhkMhkyaaCSQjTEBNMhpTamACm1NNNDRkxAGVrXpFNZSpuqka4amx
kRKJAzdM1V8DgALz3QrSUBbUEUn75Pv3UTCVe/89ckZRcxG72LClDNi/oET9GvwARQDi0YT0UXyI
36b2pdIXZAjYfc4nlOebDjcDO9tTIqjESLb+wRDhbSLxbmYThhF+SRsnutyYfgBWt7hFfcyq+wvG
t/xBlFv1UFBXi0q7ZisEeNWvX9jk+Fc1Cp6nY6mWh3r5mcoy+aY+HphyuqKMrNuJXnxhqnCJ6coI
N6cgwhDa2LhXEHrF4cv3b5IvkYuM83GSaVxVGtY2K41WG9TxYrT9n8WitJvrbkZKwyLcZa7Z0L8x
PPc4z5q5np6zKEUQusrV5GmUm3QlwZBhnjNYYqE1huOsTPLyCVDC/FnLJQWSr2UVnhgu6+2+tU1U
HqMrCjh9k6zcPOioJ62h+baLRSNSQ832m/dGo8ZQsC1zqaa5uqmD3lbk0WqLAjY1yn8Th4amFrd7
/d2eV68+Qi2SZm/n2+kIow7WI7YZRc79Hh4VP+7VFTWDw46Ls94jkdkr95f5JEOtsHhDiI9OW/PO
NLEf5IR+K3LwzXLpt2rrtH3AfVFb/l8OIMUUOHV5lDpgVHNeJ6qPaty57z9ndGucyRtuSMuR3Yle
nXdkUtVS0c9e3stHUKHTRdZVZWJ23hjrlZAE4t/iTn86laTPDWzn3s6NEdKuXtATWRCcFQ0wxYrr
wdHrNi0U/gg8yRSKZAithUa66860Sa0WwlEgNcZXB5lOFKz1R6gjWCwuEKnDLs1ch+xpWeR3ieeI
n8J9+wzBdV+BXLqhzJFPPBNDYpvX3gbiPaF08aUrj1evDOeAdodbjuxFfgm3riI+uIapHpUEwm4S
2kkN5JieHvjsoMWaJFBGa+Z7DO1xUSXH/dI4nC6MCA56c0bINAI1OXOeS6NCvg7ViSZkzJln1JEx
RHTr87AVgelR9EjqCNFY9Yetp7C08VRaG7VzKo/ucLdHfeOuhu4spJLK6UxVFaKE/fWSrsikPTZv
s9VWV1Jk3a/8U1uMXlI7A6+Z5NTBqSQ+mUqiDa/kquc0J2nfZlK0vFIJA9QcsJWhNNY5yDnFb57x
Vlu4bK5PC3XnaKAW2jG6e7JV/8X/T/xdyRThQkNt42HQ


--===============0973424066==--