From: marko.makela
Date: August 19 2010 12:36pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3262) Bug#56114
List-Archive: http://lists.mysql.com/commits/116243
X-Bug: 56114
Message-Id: <201008191236.o7JBdbGW026859@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0765879042=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9uZXh0LW1yLyBiYXNl
ZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDgxOTEyMjYxNC0yZmkydWx2
NGM3YjNzcTlxCgogMzI2MiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA4LTE5CiAgICAgIEJ1ZyM1NjEx
NCBEaXNhbGxvdyB0cngtPmRpY3Rfb3BlcmF0aW9uX2xvY2tfbW9kZT09UldfWF9MQVRDSCBpbiBz
cnZfc3VzcGVuZF9teXNxbF90aHJlYWQoKQogICAgICAKICAgICAgVHJpZ2dlciBhbiBhc3NlcnRp
b24gZmFpbHVyZSB3aGVuCiAgICAgIHRyeC0+ZGljdF9vcGVyYXRpb25fbG9ja19tb2RlIGlzIG5l
aXRoZXIgMCBub3IgUldfU19MQVRDSCBpbgogICAgICBzcnZfc3VzcGVuZF9teXNxbF90aHJlYWQo
KS4gVHJhbnNhY3Rpb25zIHRoYXQgbW9kaWZ5IElubm9EQgogICAgICBkYXRhIGRpY3Rpb25hcnkg
dGFibGVzIG11c3QgYmUgZnJlZSBvZiBsb2NrIHdhaXRzLCBiZWNhdXNlIHRoZXkKICAgICAgbXVz
dCBiZSBob2xkaW5nIHRoZSBkYXRhIGRpY3Rpb25hcnkgbGF0Y2ggaW4gZXhjbHVzaXZlIG1vZGUu
CiAgICAgIFRoZSB0cmFuc2FjdGlvbnMgbXVzdCBub3QgYmUgYWNjZXNzaW5nIGFueSBvdGhlciB0
YWJsZXMgb3RoZXIgdGhhbgogICAgICB0aGUgZGF0YSBkaWN0aW9uYXJ5IHRhYmxlcy4KICAgICAg
CiAgICAgIFRoZSBoYW5kbGluZyBvZiBSV19YX0xBVENIIHdhcyBhY2NpZGVudGFsbHkgYWRkZWQg
aW4gdGhlIElubm9EQiBQbHVnaW4sCiAgICAgIGFzIGEgd3JvbmcgZml4IG9mIGFuIGFzc2VydGlv
biBmYWlsdXJlLiAoRmFzdCBpbmRleCBjcmVhdGlvbiB3YXMgYWNjZXNzaW5nCiAgICAgIGJvdGgg
ZGF0YSBkaWN0aW9uYXJ5IHRhYmxlcyBhbmQgdXNlciB0YWJsZXMgaW4gdGhlIHNhbWUgdHJhbnNh
Y3Rpb24uKQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYuYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwODE5MTIyNjE0LTJmaTJ1bHY0YzdiM3NxOXEKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9zcnYvc3J2MHNydi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwODE5
MTIzNjA5LTVscnlmbTh6bWI4dDFmcXEKQEAgLTE1ODcsMjYgKzE1ODcsMjAgQEAgc3J2X3N1c3Bl
bmRfbXlzcWxfdGhyZWFkKAogCWhhZF9kaWN0X2xvY2sgPSB0cngtPmRpY3Rfb3BlcmF0aW9uX2xv
Y2tfbW9kZTsKIAogCXN3aXRjaCAoaGFkX2RpY3RfbG9jaykgeworCWNhc2UgMDoKKwkJYnJlYWs7
CiAJY2FzZSBSV19TX0xBVENIOgogCQkvKiBSZWxlYXNlIGZvcmVpZ24ga2V5IGNoZWNrIGxhdGNo
ICovCiAJCXJvd19teXNxbF91bmZyZWV6ZV9kYXRhX2RpY3Rpb25hcnkodHJ4KTsKIAkJYnJlYWs7
Ci0JY2FzZSBSV19YX0xBVENIOgorCWRlZmF1bHQ6CiAJCS8qIFRoZXJlIHNob3VsZCBuZXZlciBi
ZSBhIGxvY2sgd2FpdCB3aGVuIHRoZQogCQlkaWN0aW9uYXJ5IGxhdGNoIGlzIHJlc2VydmVkIGlu
IFggbW9kZS4gIERpY3Rpb25hcnkKIAkJdHJhbnNhY3Rpb25zIHNob3VsZCBvbmx5IGFjcXVpcmUg
bG9ja3Mgb24gZGljdGlvbmFyeQogCQl0YWJsZXMsIG5vdCBvdGhlciB0YWJsZXMuIEFsbCBhY2Nl
c3MgdG8gZGljdGlvbmFyeQogCQl0YWJsZXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZGljdGlvbmFy
eQogCQl0cmFuc2FjdGlvbnMuICovCi0JCXV0X3ByaW50X3RpbWVzdGFtcChzdGRlcnIpOwotCQlm
cHV0cygiICBJbm5vREI6IEVycm9yOiBkaWN0IFggbGF0Y2ggaGVsZCBpbiAiCi0JCSAgICAgICJz
cnZfc3VzcGVuZF9teXNxbF90aHJlYWRcbiIsIHN0ZGVycik7Ci0JCS8qIFRoaXMgc2hvdWxkIG5l
dmVyIG9jY3VyLiBUaGlzIGluY29ycmVjdCBoYW5kbGluZwotCQl3YXMgYWRkZWQgaW4gdGhlIGVh
cmx5IGRldmVsb3BtZW50IG9mCi0JCWhhX2lubm9iYXNlOjphZGRfaW5kZXgoKSBpbiBJbm5vREIg
UGx1Z2luIDEuMC4gKi8KLQkJLyogUmVsZWFzZSBmYXN0IGluZGV4IGNyZWF0aW9uIGxhdGNoICov
Ci0JCXJvd19teXNxbF91bmxvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7Ci0JCWJyZWFrOworCQl1
dF9lcnJvcjsKIAl9CiAKIAl1dF9hKHRyeC0+ZGljdF9vcGVyYXRpb25fbG9ja19tb2RlID09IDAp
OwpAQCAtMTYxOCwxNiArMTYxMiw4IEBAIHNydl9zdXNwZW5kX215c3FsX3RocmVhZCgKIAkvKiBB
ZnRlciByZXN1bWluZywgcmVhY3F1aXJlIHRoZSBkYXRhIGRpY3Rpb25hcnkgbGF0Y2ggaWYKIAlu
ZWNlc3NhcnkuICovCiAKLQlzd2l0Y2ggKGhhZF9kaWN0X2xvY2spIHsKLQljYXNlIFJXX1NfTEFU
Q0g6CisJaWYgKGhhZF9kaWN0X2xvY2spIHsKIAkJcm93X215c3FsX2ZyZWV6ZV9kYXRhX2RpY3Rp
b25hcnkodHJ4KTsKLQkJYnJlYWs7Ci0JY2FzZSBSV19YX0xBVENIOgotCQkvKiBUaGlzIHNob3Vs
ZCBuZXZlciBvY2N1ci4gVGhpcyBpbmNvcnJlY3QgaGFuZGxpbmcKLQkJd2FzIGFkZGVkIGluIHRo
ZSBlYXJseSBkZXZlbG9wbWVudCBvZgotCQloYV9pbm5vYmFzZTo6YWRkX2luZGV4KCkgaW4gSW5u
b0RCIFBsdWdpbiAxLjAuICovCi0JCXJvd19teXNxbF9sb2NrX2RhdGFfZGljdGlvbmFyeSh0cngp
OwotCQlicmVhazsKIAl9CiAKIAlpZiAod2FzX2RlY2xhcmVkX2luc2lkZV9pbm5vZGIpIHsKCg==

