From: marko.makela
Date: March 21 2011 7:28am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3348) Bug#11766305
List-Archive: http://lists.mysql.com/commits/133397
X-Bug: 11766305
Message-Id: <201103210728.p2L7SII6029666@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1483272662=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMxNTEzMjQ1MS1waGRy
N3J0cTVnY2U0OTQ3CgogMzM0OCBNYXJrbyBNw6RrZWzDpAkyMDExLTAzLTIxCiAgICAgIEJ1ZyMx
MTc2NjMwNSAtIDU5MzkyOiBSZW1vdmUgdGhyMGxvYy5jIGFuZCBpYnVmX2luc2lkZSgpIFtwYXJ0
IDFdCiAgICAgIFJlbW92ZSB1bnVzZWQgbWVtYmVyIG10ciBmcm9tIGJ0cl9wY3VyX3N0cnVjdC4K
ICAgICAgCiAgICAgIHJiOjYyNCBhcHByb3ZlZCBieSBTdW5ueSBCYWlucwoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHBjdXIuaAogICAgICBzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvYnRyMHBjdXIuaWMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvYnRyMHBjdXIuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMxNTEzMjQ1
MS1waGRyN3J0cTVnY2U0OTQ3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1
ci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzIxMDcyNzU4LXMzMWR0eTAz
amg2eXJlbWcKQEAgLTI2NCwyMiArMjY0LDYgQEAgdWxpbnQKIGJ0cl9wY3VyX2dldF9yZWxfcG9z
KAogLyo9PT09PT09PT09PT09PT09PSovCiAJY29uc3QgYnRyX3BjdXJfdCoJY3Vyc29yKTsvKiE8
IGluOiBwZXJzaXN0ZW50IGN1cnNvciAqLwotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVNldHMgdGhlIG10ciBmaWVsZCBmb3Ig
YSBwY3VyLiAqLwotVU5JVl9JTkxJTkUKLXZvaWQKLWJ0cl9wY3VyX3NldF9tdHIoCi0vKj09PT09
PT09PT09PT0qLwotCWJ0cl9wY3VyX3QqCWN1cnNvciwJLyohPCBpbjogcGVyc2lzdGVudCBjdXJz
b3IgKi8KLQltdHJfdCoJCW10cik7CS8qITwgaW4sIG93bjogbXRyICovCi0vKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotR2V0cyB0
aGUgbXRyIGZpZWxkIGZvciBhIHBjdXIuCi1AcmV0dXJuCW10ciAqLwotVU5JVl9JTkxJTkUKLW10
cl90KgotYnRyX3BjdXJfZ2V0X210cigKLS8qPT09PT09PT09PT09PSovCi0JYnRyX3BjdXJfdCoJ
Y3Vyc29yKTsJLyohPCBpbjogcGVyc2lzdGVudCBjdXJzb3IgKi8KIC8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIENvbW1p
dHMgdGhlIG10ciBhbmQgc2V0cyB0aGUgcGN1ciBsYXRjaCBtb2RlIHRvIEJUUl9OT19MQVRDSEVT
LAogdGhhdCBpcywgdGhlIGN1cnNvciBiZWNvbWVzIGRldGFjaGVkLiBJZiB0aGVyZSBoYXZlIGJl
ZW4gbW9kaWZpY2F0aW9ucwpAQCAtNTE3LDkgKzUwMSw2IEBAIHN0cnVjdCBidHJfcGN1cl9zdHJ1
Y3R7CiAJLyogTk9URSB0aGF0IHRoZSBmb2xsb3dpbmcgZmllbGRzIG1heSBwb3NzZXNzIGR5bmFt
aWNhbGx5IGFsbG9jYXRlZAogCW1lbW9yeSB3aGljaCBzaG91bGQgYmUgZnJlZWQgaWYgbm90IG5l
ZWRlZCBhbnltb3JlISAqLwogCi0JbXRyX3QqCQltdHI7CQkvKiE8IE5VTEwsIG9yIHRoaXMgZmll
bGQgbWF5IGNvbnRhaW4KLQkJCQkJYSBtaW5pLXRyYW5zYWN0aW9uIHdoaWNoIGhvbGRzIHRoZQot
CQkJCQlsYXRjaCBvbiB0aGUgY3Vyc29yIHBhZ2UgKi8KIAlieXRlKgkJb2xkX3JlY19idWY7CS8q
ITwgTlVMTCwgb3IgYSBkeW5hbWljYWxseSBhbGxvY2F0ZWQKIAkJCQkJYnVmZmVyIGZvciBvbGRf
cmVjICovCiAJdWxpbnQJCWJ1Zl9zaXplOwkvKiE8IG9sZF9yZWNfYnVmIHNpemUgaWYgb2xkX3Jl
Y19idWYKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHBj
dXIuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5pYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMxNTEzMjQ1MS1waGRyN3J0cTVnY2U0OTQ3Cisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5pYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDMyMTA3Mjc1OC1zMzFkdHkwM2poNnlyZW1nCkBAIC00MiwzNCAr
NDIsNiBAQCBidHJfcGN1cl9nZXRfcmVsX3BvcygKIAlyZXR1cm4oY3Vyc29yLT5yZWxfcG9zKTsK
IH0KIAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKLVNldHMgdGhlIG10ciBmaWVsZCBmb3IgYSBwY3VyLiAqLwotVU5JVl9JTkxJ
TkUKLXZvaWQKLWJ0cl9wY3VyX3NldF9tdHIoCi0vKj09PT09PT09PT09PT0qLwotCWJ0cl9wY3Vy
X3QqCWN1cnNvciwJLyohPCBpbjogcGVyc2lzdGVudCBjdXJzb3IgKi8KLQltdHJfdCoJCW10cikJ
LyohPCBpbiwgb3duOiBtdHIgKi8KLXsKLQl1dF9hZChjdXJzb3IpOwotCi0JY3Vyc29yLT5tdHIg
PSBtdHI7Ci19Ci0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCi1HZXRzIHRoZSBtdHIgZmllbGQgZm9yIGEgcGN1ci4KLUByZXR1
cm4JbXRyICovCi1VTklWX0lOTElORQotbXRyX3QqCi1idHJfcGN1cl9nZXRfbXRyKAotLyo9PT09
PT09PT09PT09Ki8KLQlidHJfcGN1cl90KgljdXJzb3IpCS8qITwgaW46IHBlcnNpc3RlbnQgY3Vy
c29yICovCi17Ci0JdXRfYWQoY3Vyc29yKTsKLQotCXJldHVybihjdXJzb3ItPm10cik7Ci19Ci0K
ICNpZmRlZiBVTklWX0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqLy8qKgogUmV0dXJucyB0aGUgYnRyIGN1cnNvciBjb21wb25l
bnQgb2YgYSBwZXJzaXN0ZW50IGN1cnNvci4KCg==

