From: marko.makela
Date: February 7 2011 9:13pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3484 to 3485)
List-Archive: http://lists.mysql.com/commits/130626
Message-Id: <201102072113.p17Kw6DY027177@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0451723377=="

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

IDM0ODUgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0wNwogICAgICBGaXggYm9ndXMgTWljcm9zb2Z0
IFZpc3VhbCBTdHVkaW8gd2FybmluZ3MuCiAgICAgIHV0X2Vycm9yIGRvZXMgbm90IHJldHVybi4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swd2FpdC5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByb2xsLmMKIDM0ODQgVmFzaWwgRGltb3YJMjAx
MS0wMi0wNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgLT4gbXlzcWwtdHJ1
bmstaW5ub2RiCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3QvdmFsZ3JpbmQuc3VwcAo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swd2FpdC5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazB3YWl0LmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3Jh
Y2xlLmNvbS0yMDExMDIwNzE3NTUwNS0xZHpyc24zc2xoZjdocGFvCisrKyBiL3N0b3JhZ2UvaW5u
b2Jhc2UvbG9jay9sb2NrMHdhaXQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDIwNzIxMTI0My03amJ6YXhkaTNxNmk1M25tCkBAIC0xOTIsNiArMTkyLDcgQEAgbG9ja193YWl0
X3RhYmxlX3Jlc2VydmVfc2xvdCgKIAlsb2NrX3dhaXRfdGFibGVfcHJpbnQoKTsKIAogCXV0X2Vy
cm9yOworCXJldHVybihOVUxMKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcm9sbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwcm9sbC5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAyMDcxNzU1
MDUtMWR6cnNuM3NsaGY3aHBhbworKysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcm9sbC5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjA3MjExMjQzLTdqYnpheGRpM3E2
aTUzbm0KQEAgLTI0NCw2ICsyNDQsNyBAQCB0cnhfcm9sbGJhY2tfbGFzdF9zcWxfc3RhdF9mb3Jf
bXlzcWwoCiAJfQogCiAJdXRfZXJyb3I7CisJcmV0dXJuKERCX0NPUlJVUFRJT04pOwogfQogCiAv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKCg==

--===============0451723377==
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:13:24 +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=


--===============0451723377==--