--===============0765879042==
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/next-mr/
# testament_sha1: e25f41c0b5e7f55d6f5ace420acd4978d8cc3535
# timestamp: 2010-08-19 15:36:16 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   2fi2ulv4c7b3sq9q
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTcYix0AAeLflAAwWmf//39m
XMC/7//4BAAIAFAEzVe1jtZu226HOqpcJJEaGgSeInhNKJ7Saaj0TZGQNNR6no0IJRRoxDST9KHl
Daj0hoGgADQNAAMSGiJ6Cp+lPykDZJtQyAPSaZDEAyBzRkxMAExGBGmBBiMEyYBGCSQSehPQg01R
p5Q9T0nqPU9JtNQ8oADQ9QwzJt1lrFdO7PGZvy/v8D350qiONtbbfi4UzI5oUaS8IUyeHbDsNfnZ
4cdqSB+8/p1EbvzOzC6AxWTNwoCybqA/s8qs92y/DyINNLK/HAvWX5o/1vAIJ03jU9dvjO51VUsK
3PkNVnDVe9HxoY3yikohpRmnPdXCN8sfLptHdlu27wGQGFagWH9L29Ert92Ga/AjkD7rYg0KVPvN
dacjGHLHBSpHlSPBfiqi9LaxkGNjMIuW0RpT/PgRVsIjXCHJpYBE8khwKHwOszPMjFDUvPMEe7l9
X8G5p4wjMtYESzkH36IE6Q2qZ/McJyGQ5hc1R17+oRGsrYOqZfTxFNJiIkLn6D3UxEMDgxHwYcq3
Bj3N3IgbKgtB9ZjY0bJLBPoToO1nWtGjguko0YIjXMVjHK7g9zZly4BsUnBtQd3PLkyL0UPttzVQ
n3bb4sowShwSkYEhGy9MT4tRqOujUNStJ3ZnhSDhs7lYQyJhDsiolcYTsuLsZinc6qlY63C3Czxg
W5GEyYrYQEGX4QLlSe5WxLDKEMjrZVVtEhi0lmpQslFmZNM0pOE07XLLf2GdmRnX6nvPbjx4GvIt
UjwX1KC1hjv5/JdRfDrpR9lIeancrmf4Koe3kpD7+Z5rHQtzYHONRAecubjuN44LYBu1ptm89Mkj
pSilWnL0JFigN97wh7JOBUdT8hI53qtGrUWpmLct5HbaSKAbLh2zn4hS2YbXclhdR2ss89wdeLiI
pJdIaE3vVFyZsUbdvfzeAxQpLkqQ3vTYr86fHBY1GzpWXRPJq1xh2j2GJHZkSO/m5kgELhYwz3at
J94TLlpw0kYQFodc5yIw2KOMZI5rq8ioOgjzTUPu43MQc5rOnbJD+Hc8GnBfTcFKNGBmofkg8Whw
Z8IFakJcdLL9GWxWTXDK9NdnHIcoK3QiRyTlJfk4lyxnJdXOMUb9OUaoI67aVXCfVTLXbn042Sne
WGOi6SU9UxYfyHn64niLc448gnOnkR1Xo9Ej8q1vD5viwfRmp7HhIxaLc4wDgbNEvZzK103slU06
wJSoWHQDrLzjHDLCEVMzJgJ+/1hts55tjWYGhMUMMkd+AXgqgkEnB6hkizbqrSGOxGE87eNpWLH2
ii7pUVwCE5iMwm7kjwh9ziM7ToXAWUjePFblrSdxxwzUhR8WYKgRSRMkBAQAiE0I0gnsSyroaTEU
ElSKTJk7NrBYi8LQyVLhgCqCdcmCyCsX7JHGBcd7GWyoywwhokWHEJGzSXERIHAHOJiwk2DCcATt
N0CswI4U21Is8WQq0Y6AV5v9MtfBQB3ORIQagCGYLGR08DM7JjON0nzGLjGmx5IIvqWx5xDsPeuK
Y67cLrhikczrkTIZrk5svL2ivjVHSqCATRCT4Z4kqnBY17x0yT8LRh80EDUC40Cc2wtpItp03cNe
YChrIRtaA2He5AiApTUloRehIyYkEqbKNVEHlLS0Rz/4fn/xdyRThQkDcYix0A==


--===============0765879042==--