From: marko.makela
Date: October 21 2010 8:33am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3271)
List-Archive: http://lists.mysql.com/commits/121486
Message-Id: <201010210833.o9L8MLfP021387@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0187608814=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA4MDMxOC01YmFv
ZzV6N2ExbzBxOTBqCgogMzI3MSBNYXJrbyBNw6RrZWzDpAkyMDEwLTEwLTIxIFttZXJnZV0KICAg
ICAgTWVyZ2UgZnJvbSBteXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYgoKICAg
IG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvYWxsX3ZhcnMucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxfdmFycy50ZXN0Cj09PSBt
b2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvYWxsX3ZhcnMucmVzdWx0
JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvYWxsX3ZhcnMucmVzdWx0CXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIxMDgwMzE4LTViYW9nNXo3YTFvMHE5MGoK
KysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2FsbF92YXJzLnJlc3VsdAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA4MzMwMy03czM2OG04ZTZwb3RucnppCkBA
IC0zLDYgKzMsNyBAQCBjcmVhdGUgdGFibGUgdDIgKHZhcmlhYmxlX25hbWUgdGV4dCk7CiBsb2Fk
IGRhdGEgaW5maWxlICJNWVNRTFRFU1RfVkFSRElSL3RtcC9zeXNfdmFycy5hbGxfdmFycy50eHQi
IGludG8gdGFibGUgdDE7CiBpbnNlcnQgaW50byB0MiBzZWxlY3QgdmFyaWFibGVfbmFtZSBmcm9t
IGluZm9ybWF0aW9uX3NjaGVtYS5nbG9iYWxfdmFyaWFibGVzOwogaW5zZXJ0IGludG8gdDIgc2Vs
ZWN0IHZhcmlhYmxlX25hbWUgZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEuc2Vzc2lvbl92YXJpYWJs
ZXM7CitkZWxldGUgZnJvbSB0MiB3aGVyZSB2YXJpYWJsZV9uYW1lPSdpbm5vZGJfY2hhbmdlX2J1
ZmZlcmluZ19kZWJ1Zyc7CiB1cGRhdGUgdDIgc2V0IHZhcmlhYmxlX25hbWU9IHJlcGxhY2UodmFy
aWFibGVfbmFtZSwgIlBFUkZPUk1BTkNFX1NDSEVNQV8iLCAiUEZTXyIpOwogc2VsZWN0IHZhcmlh
YmxlX25hbWUgYXMgYFRoZXJlIHNob3VsZCBiZSAqbm8qIGxvbmcgdGVzdCBuYW1lIGxpc3RlZCBi
ZWxvdzpgIGZyb20gdDIKIHdoZXJlIGxlbmd0aCh2YXJpYWJsZV9uYW1lKSA+IDUwOwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxfdmFycy50ZXN0Jwot
LS0gYS9teXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvYWxsX3ZhcnMudGVzdAlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA4MDMxOC01YmFvZzV6N2ExbzBxOTBqCisrKyBi
L215c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9hbGxfdmFycy50ZXN0CXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAxMDIxMDgzMzAzLTdzMzY4bThlNnBvdG5yemkKQEAgLTYxLDYg
KzYxLDkgQEAgZXZhbCBsb2FkIGRhdGEgaW5maWxlICIkTVlTUUxURVNUX1ZBUkRJUgogaW5zZXJ0
IGludG8gdDIgc2VsZWN0IHZhcmlhYmxlX25hbWUgZnJvbSBpbmZvcm1hdGlvbl9zY2hlbWEuZ2xv
YmFsX3ZhcmlhYmxlczsKIGluc2VydCBpbnRvIHQyIHNlbGVjdCB2YXJpYWJsZV9uYW1lIGZyb20g
aW5mb3JtYXRpb25fc2NoZW1hLnNlc3Npb25fdmFyaWFibGVzOwogCisjIFRoaXMgaXMgb25seSBw
cmVzZW50IGluIGRlYnVnIGJ1aWxkcy4KK2RlbGV0ZSBmcm9tIHQyIHdoZXJlIHZhcmlhYmxlX25h
bWU9J2lubm9kYl9jaGFuZ2VfYnVmZmVyaW5nX2RlYnVnJzsKKwogIyBQZXJmb3JtYW5jZSBzY2hl
bWEgdmFyaWFibGVzIGFyZSB0b28gbG9uZyBmb3IgZmlsZXMgbmFtZWQKICMgJ215c3FsLXRlc3Qv
c3VpdGUvc3lzX3ZhcnMvdC8nIC4uLgogIyAuLi4gJ3BlcmZvcm1hbmNlX3NjaGVtYV9ldmVudHNf
d2FpdHNfaGlzdG9yeV9sb25nX3NpemVfYmFzaWMtbWFzdGVyLm9wdCcKCg==

--===============0187608814==
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.6-innodb/
# testament_sha1: fd00471d39c2a4ec543ed46ec8714195da6e1e98
# timestamp: 2010-10-21 11:33:30 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   5baog5z7a1o0q90j
# 
# Begin bundle
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


--===============0187608814==--