From: marko.makela
Date: December 1 2010 8:15am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3246 to 3247)
List-Archive: http://lists.mysql.com/commits/125610
Message-Id: <201012010818.oB18BKrO009699@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0620964040=="

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

IDMyNDcgTWFya28gTcOka2Vsw6QJMjAxMC0xMi0wMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS90cngvdHJ4MGlfcy5jCiAzMjQ2IGtldmluLmxld2lzQG9yYWNsZS5jb20J
MjAxMC0xMS0zMAogICAgICBGaXggY29tcGlsZXIgd2FybmluZyBmb3IgQnVnIzU1MjIyIHBhdGNo
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBtZW0uYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MGlfcy5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL3RyeC90cngwaV9zLmMJcmV2aWQ6a2V2aW4ubGV3aXNAb3JhY2xlLmNv
bS0yMDEwMTIwMTAyMTMwMi0zMTFhNTYwODV3eGVzczN4CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
dHJ4L3RyeDBpX3MuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MDkz
Mi14ajN0NjJpc3FxNWx3NDdqCkBAIC00NDIsNyArNDQyLDcgQEAgaV9zX2xvY2tzX3Jvd192YWxp
ZGF0ZSgKIAkJLyogcmVjb3JkIGxvY2sgKi8KIAkJdXRfYWQoIXN0cmNtcCgiUkVDT1JEIiwgcm93
LT5sb2NrX3R5cGUpKTsKIAkJdXRfYWQocm93LT5sb2NrX2luZGV4ICE9IE5VTEwpOwotCQl1dF9h
ZChyb3ctPmxvY2tfZGF0YSAhPSBOVUxMKTsKKwkJLyogcm93LT5sb2NrX2RhdGEgPT0gTlVMTCBp
ZiBidWZfcGFnZV90cnlfZ2V0KCkgPT0gTlVMTCAqLwogCQl1dF9hZChyb3ctPmxvY2tfcGFnZSAh
PSBVTElOVF9VTkRFRklORUQpOwogCQl1dF9hZChyb3ctPmxvY2tfcmVjICE9IFVMSU5UX1VOREVG
SU5FRCk7CiAJfQoK

--===============0620964040==
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: 9c05a4a3667975e93a7907d79931554b8e23cf30
# timestamp: 2010-12-01 10:16:08 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: kevin.lewis@stripped\
#   311a56085wxess3x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUAtWqQAA1RflGAwWnP/93tn
ngC////wBAAIAFAGHux3CIhMlatg0olhKJBJsU9TanpmpkENNBtRkNHqDTTQ8k0BJJGgYmmkJhT0
2qeoaAA0AAAAap5U/UT0g9T1A0NAAANANAAADmjJiYAJiMCNMCDEYJkwCMEkkwSZJtNDIaJkMmKY
k9GU2kADTajIPe7FmzYGVj9Poex8zA2FQadZjw25RbGLGSjPbTVAdUkQTFQu4aQYFAgRETXGa0Oy
BIoWtFsNtswxw0cM1P0lr3za9dJ1k9g8sz6fF0cwbHlf1OQ0m+30cGKHaoPQ7YWYKcYQlBm5XZmi
DjrBKsGAsCAGhPluacq53IxLAE6RC+jRLCoTfCJQcJ1VKoYbRnQRCMMbGEcwtghaUkJwI5+XTTcW
Y3uc6Bi8UmQzUGnzGEkUI7BMCJJMvO6k8XCGTeTLaMLApfNARXhEXnJ40VEYcyciWBiKCv0F3C4C
HlqIsL1OhQAviyQP5nEL9pSESLLKQIlAupMkFI112W3WVhqUBfV7MZis6jCFa9hdwQNl/Q0nlflM
jtlAUNbkHR448KYHgEcIMbHpwobGG5AKSQPDHexsjoo10laFVd5EWGqpLWewSe9WcpiJC1CI67MU
jVKDKxlVeuh5qFCm7CaFYEQeJjCLrxOOlHQR3iZQWediNA1bPrcFgX6aSgcStyPPAUSFkqQtFiDE
GLOLHqkuUC4pV05M2Mj1SpkInvE5RccC5sC9NUSMub6Z4CdfjApxlj0tZ9hbFTpgaM6qWRatBXQq
CbRFiXZT2GpDyyI2WInXmGDhrlaV1NXLqjoWiuzXbImN+GIqHJVSa0wKDCntatXmWbGZFBQsgKkx
GE12BVCve4LKFwQshKVmdd+WjGGZAtLiLqY0kK9YtMeaiqYqxOv2Fr7St0eW6LywGdv8k7/erK1x
IRQ1g4M5YTGiBnAylATHCYmNAKUpTGKT2DUfM2moNhWd1DNQRLjkfI5LwXikzCKIGyuCSIUVBVV1
wx/dj6vwCJtuO26zcQI8blLbI/yBw4o/kk9feUyGMYiN0LnXvRHwerZVpuAfCg4v3OFQy1+B0Kon
JifxBDvMKPef5+ghfDFzsYxmgilK6YI979JG8YWWaR7kwRIRqfxHq4YrZOIt8nGFEpPqfa3Q3UcF
5HRIoiSTEIsfsZkBQitFO+i2q1i0cl61TfAWQmA9Kj8Sg2Gpgrcf0OEKYhZk6pKZTQ3YG2IGWZaK
+ssF2vE7IoMcOj0F1WarahYBxrKh3Ebt/Xg8Eo5CwhiKnQOyO+3vOBtIKQzpEAN+UeEVxur0GxJ5
OOZ7l0lbrjho4jP9jgVCIO0hnEURstDDPNkFGhIbExBSsYkQGEVQnm6ejILmO3YXnPthQQICjhQd
gt5UFq+5yK1vGXQMi13ViOe9aDeWJtoFuoreHtnMqGUFzEVF4rbHCGzHQyi2uMSMRPYFos7weu4W
5KykPtDWaCBMvA4B3eIqwLxdxZIzdqOAv2qVHSXXrGV4I+5mFglsEiGpVnWBYBYOBLiREJg8RRN5
1HhleW+QWB3RC0gCKHyPmM5DDhnczWjIoKhzGwxFA8PrprJRYZMJi9goJCej4Jh5kdEzjOCYRgeY
hgHjCYWHecSxwIuKQoMeXXxBLARzLF9xCglFE3CzeWh6hG0l0tuGGE3yTwmeHquWPXSS4ir4gcxH
XsRf1IAo1CqcIqO8tCZmgJE0U3D7CToiJBKIkwmxaGhAIiuEZFhIT57YEhsjG5wzESQDEjSwzGce
K5EUxaA50AWgqhxuB0RnD7ygaDDzOhAGKy9LACs/ojuFLXimbOOo382bQuJU6yMRaxK2Amt3PFyW
WoFpXisBZpC1RS7BHpUYVLWHWrp/BxlZ/i7kinChIIBatUg=


--===============0620964040==--