From: marko.makela
Date: February 16 2011 1:46pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3321 to 3322)
List-Archive: http://lists.mysql.com/commits/131493
Message-Id: <201102161346.p1GD2FFV023468@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0031789340=="

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

IDMzMjIgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAogMzMyMSBNYXJrbyBN
w6RrZWzDpAkyMDExLTAyLTE1IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xLWlubm9kYiB0
byBteXNxbC01LjUtaW5ub2RiLgoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYl9idWc2MDA0OS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvdC9pbm5vZGJfYnVnNjAwNDktbWFzdGVyLm9wdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0
L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1
aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMjE1MTAxODE1LWppYm1iMG1meDA0bHA4ZzAKKysrIGIvbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDIxNjEzNDE0Ni1xZ3g1YjYzeXlqeGMza2M5CkBAIC0yMywxMyArMjMsMTMg
QEAgb3BlbihGSUxFLCAiPCRmaWxlIikgfHwgZGllICJVbmFibGUgdG8gbwogIyBSZWFkIERJQ1Rf
SERSX1RBQkxFX0lEUywgdGhlIHJvb3QgcGFnZSBudW1iZXIgb2YgSURfSU5EIChTWVNfVEFCTEVT
LklEKS4KIHNlZWsoRklMRSwgNyoxNjM4NCszOCszNiwgMCkgfHwgZGllICJVbmFibGUgdG8gc2Vl
ayAkZmlsZSI7CiBkaWUgdW5sZXNzIHJlYWQoRklMRSwgJF8sIDQpID09IDQ7Ci1teSAkc3lzX3Rh
Ymxlc19pZF9yb290ID0gdW5wYWNrICJOIjsKK215ICRzeXNfdGFibGVzX2lkX3Jvb3QgPSB1bnBh
Y2soIk4iLCAkXyk7CiBwcmludCAiTGFzdCByZWNvcmQgb2YgSURfSU5EIHJvb3QgcGFnZSAoJHN5
c190YWJsZXNfaWRfcm9vdCk6XG4iOwogIyBUaGlzIHNob3VsZCBiZSB0aGUgbGFzdCByZWNvcmQg
aW4gSURfSU5ELiBEdW1wIGl0IGluIGhleGFkZWNpbWFsLgogc2VlayhGSUxFLCAkc3lzX3RhYmxl
c19pZF9yb290KjE2Mzg0ICsgMTUyLCAwKSB8fCBkaWUgIlVuYWJsZSB0byBzZWVrICRmaWxlIjsK
IHJlYWQoRklMRSwgJF8sIDMyKSB8fCBkaWUgIlVuYWJsZSB0byByZWFkICRmaWxlIjsKIGNsb3Nl
KEZJTEUpOwotcHJpbnQgdW5wYWNrKCJIKiIpLCJcbiI7CitwcmludCB1bnBhY2soIkgqIiwgJF8p
LCAiXG4iOwogRU9GCiAKICMgUmVzdGFydCB0aGUgc2VydmVyLgoK

--===============0031789340==
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: 65cb466d1e94d44980fa19ea65f3d51b08da7b98
# timestamp: 2011-02-16 15:46:19 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   jibmb0mfx04lp8g0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTAb0oQAAz9flAAQXHf//1JD
AAS////wBAAIAFAF3uWw7cdXatdAuhlddcEVJTaZU800T1NiaNU9oyp4RlPU0YgGgSSRT9TaniEa
Taj1GRpk0AAANASRTCaExGVP1TyJ+qep6QMQ9QyYg0DmAAAAAAAAAABJIJkBMamTTU0maT0moPUe
SNA0yKG5sDHzfxbjsaP5aag4flyvQRaDJVk7HlQTjKAwVRzO1g/hHcdZeMMMl3cw1YPKJOTW1BcM
YkCFT4OZEiQ5/Shz0PJzv3D/aTyyJzcVGDKXvNehhiZwGzzNykPI/QsFeVcPiHUiIZLMG39g+ZvK
gs8KoB7Kmo3Fnsd54EhZhCAbD1JVKIBcb0WTNYjl6BW48UCmL0lDC2sd4xSWAzK1L151OeAw4yQs
B0osrWSFBitH4MsK2ZLzWihSdJqyvlGblowmFFpbOH1oVjElQmqimKHYR9OZYbyPi6V17q5IUTka
hjh19hlNIXeMSJkOMETGouOHQU2pLLWNF4pKoGefBMhNSBPhUkUJa6CuerI+UZFAM5DvCWGvTfgW
UWhZbKUxAumijPJkkJyIFpQha4H9NEQCRDRyWq7qjGn1yyVO595ZRqjEKr8djMekZ1A4LEit4nhz
K4vYOJNDMWuzH6BIOFL8h5UWo0G2fhgksYq457PCooPO+FHYUoimjAoRXFEdpmaFS28GZwVy2VZw
zxF3AXqhfyi5iU7WEGWRkFxtG6KHZktrghtckXhSH39grDWM0lsNuB0BwM+jHAgxu0JIoZk6aFxW
zDjHOmhPQxZB/ERhiayRirNaReOtICyWYaEjIyGLfqfYljTNyqCbEx0biN466SNMx1h1XnAmEXRH
AZkTMpm18tNWcqIYcFhG0zBGZjfKWGRI/2EeA4XJi5sS0tLBpFEKY8JDhMSGiFaU6xjsMjuDiFO0
zHY6TeMEzxORqgUlYMMwzN/lr5HMHjg/oPAUS4wOo9JsD8oA88TSADGmw1bfhNcg+/dMXjzQdcsu
i2qgkX+bEHl0KyOcYxM+/JIsLBJeh6cVqUK+0l26bEBT82F0nsPJ4wTxnGq2PmL4gvh0PULj3KEU
ZGRgeyZm08iEqesfAzVBMMgXkeyBaG6Rx96rdexSzeg5vV2A/giqYnGsQKbbLuYWgw4xtgOq73dQ
xSGRYV7/Ib27+ZBIWVehmcZxixy8SG+ZPsXFCLN8hzsCaWN5v44+BuRzcYnYeYRpgWTcPh/Y8NUh
egfcTC8LLq4jnfcai42GNYEIRKZALjrGMZfqvurMW42xxhqmH4bCZpZbS1ixdG0rThXVoPILSjO6
8DSXk3DeUAYnbjMnNhaUnU6AQJSpTeFo9wWOCzyZodjzhCEROffaUkpUBxA1Ftx4pGV1nWd8lKU9
AygcAvEf0fFaVHAsAzgZyJAOJkQYB4nAy1lRQXqcnNMSExgqZimI7INoG43JhwMOd4GiKLske5eV
Go5j811LyBEI8jzL3n3JJK1DBEmRStRAdsQHJHkkbocaiGYYDy5GEEGgkU06zjMpsUcgYlIB2Mae
6CtSuR1cLJcytccENzGGFAPFFRprCzXcmUR1L4cCxgzuACrUYRWUMAn1N7ryaQqIzgoESCXqOI3m
A8uRwKzmAxIPgw01JIkk0HfQvkQLyRqYHDbw4vCZSOHxibBXYMDDGMloLAzRG5LBKLCdcdL0in05
iqiVodMUgLLzAeSPJPUIB0J0jW40DbepsD5aDG9Az/QyuU8/8FB6H/F3JFOFCQMBvShA


--===============0031789340==--