From: marko.makela
Date: February 16 2011 1:44pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3503)
List-Archive: http://lists.mysql.com/commits/131427
Message-Id: <201102161345.p1GCtfXp017594@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0648252331=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTEwNDI1My1yazBu
cXpkbzBtNmY3YmIxCgogMzUwMyBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTE2IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRl
c3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1
ZzYwMDQ5LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYw
MDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDQyNTMtcmsw
bnF6ZG8wbTZmN2JiMQorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2
MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE2MTM0NDAyLWpr
MWVkeDFkenkzOTh4OGcKQEAgLTIzLDEzICsyMywxMyBAQCBvcGVuKEZJTEUsICI8JGZpbGUiKSB8
fCBkaWUgIlVuYWJsZSB0byBvCiAjIFJlYWQgRElDVF9IRFJfVEFCTEVfSURTLCB0aGUgcm9vdCBw
YWdlIG51bWJlciBvZiBJRF9JTkQgKFNZU19UQUJMRVMuSUQpLgogc2VlayhGSUxFLCA3KjE2Mzg0
KzM4KzM2LCAwKSB8fCBkaWUgIlVuYWJsZSB0byBzZWVrICRmaWxlIjsKIGRpZSB1bmxlc3MgcmVh
ZChGSUxFLCAkXywgNCkgPT0gNDsKLW15ICRzeXNfdGFibGVzX2lkX3Jvb3QgPSB1bnBhY2sgIk4i
OworbXkgJHN5c190YWJsZXNfaWRfcm9vdCA9IHVucGFjaygiTiIsICRfKTsKIHByaW50ICJMYXN0
IHJlY29yZCBvZiBJRF9JTkQgcm9vdCBwYWdlICgkc3lzX3RhYmxlc19pZF9yb290KTpcbiI7CiAj
IFRoaXMgc2hvdWxkIGJlIHRoZSBsYXN0IHJlY29yZCBpbiBJRF9JTkQuIER1bXAgaXQgaW4gaGV4
YWRlY2ltYWwuCiBzZWVrKEZJTEUsICRzeXNfdGFibGVzX2lkX3Jvb3QqMTYzODQgKyAxNTIsIDAp
IHx8IGRpZSAiVW5hYmxlIHRvIHNlZWsgJGZpbGUiOwogcmVhZChGSUxFLCAkXywgMzIpIHx8IGRp
ZSAiVW5hYmxlIHRvIHJlYWQgJGZpbGUiOwogY2xvc2UoRklMRSk7Ci1wcmludCB1bnBhY2soIkgq
IiksIlxuIjsKK3ByaW50IHVucGFjaygiSCoiLCAkXyksICJcbiI7CiBFT0YKIAogIyBSZXN0YXJ0
IHRoZSBzZXJ2ZXIuCgo=

--===============0648252331==
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: 61156a09475fd75e26ef83f075a5802c99897ed6
# timestamp: 2011-02-16 15:45:09 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   rk0nqzdo0m6f7bb1
# 
# Begin bundle
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


--===============0648252331==--