From: marko.makela
Date: November 3 2010 1:00pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3222 to 3223)
List-Archive: http://lists.mysql.com/commits/122678
Message-Id: <201011031301.oA3BpJWg006489@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0106470417=="

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

IDMyMjMgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0wMyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYwogMzIyMiBNYXJrbyBNw6RrZWzDpAkyMDEwLTEx
LTAzIFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xLWlubm9kYiB0byBteXNxbC01LjUtaW5u
b2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwY3JlYS5jCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9idHIwYnRyLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0
cjBidHIuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIuaAogICAgICBz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MGlucy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9yb3cwdXBkLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zeW5j
L3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5MjUxNC13
NzNxbzBnY2d1eW81OTJpCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3LmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMDMxMjUxMTUteGcxYjV6c2d5ZWF0dmd6
MgpAQCAtMTAwMiw3ICsxMDAyLDcgQEAgcndfbG9ja19kZWJ1Z19wcmludCgKIAogCXJ3dAkgID0g
aW5mby0+bG9ja190eXBlOwogCi0JZnByaW50ZihzdGRlcnIsICJMb2NrZWQ6IHRocmVhZCAlbGQg
ZmlsZSAlcyBsaW5lICVsZCAgIiwKKwlmcHJpbnRmKHN0ZGVyciwgIkxvY2tlZDogdGhyZWFkICVs
dSBmaWxlICVzIGxpbmUgJWx1ICAiLAogCQkodWxvbmcpIG9zX3RocmVhZF9wZihpbmZvLT50aHJl
YWRfaWQpLCBpbmZvLT5maWxlX25hbWUsCiAJCSh1bG9uZykgaW5mby0+bGluZSk7CiAJaWYgKHJ3
dCA9PSBSV19MT0NLX1NIQVJFRCkgewoK

--===============0106470417==
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: 7f0ff3432df511df9ee00f34e0a9971ef30fea65
# timestamp: 2010-11-03 15:01:17 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   w73qo0gcguyo592i
# 
# Begin bundle
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
TsDdPMf4MprP8XckU4UJBSOW5iA=


--===============0106470417==--