# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110130211114-zh2186mt6n8q88h8 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 8246aa4b5d0a570c5861245aaadbc63d496e48bb # timestamp: 2011-01-30 23:11:39 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110130200528-\ # 09fy58zzr5v1i1xm # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZxpdjIAAoFflEAwcnP//38D nEC////wBAAIAFAEtnksomq66tldt04RUU0m0amh6mnoah6j1NqZBoAAAGmgSUIaaNNA0g0mmoPS DTRoAA0ABIpoUMiepk1MIY0EaYjATanqYj9UYDmATATIwAjExMJhMENMTTASSCE2k0xT0yDQKant TUbyQ0BGaaIxJANAThQO4ad81HEye7jmTG/Pt9tQ/o1fiqOGPHJCmOVI3U5y7AnnNwuN4bbYfvvW 1PA4xSMbJvM6FMpFIl6/DjCwuWr00wchrmYwf2SOY1HMQF5b4FMx6jvDuO3Iaww2nLdigeyMRTB9 5OI9OZAerBN5oUvIVQvyYEwr9vHs1YAQNNT7hL01C4iWs6FZnLsmIhFjF9nxv6CDdFAlNIb/mVWi gykdarYhqpORMWUUgLVaxvgg4WkYtF5ycutUDIhMCQEusZ6JwJNvjbfKKR2B70/8U0VQ+AtAej2u QdmNREYKGbP2t7lpnZknX1IVJQBJsTwgbnPm1l5fwLudkKa8U+6moIF5EUN2bUcDyMYz3iLh8m1R LmSekVrRPApbg1rUEQdYKFOxyyuFWYF+NJZd8AGdmbGEZ7dKFkSbA6yQ4xWGAqSrSL+WRGNNWdOi 2FlxOOxGMzJkBeBSLxWivOzarirGGDOWWNMS03TNRPaTmGJYLPJlWBWB5QKB/KWQrB+034Wi4awr IZi20J54k3fOcSxlBwUiebhRLSOxMte66lBA2moBxmtjdQbDXiFjATcwLlnqMshN2PFbrdOaC6oz GUsVpK6FNmR49qbpaKyFWQPA6LCjBheYUj4nvWLg34BEqLB7zLtOuQaBbBLOeYDUMyZvVoYRMCoi ev/g8g/IVCALwLwmFQvB4SCcPwFWAxpZHifHnEHogWQFacTYLkcd5wLtdgunt6BZznuaM5JbSwXp xGKRsmW/olF7DGRKEhuucV1uodeeA1+BPiK/qdp0Md8f5AYoFVuEwomAnwFT/LIasYJNF6hK6vbS Wy4ycaZF49hdcGYGcjxv6ikTmBcKn2i4KmnILuBIkKA8A3eVu93OdB1dBA6h5voKGNbaWoaWy6dB jyXTocrmZ6wrrhJ9xPNWXM+TAOunDgyVQKrpKltI2iqUcoYIY4ixtUy8ztOZp1OOZNSoHIWS3aQM gHaRXnc0n1iebllqz1Jzu7ahp+81qbEUDSj8i4IrkU+ey6OYuRKtMpXIR0006ww3BfzElCtIZ5km tCGmsvCwCgpu6UTCo7hLeJYI/s/xMO12rxM42MbB1JGC9IGgrQYyAJElB96zSJtbO/uGcCcqmZKG DVVavDqT38IBcXNIfIuRLzniz0XqIEAi2rc8mxq/HoA8L4qxUpB0rIpU8dCo5RAKFO/RFQgKYZCG ruaSGbDm+LRi1tN2aGlYddd5oVDrztPwNIKImChZysY1APecggCeA5lXQHNk+/dIuMyKVONAXU9g vA72GuJ7hiSzBfhYLjECu84KhYo76oRxKESwsaeE2ca+QFeBcK9i7T7i7kinChITjS7GQA==