From: marko.makela
Date: June 24 2010 7:21am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3121)
List-Archive: http://lists.mysql.com/commits/112023
Message-Id: <201006240722.o5O7Ijkp025911@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0267033846=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDkyOS16N2Rq
NGJ0bmt5aHFtMjI5CgogMzEyMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI0CiAgICAgIHRyeF91
bmRvX3BhcnNlX3BhZ2VfaGVhZGVyKCk6IFNpbGVuY2UgYSBib2d1cyB3YXJuaW5nLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdW5kby5jCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdW5kby5jJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL3RyeC90cngwdW5kby5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjI0MDYwOTI5LXo3ZGo0YnRua3locW0yMjkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4
MHVuZG8uYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA3MjE0MC16cDIy
ZzJ1OTA4bmlmdXdpCkBAIC03MDcsNiArNzA3LDEyIEBAIHRyeF91bmRvX3BhcnNlX3BhZ2VfaGVh
ZGVyKAogCW10cl90KgltdHIpCS8qITwgaW46IG10ciBvciBOVUxMICovCiB7CiAJdHJ4X2lkX3QJ
dHJ4X2lkOworCS8qIFNpbGVuY2UgYSBHQ0Mgd2FybmluZyBhYm91dCBwb3NzaWJseSB1bmluaXRp
YWxpemVkIHZhcmlhYmxlCisJd2hlbiBtYWNoX3VsbF9wYXJzZV9jb21wcmVzc2VkKCkgaXMgbm90
IGlubGluZWQuICovCisJdXRfZCh0cnhfaWQgPSAwKTsKKwkvKiBEZWNsYXJlIHRoZSB2YXJpYWJs
ZSB1bmluaXRpYWxpemVkIGluIFZhbGdyaW5kLCBzbyB0aGF0IHRoZQorCWFib3ZlIGluaXRpYWxp
emF0aW9uIHdpbGwgbm90IG1hc2sgYW55IGJ1Z3MuICovCisJVU5JVl9NRU1fSU5WQUxJRCgmdHJ4
X2lkLCBzaXplb2YgdHJ4X2lkKTsKIAogCXB0ciA9IG1hY2hfdWxsX3BhcnNlX2NvbXByZXNzZWQo
cHRyLCBlbmRfcHRyLCAmdHJ4X2lkKTsKIAoK

--===============0267033846==
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: 133dbe1033b256ae8a78603b49654d9cb789026f
# timestamp: 2010-06-24 10:21:47 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   z7dj4btnkyhqm229
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTZkg14AAaRflAAwU3f//3+n
CwC////wBAAIAFAD/Lz0etzDoAMNCk9CbSGhoDQBoNADQAAAGkUaHpqMaTNEG1AAAAAAAEakwjKA
0ZqAA0NAAAAAAaqfppRkNpNDRmo0AAA0Gg0BoAJJBDQBNDIJglPammjRoNQGTTQ2oISn3W4SJECS
jhiFdbwKk8oALBQKM0MLFNpkiIWo2x3ls2QkwpKT+xWN1RF5pY4RsfEmiaDcfZQ7J1kNJDCCDhye
ZuupnW7ZgHylBIrEEMnyUItMp/CkKgtjAFBBPLuCHVdqktGXT7R2MrBZVuJtq2pHJyR0PYbcbrKP
KAurdgrHPSMfIRxT/XgOZiKoVAh7hdQoe41CqJKaLAwijqsQzOG2w+CWx4gTJgZDFGVQ+OgpCViE
lMlIkvsMKdfM+9NRr8fmpO77L1UynYtMMhF++EwquqvFuEU9mvU87FJPWEA2+pviiUwvyFhez6tr
FcHYP1KEFcUcox4V6sBWIG0MYwrebr6WquIl5W2S+6gsDdwwo0tM9EETAFTklAcNkFisgKKBjiFn
SQJJlxE66T5SjQoSSpCpWFzy1WuHkLi21Rieiaym2tTZK1WUGeFcrJCEBjw9kEA7pQJDkC1kpxIx
aFnnuBJmtaZKwT5yU4DOmoNgNNm+UhwRh8Scs0QRIla5DMKqRDyy6ZGOMfPo8z2cIMdvXjui4mfS
0Gxthhb0qkcZIlMyEOvdvZBtOCmBgEIUHFd2n2WJFp4Hu6nmW5v6efySJHia4QCKRspDZnGvK+SP
wbqkj0IDjNjHy1rxqGXuPF5oucats6h5+0GKVFj4L4VdFz5J6mOZvLvi7B43JyRakW+EYg5xM+/n
aoxUE2k0QXXH5LbcTreaFSEpb+WoblzdBgWF2yzrTlt7bFGNAtnpTKBgDsDo5pSGoVMU8Ztpbmc0
fc43gE8+MzYmWGY2vHdbsnZginbqFjw8O4biQWfArP86ddzHcRE83ipFl1w5rINS61evl9E4vTLl
Obhk0mvpXeyaebcRFrX4IxNZLoGm2RFhqvtsxmpvCfoElyqiwzYLt4QznTdN6R/eYagUyq2BIHOB
mSJdeTOSHBTOwOx4lE9HER6JtXekZh/B9Bnbo6F33xvNtWiMR8S1yJOIwRgDRZcPeKsiQTLgnaGr
qKkPZMqu3ns4pyRg6VkstqFUjwif0kXhYuLk1JqpLJCw4ZOZOIE2UptcZ+ap14hSknvFKbjSQJ6/
e8FJMXwk8mjFCZabaIZzah1iwrfIHWVyWT6SxqUTPLHaWc7zK2pkc2U9FiuqIYqkKggvRHPrV6Rp
nVXtFjXp3+pOqJK7PR+lAph9izB5HMTpCIKLtbHNbVniKd4v+J938XckU4UJA2ZINeA=


--===============0267033846==--