From: marko.makela
Date: April 5 2011 6:48am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3560 to 3561)
List-Archive: http://lists.mysql.com/commits/134672
Message-Id: <201104050649.p356n4cb023720@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0772225471=="

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

IDM1NjEgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0wNQogICAgICBSZW1vdmUgdW51c2VkIGZ1bmN0
aW9uIGRlY2xhcmF0aW9uIHNydl9wdXJnZV90aHJlYWQoKS4KICAgICAgSXQgd2FzIHJlcGxhY2Vk
IGJ5IHNydl9wdXJnZV9jb29yZGluYXRvcl90aHJlYWQoKS4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3NydjBzcnYuaAogICAgICBzdG9yYWdlL2lubm9iYXNl
L3Nydi9zcnYwc3J2LmMKIDM1NjAgVmFzaWwgRGltb3YJMjAxMS0wNC0wNAogICAgICBGaXggQnVn
IDExOTMzNzkwIC0gSU5OT0RCIEFTU0VSVFMgVFJYLT5JTl9NWVNRTF9UUlhfTElTVCBJTiBBTkFM
WVpFIFdJVEgKICAgICAgUEVSU0lTVEVOVCBTVEFUUwogICAgICAKICAgICAgVXNlIHRyeF9yb2xs
YmFja190b19zYXZlcG9pbnQoKSBmb3IgaW50ZXJuYWwgdHJhbnNhY3Rpb25zIGluIHBlcnNpc3Rl
bnQKICAgICAgc3RhdHMgY29kZSBpbnN0ZWFkIG9mIHRyeF9yb2xsYmFja19mb3JfbXlzcWwoKS4g
VGhlIGFzc2VydGlvbiB0aGF0IGEKICAgICAgdHJ4IHdoaWNoIGlzIHBhc3NlZCB0byB0cnhfcm9s
bGJhY2tfZm9yX215c3FsKCkgc2hvdWxkIGJlIGluIG15c3FsIGxpc3QKICAgICAgd2FzIGFkZGVk
IHJlY2VudGx5LgogICAgICAKICAgICAgUmV2aWV3ZWQgYnk6CU1hcmtvIChyYjovLzYzOCkKCiAg
ICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnMTE5MzM3
OTAucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzExOTMz
NzkwLnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBz
dGF0cy5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNy
di5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oCXJldmlkOnZhc2ls
LmRpbW92QG9yYWNsZS5jb20tMjAxMTA0MDQxNDE5MjktenB6MmF1amNzcXUyNXJ1YQorKysgYi9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNDA1MDY0ODEwLXJvMmcwaWhqMmpmcDVrbzMKQEAgLTYzOSwxNiArNjM5LDYg
QEAgdm9pZAogc3J2X2luY19hY3Rpdml0eV9jb3VudCh2b2lkKTsKIC8qPT09PT09PT09PT09PT09
PT09PT09PT09PSovCiAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1Bc3luY2hyb25vdXMgcHVyZ2UgdGhy
ZWFkLgotQHJldHVybglhIGR1bW15IHBhcmFtZXRlciAqLwotVU5JVl9JTlRFUk4KLW9zX3RocmVh
ZF9yZXRfdAotc3J2X3B1cmdlX3RocmVhZCgKLS8qPT09PT09PT09PT09PSovCi0Jdm9pZCoJYXJn
IF9fYXR0cmlidXRlX18oKHVudXNlZCkpKTsJLyohPCBpbjogYSBkdW1teSBwYXJhbWV0ZXIKLQkJ
CQkJCXJlcXVpcmVkIGJ5IG9zX3RocmVhZF9jcmVhdGUgKi8KLQogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq
CiBFbnF1ZXVlcyBhIHRhc2sgdG8gc2VydmVyIHRhc2sgcXVldWUgYW5kIHJlbGVhc2VzIGEgd29y
a2VyIHRocmVhZCwgaWYgdGhlcmUKIGlzIGEgc3VzcGVuZGVkIG9uZS4gKi8KCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2Uvc3J2L3NydjBzcnYuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNDA0
MTQxOTI5LXpwejJhdWpjc3F1MjVydWEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNy
di5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDA1MDY0ODEwLXJvMmcwaWhq
MmpmcDVrbzMKQEAgLTU1OCw3ICs1NTgsNyBAQCBoYXBwZW5pbmcgaW4gdGhlIHNlcnZlciB3aGlj
aCByZXF1aXJlcyBpCiB0aHJlYWQuIFN1Y2ggc2l0dWF0aW9ucyBtYXkgYmUsIGZvciBleGFtcGxl
LCB3aGVuIGZsdXNoaW5nIG9mIGRpcnR5CiBibG9ja3MgaXMgbmVlZGVkIGluIHRoZSBidWZmZXIg
cG9vbCBvciBvbGQgdmVyc2lvbiBvZiBkYXRhYmFzZSByb3dzCiBoYXZlIHRvIGJlIGNsZWFuZWQg
YXdheSAocHVyZ2VkKS4gVGhlIHVzZXIgY2FuIGNvbmZpZ3VyZSBhIHNlcGFyYXRlCi1kZWRpY2F0
ZWQgcHVyZ2UgdGhyZWFkKHMpIHRvbywgaW4gd2hpY2ggY2FzZSB0aGUgbWFzdGVyIHRocmVhZCBk
b2Vzbid0CitkZWRpY2F0ZWQgcHVyZ2UgdGhyZWFkKHMpIHRvbywgaW4gd2hpY2ggY2FzZSB0aGUg
bWFzdGVyIHRocmVhZCBkb2VzIG5vdAogZG8gYW55IHB1cmdpbmcuCiAKIFRoZSB0aHJlYWRzIHdo
aWNoIHdlIGNhbGwgdXNlciB0aHJlYWRzIHNlcnZlIHRoZSBxdWVyaWVzIG9mIHRoZSBNeVNRTApA
QCAtNjQwLDE2ICs2NDAsNiBAQCBVTklWX0lOVEVSTiBvc19ldmVudF90CXNydl9tb25pdG9yX2V2
ZW50CiAvKiogRXZlbnQgdG8gc2lnbmFsIHRoZSBlcnJvciB0aHJlYWQgKi8KIFVOSVZfSU5URVJO
IG9zX2V2ZW50X3QJc3J2X2Vycm9yX2V2ZW50OwogCi0vKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotQXN5bmNo
cm9ub3VzIHB1cmdlIHRocmVhZC4KLUByZXR1cm4JYSBkdW1teSBwYXJhbWV0ZXIgKi8KLVVOSVZf
SU5URVJOCi1vc190aHJlYWRfcmV0X3QKLXNydl9wdXJnZV90aHJlYWQoCi0vKj09PT09PT09PT09
PT0qLwotCXZvaWQqCWFyZyBfX2F0dHJpYnV0ZV9fKCh1bnVzZWQpKSk7CS8qITwgaW46IGEgZHVt
bXkgcGFyYW1ldGVyCi0JCQkJCQlyZXF1aXJlZCBieSBvc190aHJlYWRfY3JlYXRlICovCi0KIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKgogUHJpbnRzIGNvdW50ZXJzIGZvciB3b3JrIGRvbmUgYnkgc3J2X21hc3Rl
cl90aHJlYWQuICovCiBzdGF0aWMKCg==

