From: marko.makela
Date: April 20 2011 8:35am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3595)
List-Archive: http://lists.mysql.com/commits/135775
Message-Id: <201104200835.p3K8ZLlf028100@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1770101456=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDA3MTMwNC1pN2I2
YTFxMDVtdzQzbjN6CgogMzU5NSBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTIwIFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjAw
NzEzMDQtaTdiNmExcTA1bXc0M24zegorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjAwODMzNDgtNzlpbTJ2dW5j
bjNxZDd1MApAQCAtMjQyOSw4ICsyNDI5LDggQEAgbWFrZV9leHRlcm5hbDoKIAlyZWNvcmQgb24g
aXRzIHBhZ2U/ICovCiAJd2FzX2ZpcnN0ID0gcGFnZV9jdXJfaXNfYmVmb3JlX2ZpcnN0KHBhZ2Vf
Y3Vyc29yKTsKIAotCS8qIFRoZSBmaXJzdCBwYXJhbWV0ZXIgbWVhbnMgdGhhdCBubyBsb2NrIGNo
ZWNraW5nIGFuZCB1bmRvIGxvZ2dpbmcKLQlpcyBtYWRlIGluIHRoZSBpbnNlcnQgKi8KKwkvKiBM
b2NrIGNoZWNrcyBhbmQgdW5kbyBsb2dnaW5nIHdlcmUgYWxyZWFkeSBwZXJmb3JtZWQgYnkKKwli
dHJfY3VyX3VwZF9sb2NrX2FuZF91bmRvKCkuICovCiAKIAllcnIgPSBidHJfY3VyX3Blc3NpbWlz
dGljX2luc2VydChCVFJfTk9fVU5ET19MT0dfRkxBRwogCQkJCQkgfCBCVFJfTk9fTE9DS0lOR19G
TEFHCgo=

--===============1770101456==
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: 4ab59abc27839bb7a2c142b1698e8c9c762e7b06
# timestamp: 2011-04-20 11:35:15 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   i7b6a1q05mw43n3z
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXzn1+IAAzdflAAwUnP/91sG
AAC////wBAAIAFAFmXg4lVdbTSbuA6EJUSemptQDTTJ6T1NANAaaAaACShHqYg0FPTSNQepp6h5Q
9TIA0aCU0Qqaep4U0bU8kNNA0BoaAAGAAAAA0AAAAACKRATTU2jEJoyDKT09TSZNojJtQiz7svzl
yNmooUMDG+8EPvcFrGCKJmo+KgTw8ETjHMWFYhCDZrD3kS2jbnbXQmJybxJ3k7/o6Ii4VUdKFDz4
pak3ypI+kClfOVsYQEIxNazsECqJDeNQX+efTxn/Q/gB2D+Kx6DrZDwkHgeBnhHL7mZdmJzipjTm
O4Ruw2iPL0027TXO2UpafyUg5EiBJTn8VTUQI941aI5kyGSpXKQVDw/LWPbSVTAK6PjBSQMJmNnk
VlBfZ6j+hMA018pSmEoIs6FIn8zAdTr6nkeAYTNt4DMoJDl4v20w3q6hgpOIR5imfwuL2zK7988f
qJ/XHg7Pbfh2UN4aDhMYGA827yhv7ZK+faJGpwAV1bjCZtjXNikBPgaVD8xFzVF9qFaLbWpK85jj
xEbmkSllN6jvLuwlQRNLYoCqRM46iCs0NZvJDMcpZY1OQ0kjR1cDUOk7KnmhGymGil7bZhuILqVS
kCArbBx5KFeNlMhYyaYWBZ3CzqiZekr4E2tdSMtWMtL4Ae55RqKKsCQ14bVZz25nA7QwIgcde2dq
pVpRxuaRbfq8xwFVZ2GiIrbcIYT9ZwlrH+tkT0Hltw3ZlRWOdp3uXYUDXTwHMwG08mkyE6NI7J2G
uQrxRYuFuhu4aDaOEOM4qAoVvxvkX0HZlT1DE6xkzFLiUAXUtzzIpUMPUZYCyUitnhFnBcBXkxhY
uMHRIj7iscwwlEgFY8TiwdWFi12EFw+wbD1MTRiESPGcR3nM8y8e0RrLkhMI+NMTGLIZGrpuKFom
a308phFMkgMWz8Qsh5c4p5CPK4r7KH+LxGZoKeBdgVLvEeevExKSf79e7UJh+y5VyE6ZbhjENxoP
LonHaSOfK2gmKycwrCPcRPIR7Tw26HJA4ONwpj7aYYHYLNtBrLKCwZTGOujkeGq9+0TJaZiNI6hG
rI9/kPjYV4GXMlj9hMrcCxKbB8xmbaR851GJxtJG9+Y8GKW7VCtC0uJ4iG5cj9ex4JO5NVcXvho6
uRllIlkbcyJtA+Dxzn0MEremWQ0JccacRru00j1gZkTeNLIWO5mX0INYM2UrR6jIZb+GB56PDnc0
lQVAVxDwwRmztkHKcSxrncuQWMaIpgCxaghD2Tm0ypRqM4KvZpo0IenTN4AWy+XpzexNx3tDpLyR
1GCg7wp2jaNAY81uwtD87TWUmwDoB4nGZ19dz8oNqwSjgI/6b13AtHzOAFwFxIPsJAr2P78SwRgN
Ow5F/Ci49LjxAbRg+gjvA/s9iJJBIiXcZpuNJKWNJoCRk3NZSFfwcCyoMh9GQUFhkMVLEigmeBNZ
B3BipKBgenmfDpEhH34WBrlgi2gfUof0I6FuH6SHDjvMctxBA5VBBiNVZ7lTYW7vJ9LsBTE4TA59
yAOpVqwi85mAUvOlFsHjdRsKimhYHulgUFzxgiw4AQVBxgj2KwrAv4sEHxC4gsMA2FRq4loU2LaO
SMUDhVMcDxHq67uRMdONqxf3r9BPqJeOzMD7ocnXgJf6lQ58jZrK5kiINwm0SaXHFeEU16tPMMT7
H/F3JFOFCQfOfX4g


--===============1770101456==--