From: marko.makela
Date: February 16 2011 1:45pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3502 to 3503)
List-Archive: http://lists.mysql.com/commits/131429
Message-Id: <201102161346.p1GChDT3015900@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0930923030=="

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

IDM1MDMgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CiAzNTAyIE1hcmtv
IE3DpGtlbMOkCTIwMTEtMDItMTUKICAgICAgQnVnIzYwMDQ5IENsYXJpZnkgdGhlIGNvbW1lbnRz
IGluIHJvd19pbnNfbXVzdF9tb2RpZnkoKQogICAgICAKICAgICAgcm93X2luc19tdXN0X21vZGlm
eV9yZWMoKTogUmVuYW1lZCBmcm9tIHJvd19pbnNfbXVzdF9tb2RpZnkoKS4KICAgICAgQ2hhbmdl
IHRoZSByZXR1cm4gdHlwZSB0byBpYm9vbC4gTWFrZSB0aGUgcGFyYW1ldGVyIGNvbnN0LgogICAg
ICBDbGFyaWZ5IHdoeSB3ZSBvbmx5IGFsbG93IHVwZGF0aW5nIHRoZSBwcmV2aW91cyByZWNvcmQg
aW4gcGxhY2UuCiAgICAgIAogICAgICBST1dfSU5TX1BSRVYsIFJPV19JTlNfTkVYVDogUmVtb3Zl
LiBUaGVzZSB3ZXJlIHRoZSBub256ZXJvIHJldHVybgogICAgICB2YWx1ZXMgb2Ygcm93X2luc19t
dXN0X21vZGlmeSgpLiBST1dfSU5TX05FWFQgd2FzIG5ldmVyIHJldHVybmVkLgogICAgICAKICAg
ICAgcm93X2luc19pbmRleF9lbnRyeV9sb3coKTogQ2hhbmdlIHRoZSB0eXBlIG9mICJtb2RpZnki
IHRvIGlib29sLgogICAgICBSZW1vdmUgdGhlIGhhbmRsaW5nIGZvciBST1dfSU5TX05FWFQsIHdo
aWNoIHdhcyBuZXZlciByZXR1cm5lZC4KICAgICAgCiAgICAgIGJ0cl9jdXJfZ2V0X2Jsb2NrKCks
IGJ0cl9jdXJfZ2V0X3JlYygpOiBEZWZpbmUgYXMgY29uc3RuZXNzLXByZXNlcnZpbmcKICAgICAg
bWFjcm9zLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRy
MGN1ci5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwY3VyLmljCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDIxNTEwNDI1My1yazBucXpkbzBtNmY3YmIxCisrKyBiL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTAyMTYxMzQ0MDItamsxZWR4MWR6eTM5OHg4ZwpAQCAtMjMsMTMgKzIzLDEz
IEBAIG9wZW4oRklMRSwgIjwkZmlsZSIpIHx8IGRpZSAiVW5hYmxlIHRvIG8KICMgUmVhZCBESUNU
X0hEUl9UQUJMRV9JRFMsIHRoZSByb290IHBhZ2UgbnVtYmVyIG9mIElEX0lORCAoU1lTX1RBQkxF
Uy5JRCkuCiBzZWVrKEZJTEUsIDcqMTYzODQrMzgrMzYsIDApIHx8IGRpZSAiVW5hYmxlIHRvIHNl
ZWsgJGZpbGUiOwogZGllIHVubGVzcyByZWFkKEZJTEUsICRfLCA0KSA9PSA0OwotbXkgJHN5c190
YWJsZXNfaWRfcm9vdCA9IHVucGFjayAiTiI7CitteSAkc3lzX3RhYmxlc19pZF9yb290ID0gdW5w
YWNrKCJOIiwgJF8pOwogcHJpbnQgIkxhc3QgcmVjb3JkIG9mIElEX0lORCByb290IHBhZ2UgKCRz
eXNfdGFibGVzX2lkX3Jvb3QpOlxuIjsKICMgVGhpcyBzaG91bGQgYmUgdGhlIGxhc3QgcmVjb3Jk
IGluIElEX0lORC4gRHVtcCBpdCBpbiBoZXhhZGVjaW1hbC4KIHNlZWsoRklMRSwgJHN5c190YWJs
ZXNfaWRfcm9vdCoxNjM4NCArIDE1MiwgMCkgfHwgZGllICJVbmFibGUgdG8gc2VlayAkZmlsZSI7
CiByZWFkKEZJTEUsICRfLCAzMikgfHwgZGllICJVbmFibGUgdG8gcmVhZCAkZmlsZSI7CiBjbG9z
ZShGSUxFKTsKLXByaW50IHVucGFjaygiSCoiKSwiXG4iOworcHJpbnQgdW5wYWNrKCJIKiIsICRf
KSwgIlxuIjsKIEVPRgogCiAjIFJlc3RhcnQgdGhlIHNlcnZlci4KCg==

--===============0930923030==
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:46:10 +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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


--===============0930923030==--