From: marko.makela
Date: February 15 2011 10:22am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3320 to 3321)
List-Archive: http://lists.mysql.com/commits/131346
Message-Id: <201102151022.p1FAJfMp016014@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0715205828=="

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

IDMzMjEgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNjAwNDkucmVzdWx0CiAgICAgIG15c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LW1hc3Rlci5vcHQKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAogMzMyMCBNYXJrbyBNw6Rr
ZWzDpAkyMDExLTAyLTE1IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xLWlubm9kYiB0byBt
eXNxbC01LjUtaW5ub2RiLgoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi9yL2lubm9kYl9idWc1OTMwNy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
dC9pbm5vZGJfYnVnNTkzMDcudGVzdAogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9zeW5jMHJ3LmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3
LmMKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzYw
MDQ5LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNjAw
NDkucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGJfYnVnNjAwNDkucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMjE1MTAxODE1LWppYm1iMG1meDA0bHA4ZzAKQEAgLTAsMCArMSw4IEBACitD
UkVBVEUgVEFCTEUgdChhIElOVClFTkdJTkU9SW5ub0RCOworUkVOQU1FIFRBQkxFIHQgVE8gdTsK
K0RST1AgVEFCTEUgdTsKK1NFTEVDVCBAQGlubm9kYl9mYXN0X3NodXRkb3duOworQEBpbm5vZGJf
ZmFzdF9zaHV0ZG93bgorMAorTGFzdCByZWNvcmQgb2YgSURfSU5EIHJvb3QgcGFnZSAoOSk6Cisx
ODA4MDAwMDE4MDUwMDc0MDAwMDAwMDAwMDAwMDAwYzUzNTk1MzVmNDY0ZjUyNDU0OTQ3NGU1ZjQz
NGY0YzUzCgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJf
YnVnNjAwNDktbWFzdGVyLm9wdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5v
ZGJfYnVnNjAwNDktbWFzdGVyLm9wdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215
c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LW1hc3Rlci5vcHQJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDE4MTUtamlibWIwbWZ4MDRscDhnMApA
QCAtMCwwICsxIEBACistLWlubm9kYl9mYXN0X3NodXRkb3duPTAKCj09PSBhZGRlZCBmaWxlICdt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0JwotLS0gYS9teXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CTE5NzAtMDEtMDEgMDA6
MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAw
NDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTEwMTgxNS1qaWJt
YjBtZngwNGxwOGcwCkBAIC0wLDAgKzEsMzggQEAKKyMgQnVnICM2MDA0OSBWZXJpZnkgdGhhdCBw
dXJnZSBsZWF2ZXMgbm8gZ2FyYmFnZSBpbiB1bmlxdWUgc2Vjb25kYXJ5IGluZGV4ZXMKKyMgVGhp
cyB0ZXN0IHJlcXVpcmVzIGEgZnJlc2ggc2VydmVyIHN0YXJ0LXVwIGFuZCBhIHNsb3cgc2h1dGRv
d24uCisjIFRoaXMgd2FzIGEgc3VzcGVjdGVkIGJ1ZyAobm90IGEgYnVnKS4KKworLS0gc291cmNl
IGluY2x1ZGUvaGF2ZV9pbm5vZGIuaW5jCisKK0NSRUFURSBUQUJMRSB0KGEgSU5UKUVOR0lORT1J
bm5vREI7CitSRU5BTUUgVEFCTEUgdCBUTyB1OworRFJPUCBUQUJMRSB1OworU0VMRUNUIEBAaW5u
b2RiX2Zhc3Rfc2h1dGRvd247CitsZXQgJE1ZU1FMRF9EQVRBRElSPWBzZWxlY3QgQEBkYXRhZGly
YDsKKworIyBTaHV0IGRvd24gdGhlIHNlcnZlcgorLS0gZXhlYyBlY2hvICJ3YWl0IiA+ICRNWVNR
TFRFU1RfVkFSRElSL3RtcC9teXNxbGQuMS5leHBlY3QKKy0tIHNodXRkb3duX3NlcnZlciAxMAor
LS0gc291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9kaXNjb25uZWN0ZWQuaW5jCisKKyMgQ2hlY2sg
dGhlIHRhaWwgb2YgSURfSU5EIChTWVNfVEFCTEVTLklEKQorbGV0IElCREFUQTE9JE1ZU1FMRF9E
QVRBRElSL2liZGF0YTE7CitwZXJsOworbXkgJGZpbGUgPSAkRU5WeydJQkRBVEExJ307CitvcGVu
KEZJTEUsICI8JGZpbGUiKSB8fCBkaWUgIlVuYWJsZSB0byBvcGVuICRmaWxlIjsKKyMgUmVhZCBE
SUNUX0hEUl9UQUJMRV9JRFMsIHRoZSByb290IHBhZ2UgbnVtYmVyIG9mIElEX0lORCAoU1lTX1RB
QkxFUy5JRCkuCitzZWVrKEZJTEUsIDcqMTYzODQrMzgrMzYsIDApIHx8IGRpZSAiVW5hYmxlIHRv
IHNlZWsgJGZpbGUiOworZGllIHVubGVzcyByZWFkKEZJTEUsICRfLCA0KSA9PSA0OworbXkgJHN5
c190YWJsZXNfaWRfcm9vdCA9IHVucGFjayAiTiI7CitwcmludCAiTGFzdCByZWNvcmQgb2YgSURf
SU5EIHJvb3QgcGFnZSAoJHN5c190YWJsZXNfaWRfcm9vdCk6XG4iOworIyBUaGlzIHNob3VsZCBi
ZSB0aGUgbGFzdCByZWNvcmQgaW4gSURfSU5ELiBEdW1wIGl0IGluIGhleGFkZWNpbWFsLgorc2Vl
ayhGSUxFLCAkc3lzX3RhYmxlc19pZF9yb290KjE2Mzg0ICsgMTUyLCAwKSB8fCBkaWUgIlVuYWJs
ZSB0byBzZWVrICRmaWxlIjsKK3JlYWQoRklMRSwgJF8sIDMyKSB8fCBkaWUgIlVuYWJsZSB0byBy
ZWFkICRmaWxlIjsKK2Nsb3NlKEZJTEUpOworcHJpbnQgdW5wYWNrKCJIKiIpLCJcbiI7CitFT0YK
KworIyBSZXN0YXJ0IHRoZSBzZXJ2ZXIuCistLSBleGVjIGVjaG8gInJlc3RhcnQiID4gJE1ZU1FM
VEVTVF9WQVJESVIvdG1wL215c3FsZC4xLmV4cGVjdAorLS0gZW5hYmxlX3JlY29ubmVjdAorLS0g
c291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9jb25uZWN0ZWRfYWdhaW4uaW5jCgo=

--===============0715205828==
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: 9561b307f47520cecce4c2b69e86073ab7927ba5
# timestamp: 2011-02-15 12:22:42 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   m1fq3d03qbebcn1q
# 
# Begin bundle
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


--===============0715205828==--