# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511154244-7p4t8o3y5n3lhqiz # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: d120a990cb092e0355d51d3468b38ae6f255468b # timestamp: 2010-05-11 18:42:54 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511153919-\ # hjw6khgh4my3fio0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdJMmXoAAf/fgEAwW2v//3MC DAC////wUARM92zGm1zrrXuaewSUmSMBTMmjQ2pqm9T00mpp6anpqeoaZHqCSiaGTTTQSPUyMJtU 9QZPUBpgmgEkQ0poGho1J5TxGKbUekMnqDQ0AMqaCGIaep6JkA9EGhkDQGgBJJDQU8NU8IIaAM1D INNAGhQ4c7wsZTbsZ+OPcfF2lidPE/d6TKgYo2XWZWuAfC5t1LtIpiPLMYradhqkzMZLuq9KYC1z J8r+yHp6T/2fWSk3zy6HZ8VPO4lD1Kt+Kz8/1EsLv92HYZjLsza/ft9Zi1S4XNv2AOoyRINQQiVB 8m4ykhzN8ae+mM2Ds6tmnBdWKqMxQ6VZZJUuXZoS3PqoGsbktYlbxQteRHhV9kRJVCwSeTs79ubL LdCEwBvXjOlCpqmC8rEbSSgrpHdmCsNRjSt9tTBO1ZjXxjApDEroiIJDILXp8cuUtpuNxGUIPRcD 7MKE9045Xn3TVCgGBbQdfIKK0s6waiFAZeDPBEDaWTZlnSRtOROTuRM1J5IeOVeCymXETtXEXAUc RYvIjWWi+jchOtmSbQt+0g8vWJ717dgp7CO5598ndrEibN+omg+N4w1OhWYjLS5bioVUG7ptF1sp vaDKZ8hESkbVed6uX9CcsDsrcMFYvGmspritFuIqA0rNgruDYOV1g5YUaESINIlELgvN3VzFzjCs 06VYuhlFyoMalmxlH8qhy8e7C/LbkshaaM9wxlUdpeD5lFZVGMwxp9i9hamMC64lM+lqE/Blz+Bz 4ShyOU5T0rgeLJETtYYZ/y0oQ6wcLiCl4E1bnBB1Wx9jP35iQLl2nKa0LTMZqxLRFMUJwQ7+CF0p M5oylOfZIl2JEK2KBRf6ez6q0t5+I4hKDEeoTHP4SfKcmEHN2OAMJ1KeJs4r1oWCvKlqyl1fQ0YJ MkJTK+JphBPanFD0mc1YvbWPxXebCb7/h0qgSTLdJ6wNKyomiprvGkNhwnHI2mLn0FYzDmkoc5pk Z7bF7ehsGY7S25DTsSJ1VLsK8GOXuLzQmLiQ/WG8etFrQ443uvrmAbqhttXuOebrhqY8GUdY1NcR alvwLzOrmKkntM57AhUqeq4JTtWcvTrqfaoyQMvzIKpLz8iyu17VrK0z4KULh5KYNqSg3k5bQmSC h0EsGUFLy1hNjYSVWtpBSJBvmHQILCjcDbOWxYT2YyVTCc/isJEQ+pjcJkcWgrBUGm4/KjXqabu7 VxwUMaGZDKc7e9JTXAVA1GsAmIhpI9xLAI1ugU2r6chejTRvYPe9U5CQPOWeyOMZ18xZCvboQbAb GIO4looloxt0bIyk0EQksCsvnmCAoxROrjhspQZsyvh5yLDFVA9VxfSVUMqh1aW2fSKnWah5xVyf xAZoEeBNdURJqJQnWcQ1iYkZTkBPy79o9eRd296c086z4aUjy+F00u0sUvtJqz2MlXsJrbHDNYus 3JpdDyqzbP+LuSKcKEhpJky9AA==