From: marko.makela
Date: June 24 2010 10:48am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3524) Bug#54679
List-Archive: http://lists.mysql.com/commits/112050
X-Bug: 54679
Message-Id: <201006241048.o5OA0bja000607@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1029657544=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDEwNDYyMC1wa2x1
bm93YWlndjdxdXU5CgogMzUyNCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI0CiAgICAgIEFkZCBD
aGFuZ2VMb2cgZW50cnkgZm9yIEJ1ZyM1NDY3OQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9n
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI0MTA0NjIwLXBrbHVub3dhaWd2
N3F1dTkKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDEwNDgyMC1wNG9qbXhjbXE4cWVvczZkCkBAIC0xLDMg
KzEsOSBAQAorMjAxMC0wNi0yNAlUaGUgSW5ub0RCIFRlYW0KKworCSogaGFuZGxlci9oYV9pbm5v
ZGIuY2M6CisJRml4IEJ1ZyM1NDY3OSBhbHRlciB0YWJsZSBjYXVzZXMgY29tcHJlc3NlZCByb3df
Zm9ybWF0IHRvIHJldmVydAorCXRvIGNvbXBhY3QKKwogMjAxMC0wNi0yMglUaGUgSW5ub0RCIFRl
YW0KIAogCSogZGljdC9kaWN0MGRpY3QuYywgZGljdC9kaWN0MG1lbS5jLCBpbmNsdWRlL2RpY3Qw
bWVtLmgsCgo=

--===============1029657544==
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.1-innodb/
# testament_sha1: 0db9382d67982aa93abd389a1614b7c3e6cc61e4
# timestamp: 2010-06-24 13:48:32 +0300
# base_revision_id: marko.makela@stripped\
#   pklunowaigv7quu9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWMa2FQAAX/flAAwWnP/938m
BAC////wBAAIAFADmU3ibuLrBzuEpCE2k000whknlMxIekeoAMJo0DKE0NDEam0mIQ0aPUAGjQ0a
AEkIRpFN5TYlPUyaHqfqj1HqHqDJoaNGgc0xMACYAJgABMAATBJIUxoIzU0CYJtFNMmT1HqaANpN
DGDG3u7GjpO35cjy57ujcPlK5KUnJu7xz8ijdvWXypZ1TlKH/v8/OHZj7cYj9Zx4dzb656mqxEOY
33HO9OHEHYJnIymy+xu809LBDq4FA0rll4wiC6IWDdSIUCDueSiGVKkwv1LkgjXOU2EXlHZI3j+y
x0Ez3xQYRN/WUgZhgk2VDUTZP8KedkKvGxBw07zbjLS+U7hiF2z/lPA5DZRIFTbRB1ulIoQMRNB2
AMh7LyRfHC50JaBHSjsxGu12oyvD5hbwMIRoc2YuvbOV93bkxE+dic31miwkw9BWtjhpQhMojCeZ
DGS0E9m4U562ux6s2WiJvcdByzPuKB5IKRrtEMuOshRfsdkdWa2LkwicvzuCxWuysvHWC8Y96WoU
J3nFahALUEVOEga0q5i64MToFgLFUtERy1La3OMqNWoGGaYRRgxYfhENC0jwLmtK1y2rNtjmcbMG
pPWGuRR01rUKhbVtDycbfH5i9Z17d2YwnELvqCJSKN+U4KVDsemPNQ8wIFjnRySaJgd/jAYM5xL5
njm3cDARP0oj3eSQ1XJrIBatgjnfNlpnVnRgvsR1qEscPBxgxy5e42rm8epqNy4qKiN4Goiy3wbR
tNxWWUeXi/s2MXOZIkKZIlWQstK9g5Ja3ccZmiR5FOJaYHGDJAeFQ1ra7hEj1Ud9LJtuvFPcpb4F
CAIVQ++OpmTooRrSJ46XyobvSNxI6RtOtJTtBuupvZK9UvQVU41KQxItpZauNKdZOaNQyE5XZ6VH
6rIWhYYtrAwRWPE2cPOPUONUx441fpNRk75JoaSSzp57W4BXGPrpuxZg4HAN/1hxn1i0mUR1yByW
lI1BSFLhLv30pDHZVLtdRoX5phakcxElgfcZ2qQTvyGiLoOgNcLaKaaAbZ08Ge5yNv9ecFevCSIM
DLDNgMIhOrvYKvMUhKkOMxV1SKwcHa5VilNYol9goyja7JyyauxlPg4usXUrd3Mh0lvUIu13ehyz
SiRaGyLaUJzZOmE+kYPdgxFdgNYtLVRGW7mM2b6h7k7KZAmWtlA3ysAoIWgvsL+31GhxY7yKtxpO
a0iAIn/ioR1L5EYrdp3vtMBv8R8P8XckU4UJBjGthUA=


--===============1029657544==--