From: marko.makela
Date: January 25 2011 1:43pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3692) Bug#59585
List-Archive: http://lists.mysql.com/commits/129564
X-Bug: 59585
Message-Id: <201101251343.p0PCgpb7008443@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1777290009=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTEwMTcyOC01bTIy
cXJ3NTU1OHBpbWowCgogMzY5MiBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI1CiAgICAgIEJ1ZyM1
OTU4NSBGaXggNTg5MTIgaW50cm9kdWNlcyBjb21waWxlciB3YXJuaW5nCiAgICAgIGR1ZSB0byBw
b3RlbnRpYWxseSB1bmluaXRpYWxpemVkIHZhcmlhYmxlCiAgICAgIAogICAgICByb3dfdXBkX2No
YW5nZXNfb3JkX2ZpZWxkX2JpbmFyeSgpOiBJbml0aWFsaXplIGRmaWVsZF9sZW4gdG8gc3VwcHJl
c3MgdGhlCiAgICAgIHdhcm5pbmcuIFRoZSBjb21waWxlciBjYW5ub3Qga25vdyB0aGF0IHJvd19l
eHRfbG9va3VwKCkgZG9lcyBpbml0aWFsaXplCiAgICAgIGRmaWVsZF9sZW4gZm9yIHVzLCBhcyBp
dCBpcyBkZWZpbmVkIGluIGEgZGlmZmVyZW50IG1vZHVsZS4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vcm93L3JvdzB1cGQuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTEwMTcyOC01bTIycXJ3NTU1OHBpbWowCisr
KyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTAxMjUxMzQzMDgtY2xlMjRpZzZ1a3dlN3p3MgpAQCAtMSw1ICsxLDExIEBA
CiAyMDExLTAxLTI1CVRoZSBJbm5vREIgVGVhbQogCisJKiByb3cvcm93MHVwZC5jOgorCUJ1ZyM1
OTU4NSBGaXggNTg5MTIgaW50cm9kdWNlcyBjb21waWxlciB3YXJuaW5nCisJZHVlIHRvIHBvdGVu
dGlhbGx5IHVuaW5pdGlhbGl6ZWQgdmFyaWFibGUKKworMjAxMS0wMS0yNQlUaGUgSW5ub0RCIFRl
YW0KKwogCSogbXRyL210cjBsb2cuYzoKIAlCdWcjNTk0ODYgSW5jb3JyZWN0IHVzYWdlIG9mIFVO
SVZfVU5MSUtFTFkoKSBpbiBtbG9nX3BhcnNlX3N0cmluZygpCiAKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB1cGQuYycKLS0tIGEvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTAxMjUxMDE3MjgtNW0yMnFydzU1NThwaW1qMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
cm93L3JvdzB1cGQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTEzNDMw
OC1jbGUyNGlnNnVrd2U3encyCkBAIC0xMjUyLDYgKzEyNTIsMTAgQEAgcm93X3VwZF9jaGFuZ2Vz
X29yZF9maWVsZF9iaW5hcnkoCiAJCSAgICB8fCBkZmllbGRfaXNfbnVsbChkZmllbGQpKSB7CiAJ
CQkvKiBkbyBub3RoaW5nIHNwZWNpYWwgKi8KIAkJfSBlbHNlIGlmIChVTklWX0xJS0VMWV9OVUxM
KGV4dCkpIHsKKwkJCS8qIFNpbGVuY2UgYSBjb21waWxlciB3YXJuaW5nIHdpdGhvdXQKKwkJCXNp
bGVuY2luZyBhIFZhbGdyaW5kIGVycm9yLiAqLworCQkJZGZpZWxkX2xlbiA9IDA7CisJCQlVTklW
X01FTV9JTlZBTElEKCZkZmllbGRfbGVuLCBzaXplb2YgZGZpZWxkX2xlbik7CiAJCQkvKiBTZWUg
aWYgdGhlIGNvbHVtbiBpcyBzdG9yZWQgZXh0ZXJuYWxseS4gKi8KIAkJCWJ1ZiA9IHJvd19leHRf
bG9va3VwKGV4dCwgY29sX25vLCAmZGZpZWxkX2xlbik7CiAKCg==

