From: marko.makela
Date: February 15 2011 10:21am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3501)
List-Archive: http://lists.mysql.com/commits/131282
Message-Id: <201102151021.p1F9nH06005656@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2065480084=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTA5NTIwMS1qcHI5
ZDFzcW5ncTQ3MGYyCgogMzUwMSBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTE1IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgYWRk
ZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzYwMDQ5LnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS1tYXN0ZXIu
b3B0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QK
PT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzYwMDQ5
LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNjAwNDku
cmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGJfYnVnNjAwNDkucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTEwMjE1MTAyMDQ1LTJucWZnMW51b3Vid2N1bGIKQEAgLTAsMCArMSw4IEBACitDUkVB
VEUgVEFCTEUgdChhIElOVClFTkdJTkU9SW5ub0RCOworUkVOQU1FIFRBQkxFIHQgVE8gdTsKK0RS
T1AgVEFCTEUgdTsKK1NFTEVDVCBAQGlubm9kYl9mYXN0X3NodXRkb3duOworQEBpbm5vZGJfZmFz
dF9zaHV0ZG93bgorMAorTGFzdCByZWNvcmQgb2YgSURfSU5EIHJvb3QgcGFnZSAoOSk6CisxODA4
MDAwMDE4MDUwMDc0MDAwMDAwMDAwMDAwMDAwYzUzNTk1MzVmNDY0ZjUyNDU0OTQ3NGU1ZjQzNGY0
YzUzCgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVn
NjAwNDktbWFzdGVyLm9wdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJf
YnVnNjAwNDktbWFzdGVyLm9wdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LW1hc3Rlci5vcHQJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDIwNDUtMm5xZmcxbnVvdWJ3Y3VsYgpAQCAt
MCwwICsxIEBACistLWlubm9kYl9mYXN0X3NodXRkb3duPTAKCj09PSBhZGRlZCBmaWxlICdteXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0JwotLS0gYS9teXNxbC10
ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6
MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDku
dGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTEwMjA0NS0ybnFmZzFu
dW91YndjdWxiCkBAIC0wLDAgKzEsMzggQEAKKyMgQnVnICM2MDA0OSBWZXJpZnkgdGhhdCBwdXJn
ZSBsZWF2ZXMgbm8gZ2FyYmFnZSBpbiB1bmlxdWUgc2Vjb25kYXJ5IGluZGV4ZXMKKyMgVGhpcyB0
ZXN0IHJlcXVpcmVzIGEgZnJlc2ggc2VydmVyIHN0YXJ0LXVwIGFuZCBhIHNsb3cgc2h1dGRvd24u
CisjIFRoaXMgd2FzIGEgc3VzcGVjdGVkIGJ1ZyAobm90IGEgYnVnKS4KKworLS0gc291cmNlIGlu
Y2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCisKK0NSRUFURSBUQUJMRSB0KGEgSU5UKUVOR0lORT1Jbm5v
REI7CitSRU5BTUUgVEFCTEUgdCBUTyB1OworRFJPUCBUQUJMRSB1OworU0VMRUNUIEBAaW5ub2Ri
X2Zhc3Rfc2h1dGRvd247CitsZXQgJE1ZU1FMRF9EQVRBRElSPWBzZWxlY3QgQEBkYXRhZGlyYDsK
KworIyBTaHV0IGRvd24gdGhlIHNlcnZlcgorLS0gZXhlYyBlY2hvICJ3YWl0IiA+ICRNWVNRTFRF
U1RfVkFSRElSL3RtcC9teXNxbGQuMS5leHBlY3QKKy0tIHNodXRkb3duX3NlcnZlciAxMAorLS0g
c291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9kaXNjb25uZWN0ZWQuaW5jCisKKyMgQ2hlY2sgdGhl
IHRhaWwgb2YgSURfSU5EIChTWVNfVEFCTEVTLklEKQorbGV0IElCREFUQTE9JE1ZU1FMRF9EQVRB
RElSL2liZGF0YTE7CitwZXJsOworbXkgJGZpbGUgPSAkRU5WeydJQkRBVEExJ307CitvcGVuKEZJ
TEUsICI8JGZpbGUiKSB8fCBkaWUgIlVuYWJsZSB0byBvcGVuICRmaWxlIjsKKyMgUmVhZCBESUNU
X0hEUl9UQUJMRV9JRFMsIHRoZSByb290IHBhZ2UgbnVtYmVyIG9mIElEX0lORCAoU1lTX1RBQkxF
Uy5JRCkuCitzZWVrKEZJTEUsIDcqMTYzODQrMzgrMzYsIDApIHx8IGRpZSAiVW5hYmxlIHRvIHNl
ZWsgJGZpbGUiOworZGllIHVubGVzcyByZWFkKEZJTEUsICRfLCA0KSA9PSA0OworbXkgJHN5c190
YWJsZXNfaWRfcm9vdCA9IHVucGFjayAiTiI7CitwcmludCAiTGFzdCByZWNvcmQgb2YgSURfSU5E
IHJvb3QgcGFnZSAoJHN5c190YWJsZXNfaWRfcm9vdCk6XG4iOworIyBUaGlzIHNob3VsZCBiZSB0
aGUgbGFzdCByZWNvcmQgaW4gSURfSU5ELiBEdW1wIGl0IGluIGhleGFkZWNpbWFsLgorc2VlayhG
SUxFLCAkc3lzX3RhYmxlc19pZF9yb290KjE2Mzg0ICsgMTUyLCAwKSB8fCBkaWUgIlVuYWJsZSB0
byBzZWVrICRmaWxlIjsKK3JlYWQoRklMRSwgJF8sIDMyKSB8fCBkaWUgIlVuYWJsZSB0byByZWFk
ICRmaWxlIjsKK2Nsb3NlKEZJTEUpOworcHJpbnQgdW5wYWNrKCJIKiIpLCJcbiI7CitFT0YKKwor
IyBSZXN0YXJ0IHRoZSBzZXJ2ZXIuCistLSBleGVjIGVjaG8gInJlc3RhcnQiID4gJE1ZU1FMVEVT
VF9WQVJESVIvdG1wL215c3FsZC4xLmV4cGVjdAorLS0gZW5hYmxlX3JlY29ubmVjdAorLS0gc291
cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9jb25uZWN0ZWRfYWdhaW4uaW5jCgo=

--===============2065480084==
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: 1f2ace3dac83ce09210b9754ed7a306be96f7ead
# timestamp: 2011-02-15 12:21:27 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   jpr9d1sqngq470f2
# 
# Begin bundle
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


--===============2065480084==--