# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110207211243-7jbzaxdi3q6i53nm # 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@oracle.com-20110207175505-\ # 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=