From: marko.makela
Date: February 7 2011 9:12pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3485)
List-Archive: http://lists.mysql.com/commits/130628
Message-Id: <201102072147.p17LkFlc002501@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0295500272=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjA3MTc1NTA1LTFkenJz
bjNzbGhmN2hwYW8KCiAzNDg1IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMDcKICAgICAgRml4IGJv
Z3VzIE1pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIHdhcm5pbmdzLgogICAgICB1dF9lcnJvciBkb2Vz
IG5vdCByZXR1cm4uCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9s
b2NrMHdhaXQuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcm9sbC5jCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazB3YWl0LmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvbG9jay9sb2NrMHdhaXQuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29t
LTIwMTEwMjA3MTc1NTA1LTFkenJzbjNzbGhmN2hwYW8KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9s
b2NrL2xvY2swd2FpdC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjA3MjEx
MjQzLTdqYnpheGRpM3E2aTUzbm0KQEAgLTE5Miw2ICsxOTIsNyBAQCBsb2NrX3dhaXRfdGFibGVf
cmVzZXJ2ZV9zbG90KAogCWxvY2tfd2FpdF90YWJsZV9wcmludCgpOwogCiAJdXRfZXJyb3I7CisJ
cmV0dXJuKE5VTEwpOwogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvdHJ4L3RyeDByb2xsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3Ry
eDByb2xsLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIwNzE3NTUwNS0xZHpy
c24zc2xoZjdocGFvCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByb2xsLmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMDcyMTEyNDMtN2piemF4ZGkzcTZpNTNubQpA
QCAtMjQ0LDYgKzI0NCw3IEBAIHRyeF9yb2xsYmFja19sYXN0X3NxbF9zdGF0X2Zvcl9teXNxbCgK
IAl9CiAKIAl1dF9lcnJvcjsKKwlyZXR1cm4oREJfQ09SUlVQVElPTik7CiB9CiAKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqLy8qKgoK

--===============0295500272==
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.6-innodb/
# testament_sha1: f15e163b16ecbee184f230bb9f295660609696b9
# timestamp: 2011-02-07 23:12:51 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   1dzrsn3slhf7hpao
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWqza+gAAhRflAAwUmP//18n
3wC////wBAAIAFAEXqoAIhQLsCSSamp6aZTTTan6iPU2pk0bUANGmgaeiDQcwCYCZGAEYmJhMJgh
piaYEapoGmkZGhoBkABoyDQBhDTHMAmAmRgBGJiYTCYIaYmmAkkEaABMTQQaEmT1MyI0GnqDI9Qx
UYm/QY/b9Tym01cDXOpBZkdJmg/R2ucsSo1GZmZe2lFj4554hmJ7jWmie23Xf1S/mz2LP34oJY3E
jJSzYL81ZXHgfTw9oD2FEJjY6dvn8vQJjkrSpC9A6AWhKHIbhPDks46ZYSVEjMVCTlLSkb0BorkY
9Ix0uY5AGYOtZCYidf4XKcvMwoHkBkjqHEilkyorNCYpj4hwXUuBgQZWTOT+yRhFClqW91U6FTaV
gN3zymCBSkVPupdfG3dMHkv7q18wiOLFdeW+zXILlQMGxgaqGmWdFds6SpM0JngOIjxFa2MLy0kE
2mDkWnk3wFdZiMI7gngXUq22lx4FISIg8mO4fgBmB2J9G5zZSKQywc08zy8DwhzogpnxynNFctQ6
nM8uKEbRVRSQMQOajaovKb6S6gJLMoFfAnHNgcsZtxWVbcg3XxDAoFKohwz+oGWmONI8yM2RowFa
MpliUBfheGFBx1Ly9y3gOfWwPDOzRRGKh17nWTWk8MnBAe+qtOCaBg2RC8xqKKiOcp3xcEmg6WTR
xWr1O4GnaKkieTYBBdh2Kiui5wJzmdiGdTjM10KT8TIJjcBmbR57NFritis8Nb6DVJ8e8b7I7NMU
WalXTiZHdpeFfSVDnhyjFNZkDm6Uiva86iY8s4lGXrZOXrSNqrSNueBCOBOqGS+tCRT96ctwG2wY
efxH1HxzXqbx5A+QPI4Tmx1+2kCs+fmkyJw5lB2hSQ99grjAL5yQTdo46+rro/cHOErhLJ/E0xty
7ccJRztDaQPHxRmXF/Q+YVF0YB9AOi3LPlXVvXgILB/EuNw/vPWXZ0DuN3sqTrCRFfCPyXbk1HDl
vNVlMW/NK3HrcagWBcyYL2HDl0Y9+q6UATodQHQ5jG44rUhgahsPRxsUj7HedDix92TXCg/uOw3i
m6KxUo0MwNwG7Us8bOCGlJWLMTx6x5ospl+OeMZVI6keuq5/7E1sNQN44GCdI+2aNQT51yWwUoe5
JPJCTBBR4rD3W+no1VVyJITDe5I0JydMO1vVhKFxupcowTpiDNemXEmih7HCaBgHwAjVK8T2Bl1c
3MkZBNTSuVvbBb0lQjNEtglkROq3J81F8gF+tYHDBErVuN8AH34JyQTlYlAPxMneMDvrEQYDINX1
BVpx1hoJIOQJIIT3GJS5C7kyrLVshxOcGM1crKShEmo2jtFQteeQXNXmHKeiyskigHB0R2xgFnre
pY24SDUjBaWnBlcnliqRwWV1aeMsQIocncgPeTKLzBf8aeP/i7kinChINVm19AA=


--===============0295500272==--