From: marko.makela
Date: April 5 2011 6:48am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3561)
List-Archive: http://lists.mysql.com/commits/134671
Message-Id: <201104050648.p356mSc2028153@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1535501800=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNDA0MTQxOTI5LXpwejJh
dWpjc3F1MjVydWEKCiAzNTYxIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDQtMDUKICAgICAgUmVtb3Zl
IHVudXNlZCBmdW5jdGlvbiBkZWNsYXJhdGlvbiBzcnZfcHVyZ2VfdGhyZWFkKCkuCiAgICAgIEl0
IHdhcyByZXBsYWNlZCBieSBzcnZfcHVyZ2VfY29vcmRpbmF0b3JfdGhyZWFkKCkuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zcnYwc3J2LmgKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
c3J2MHNydi5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTA0MDQxNDE5MjktenB6
MmF1amNzcXUyNXJ1YQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MHNydi5oCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDA1MDY0ODEwLXJvMmcwaWhqMmpmcDVr
bzMKQEAgLTYzOSwxNiArNjM5LDYgQEAgdm9pZAogc3J2X2luY19hY3Rpdml0eV9jb3VudCh2b2lk
KTsKIC8qPT09PT09PT09PT09PT09PT09PT09PT09PSovCiAKLS8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1B
c3luY2hyb25vdXMgcHVyZ2UgdGhyZWFkLgotQHJldHVybglhIGR1bW15IHBhcmFtZXRlciAqLwot
VU5JVl9JTlRFUk4KLW9zX3RocmVhZF9yZXRfdAotc3J2X3B1cmdlX3RocmVhZCgKLS8qPT09PT09
PT09PT09PSovCi0Jdm9pZCoJYXJnIF9fYXR0cmlidXRlX18oKHVudXNlZCkpKTsJLyohPCBpbjog
YSBkdW1teSBwYXJhbWV0ZXIKLQkJCQkJCXJlcXVpcmVkIGJ5IG9zX3RocmVhZF9jcmVhdGUgKi8K
LQogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCiBFbnF1ZXVlcyBhIHRhc2sgdG8gc2VydmVyIHRhc2sgcXVl
dWUgYW5kIHJlbGVhc2VzIGEgd29ya2VyIHRocmVhZCwgaWYgdGhlcmUKIGlzIGEgc3VzcGVuZGVk
IG9uZS4gKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYuYwlyZXZpZDp2YXNpbC5kaW1v
dkBvcmFjbGUuY29tLTIwMTEwNDA0MTQxOTI5LXpwejJhdWpjc3F1MjVydWEKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwNDA1MDY0ODEwLXJvMmcwaWhqMmpmcDVrbzMKQEAgLTU1OCw3ICs1NTgsNyBAQCBoYXBwZW5p
bmcgaW4gdGhlIHNlcnZlciB3aGljaCByZXF1aXJlcyBpCiB0aHJlYWQuIFN1Y2ggc2l0dWF0aW9u
cyBtYXkgYmUsIGZvciBleGFtcGxlLCB3aGVuIGZsdXNoaW5nIG9mIGRpcnR5CiBibG9ja3MgaXMg
bmVlZGVkIGluIHRoZSBidWZmZXIgcG9vbCBvciBvbGQgdmVyc2lvbiBvZiBkYXRhYmFzZSByb3dz
CiBoYXZlIHRvIGJlIGNsZWFuZWQgYXdheSAocHVyZ2VkKS4gVGhlIHVzZXIgY2FuIGNvbmZpZ3Vy
ZSBhIHNlcGFyYXRlCi1kZWRpY2F0ZWQgcHVyZ2UgdGhyZWFkKHMpIHRvbywgaW4gd2hpY2ggY2Fz
ZSB0aGUgbWFzdGVyIHRocmVhZCBkb2Vzbid0CitkZWRpY2F0ZWQgcHVyZ2UgdGhyZWFkKHMpIHRv
bywgaW4gd2hpY2ggY2FzZSB0aGUgbWFzdGVyIHRocmVhZCBkb2VzIG5vdAogZG8gYW55IHB1cmdp
bmcuCiAKIFRoZSB0aHJlYWRzIHdoaWNoIHdlIGNhbGwgdXNlciB0aHJlYWRzIHNlcnZlIHRoZSBx
dWVyaWVzIG9mIHRoZSBNeVNRTApAQCAtNjQwLDE2ICs2NDAsNiBAQCBVTklWX0lOVEVSTiBvc19l
dmVudF90CXNydl9tb25pdG9yX2V2ZW50CiAvKiogRXZlbnQgdG8gc2lnbmFsIHRoZSBlcnJvciB0
aHJlYWQgKi8KIFVOSVZfSU5URVJOIG9zX2V2ZW50X3QJc3J2X2Vycm9yX2V2ZW50OwogCi0vKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgotQXN5bmNocm9ub3VzIHB1cmdlIHRocmVhZC4KLUByZXR1cm4JYSBkdW1t
eSBwYXJhbWV0ZXIgKi8KLVVOSVZfSU5URVJOCi1vc190aHJlYWRfcmV0X3QKLXNydl9wdXJnZV90
aHJlYWQoCi0vKj09PT09PT09PT09PT0qLwotCXZvaWQqCWFyZyBfX2F0dHJpYnV0ZV9fKCh1bnVz
ZWQpKSk7CS8qITwgaW46IGEgZHVtbXkgcGFyYW1ldGVyCi0JCQkJCQlyZXF1aXJlZCBieSBvc190
aHJlYWRfY3JlYXRlICovCi0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogUHJpbnRzIGNvdW50ZXJzIGZvciB3
b3JrIGRvbmUgYnkgc3J2X21hc3Rlcl90aHJlYWQuICovCiBzdGF0aWMKCg==

--===============1535501800==
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:48:22 +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


--===============1535501800==--