--===============0772225471==
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: 9a535da20a9f3c5f0986a5ad56415731710cd48e
# timestamp: 2011-04-05 09:49:00 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   zpz2aujcsqu25rua
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ5faxwAAjZflAAQUmf/91Mi
EAC////wBAAIAFAEeKbe7cGyR1d3ZQSSQlPwCp+mT0NJqYJtKekaAyaaAkoBMTRPSNFPSekxpPU0
aBoNAYSJBCnqbJT9DSNNTCHqNqeppoepoaBgNAAANAAAAAAEoigMhkYhiNNNAGjQABflt5s8+ORw
253KeenZrwCo0nnZTGkbaS6LMjQWDbbDz5BqnW5jghuIIIiH/dXHXdHzPr6yN88T09IKShVtgK1f
U9NMdOWA6/vLqW7gBDFqFQqZHa+zX3m37i9EL8C1FzlE/Dk+7cBvmUIuLbluEvRSRKnaInMyV9p1
6cagt6B4z3oW8V9XEmSQrUigoT9gF0vwyKENNFco+QuYGQr8Fb0wowv0Ocq+FgHjihXcdmHTu4j+
Q/ahOe1L55NvwvbN3AILBedPoLZn5V9plJZeUjCstI9htoMvDnIYNBzt6FSnlmFS9ldiySviROIN
qUVahD6jHXLUAHoCFhPAwkXCpC9WsGogqT7iSXZcaxdgXxB/MbJ3pHQs3eUmpK8ZOrpitHTM2AMZ
W/KU20JlNvFOTFxSqjCwCwrlOSJdcGEx0hMPEqilCGRAaYmeou8CStzmVYOnbJNAYN1e+l0myV7h
uFv6ie+A2Y4WyTxYzkD45m0fbOFHSyFB28T7vAgMHuTjIaddaFZ2uOJmpQWSyeNvWicJrX53iOY+
m6xAkVLVdiiDJ410ZEibnKTQZJkFgiWDNgnryW3jt0CrWe8c415nLAXlr4poLDQMbfOKiJd2Lni2
8Gi46PKgT8IRieQLxbnEV9W7MRq3KkSqRqaNbGjIR33F8cKKEv3KI98MVEnNLPmukgn9cTzgLEy0
68AGJxdvgWRAy/4imYGgUt+HTuuFaLgbvb412Ob7oEpLIS1+vJTrVpp5+HibSZiYmo4YxxOkLS8J
yzKVR1nKsx8xVD1jvKroC2eKyXGWyvqd8vPrBSAEVfLjvOcfDHgdzU8cG7s6qsYTwutzvaayskTY
8Y+jn9LvizHqx2SPe1ZpkWWYO28NPCBRMjKVEc4nmhpvuHicvGpex0KCNTdQArLLoE8GZVQWdqik
YkVul4BoXgmYTP5ut7eSG2bE8CpPFGRq84u/i8EWT+sL45ylF9CJmmaEDek+QCTEIujKIe35EJUQ
pAmSYH0H2CXTGAwSYHbjw0wisOglIRl9z7Jg31911YfkcaNV9KKUxtsLCJtYNE32yFG2topMJwvd
32sRsqAcBM7nckpUocYpDSL0EmRRSoRKiO9EgFt7DAcn6YaQjyM1Lw11W+oQBHxc3uBqVK+xqssL
RSMFUDR+fhKPaoizQDk+fTqjGEMc7MVh6wQ0wWbQzWq7CY5MNeVlFIrXe+msTj+he0TrJw1Y2jSU
viXfBk0VCAotDb5LvetbKa5jxVryVXpLJMLJrluFIYKHYwkqZqseK/5l5+gu5IpwoSAcvtY4


--===============0772225471==--