--===============1777290009==
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: 85b3a675976746e67c64d913bd47d3fba6ef1e5a
# timestamp: 2011-01-25 15:43:21 +0200
# base_revision_id: marko.makela@stripped\
#   5m22qrw5558pimj0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUb0SSwAAmbflAAwW3f//38n
DwC////wBAAIAFAFTPa9toC2rRkMVSwklDUyZJ6nqT/UYo9NEPTUT1PaUGaEaMT1MT1BzRkxMAEx
GBGmBBiMEyYBGDVPQmKGmTTQyDEAAAAGgAAkSTJkRNGjUzTUZlPRA9TQ0YgAAAkkI1PRo1Mp5CYp
mJT8qbU09NQ9IyeoBtTaQwMDMz4CBn8tH7p5t3juks55ckB+t1srFEsdqhlrhiBOVEibGk0t1KDE
tUT4bEYIiImJLXBiBlbhg48YHbV6BKOyknfrSBUdfs4KG6BMq53P4CSNIeGRAX1+IC3hVMQiDRCe
MsYUhAPWNxdMsmMsPfqdwG3W7cVLgJzAVnoZqJQfPc6jC5w/Zg7HFyaEZeG1Ci3oyBWhkJpNDv41
FlM9tm0N6S7EKfDP2GohdE3QSKM1flNyS7UQEF8NDRu6hF7ijBq1c/5WDnyZEZQqpWhXTv8b6GSB
a5g1exy7Y0Kb64x2JyJxkLEpYHP6auE6DANqqNd8TpaeJH5IxoGt0MedJFRQZGZnhqz7THeW3Fg8
g1hqPWwVJ2018obuagFeeiSZiFmiU9OiSK2fcgq1cjCNoTOvBwF+RXsha8DWVEDCtDzYa2V8SJU/
jPufoN89TBDAcOA0pxZEeRmPaoortaOUDaQOp9yChAYd6x1vDJgL6cXmJhbsBwVBKoj1aJIsMyQf
EeORUONJlAcSRrzCWWi4kOjus4Wv2IfjiFlaNZ7gLn9V5xeEUVaVQnSCHwNGb6Day806Q3kRtMTR
IB87aaggBBE4QzQ6ldZgSM64FHaW0nug8qCVEY79KxwRCI4qMnvuKwurJeVLYlmsnAo38+Z33oyy
VIB1c1ZF9XZTw2rQejhWhZDYQwtZqL3lCjsQvfsnmZhmG8vpf5k/p0Sb5zMMlv/vpA+cVC+6r1m4
ozSe+eOw8GnubW5yHod5nm4K5J4rtCV+tC6+7Xnp2myDv7RLVllwMrkdaFXMlijrKo1mCq2aXxNs
0LrCzrfJjxsR4ZHUbx54Q6HWRPe0DFdordMjUu3ckyqMOopiQYG3ai8nlRadcdGKXgzI2T2fXkxG
shxycrXsJfkBeJWXBlG8HcA1UfrKjZnfINANe9HO3k5ETwwRcUk5HfOB6WpxOSrrdae3uPYznm0Z
AY8DLgQA+EKjDZ8A49AJEzoT4nezrlOMijhzP0THUQ9V2ZfB9+O6iJq/WA8ELSJsqV4VGCgBnxBx
QOrz9N1J0WGeHjntGR8ciIZJ0fJ7HPUchbpLROKoBQoF9qPoczMv9va9fcOxZMfaOtAwcmQ2+83C
9U7YdC14+iGKbRwMw1mnqQ2QqsgzAeL607ArGDUcOd3JEtNDBjQxT5vN2UaI7iq9Dd9gcvkbjQMM
zwvqTU4exC+m5E8xLjxA7AvRe5JGk2G8JUggBmCGLILROC6u2UFoxQvOD3IWkPidaZHfzqpLMcjC
3FOakF2RsIhrfdCV1E4SuYpBzWC8u7WQoifKtdkFyYNapeFNCumSV/OHmr9qQWo5bJFzf2JXo3QX
N6o4t8H6BFplhq42MJIkqsOwMKEyKdaOLjtCbTSDYnEkqU4yUCrHxeJaEwYqEtPRSY4cHzmW2L+g
dNiBkz+bjhd8oNmdtcB2WRBlqGuqvR0OeOS2Xlk2z+IzO4yVDnZWs4Cp3sSiwRcKSugJ7yPadwEa
62Krp8gyqKrqOLlzfmipBzAtBxFbZgOwIi3xkMqfXwqkA0mPAD/Evj/xdyRThQkEb0SSwA==


--===============1777290009==--