--===============1483272662==
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: c3c1b00c751b83c9db2c31990fa0dcd043693d89
# timestamp: 2011-03-21 09:28:14 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   phdr7rtq5gce4947
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeZaiDUAAjTflAAQWmP/91MC
GAq///9wBAAIAFAETKvDdjOGiY4CSSk/QjJhqYI000nqnqfqanqGgPU0PUCSkwTJTxkiGRoAGgAD
QaCSEQRmggmjQ9QmmgPUaeoBkGAAAAA0AAAAACSgmhk00jTNSn6U2U0DR6nqANAabaLj69tOxdZV
ZJZfbW/pSr98uoTxvIg4dshWVEwzMzLz+f5lW8Y2zua5nGv4vbW/r6dOj7sdX3+n1Odf6km3jMgm
YYaa2aRjoX6eSCGQ0woJu+fi/MWaFI5ioJxcuWVUE8C18NUW6gS/JaLgCrIE80Zn5JE7MZatBK4U
EqUdItAglucWKmBa/TDAy2lZ3byp/MVaVIbJ1xjMpEiAHG85ecaQ/SN8TwHturmvmavuHZP8YyJV
TDD4iw30j1Zq7ZhQq0DACpq/HQnY5nFCtAxt5QI68ixlqxq8kBgbh2lBtgs7s5oyOzGM7CJEKTMC
t+BYnL9AMAet9uRnUWPKU0nkAqSA1oRsms2NYcyrajIK7dxKA+ieaK2bHUDjYCe0wLG4Z36lfYop
LacS/VWQs3symJgKjIdJqKjxZbFoVjHSKTdIyZSyfMLGJAlRwVL6iqOdn/TvPADjrfGeJXpkBcLc
a2K/TQDUTpbryOmIWwXJZXkRolXRxyFY91hUaw4k+42I5UllIoZEyDGkNBUKPjWNwopnB8ZRwLpd
1cTIwJ7ybB2vyfLW07gpCm4NW01aiuxshSOS4e+hsDWOeRGzwPhQXodQKy4ZMzXc+EqxDyJsX0Ki
na6O3s7qg1OFGKwuLDEE48dZBJ8xhtrJ4kc7gWcCD9xJtS7yAnbxysJcxZjFRyXmZ50YFwopo8e5
mw1dzNkl1cetQtYEBTEBQHChl6rxjNxZhJwpxLc/BLJ7EMpiDEJeh6E7tgcNgOhREiXWW7jqLVAU
VB2gs1wOih3AS9h3mSTQD17e0tNTNbELja0gaGZjyNGdOTohTRRS3CpueOuW9su7jshQ0A9hlSmC
XfbbVjx2EiHodGLprwOOp3m45lwsVMvY95oYMaM1CJWMFKJ3Rc/ADXCpLlstnGON9EqdT6eETOk4
JxqLzjx5HqLojG/SXj5t8MUTRVp4agczjwEz1GIL90RVC5mwYIwaAOLxJgXU59HlsBW9Ul2Atq8z
kmH6MFXQ653EgOjXBBVNVSmhyUCZkQ3ViJ23uWCZgh1GnWhZxeZpKpHtg/Al3otXg6pmFTZZsMHr
wFxmq9q1bN1sXBulMXKQpLxTykkGvi2ASSubVTxehWqeZ2A+HioxSYqAcA3lhrK6qFrC8buHChpM
M8yKHMhpt1NsPgMGTzhRkKymWokmrToSa54ntClEDbhR9t9wv7C6qV2BeMVixMyOwYht9yyAeBCq
jtK/P+LuSKcKEhzLUQag


--===============1483272662==--