# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100512104603-vfwkgy2fgjqtohiv # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 177b92a4452cd02155d036e325d55a108b76ca4a # timestamp: 2010-05-12 13:46:29 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100512060922-\ # oh716ugpukfakwvh # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWnnOMgABPNfgEAwX/f//3/v 3/D////wYAnO+tmgAAAUAAAAAAADUj1JkMQaAGjQaAAAADQNBoGgcaMmRhGIBhNBgE0GgZMmjJkM IDHGjJkYRiAYTQYBNBoGTJoyZDCAw00appQ2U9EekA0AAGgAAAAAAcaMmRhGIBhNBgE0GgZMmjJk MIDCSQETAmgJowjU2k0Yk8gU/SmZPSYpowyeikMEHDNnk0vImvHxLznetD6omQMxRphU4A5ziy2c 6Kiyp6ZJUaBixQGnDEM4IVvSRzoixJ5HEiQSI+v2ULFcMoSC6oayzNhJUtGcx9JEc7IeKcYtwspg MMyGb7fAadCQywrJQL0zLCMKqJSmgVWa4EV0NOKLSuG71gw3FzGIMDIGdZkhmDQRSpJcgesoiHoM cQJcHxCxkh5QB0knfbmDl9mr7/WfG2gRQd9eOMHjKHOYw5K4h9WD7DBuO3rK9L6Mf2GoAr4ovDhS RYY1d3DoH+jsGOsw7OXqewFVM2ZPjG93CK7akpqn2GABiBnhMGbkAp4RBJLeJFi40h7T9zWbKDGY jocevOekloqMD3+0n3381xbYU8ESOvXrHmw/HSaETIDkgejA/0HKi2ywzI3oXMZifOQB9Iocufhl K6Jy3BMQunsEKoVnDaLPRREo7HpzneAi0sGuxCPOwNhjiMXSlAhlHDiO97kAdXrfROYAdSHjxiGg VCHCZIJb3pCkjIQBw8mQxky81lQ6I15WhxxmKIqPKoG80hSUkCBmKz3YIxlbrM4sGRWEAZesi4TX uHJJdGZJGguc+7HQZShKqaF7bUhX1jrPPB77dI421F+BSBUEzMZyMMfxRlCsjDM2I+OGQ4ojUahp izDiKGBx6B5yHPzIWUIXauS3CBCKFAOSTh8DqZJJ70hbBLYUXh2Dj4BGpjRozECFXIOK9gxgRB+C NZFBMxeCRoKSJymc4CghdcdgRLg0XtjDGKLPwGLDA0Y4GsNBeM4a4YmopJiszDKpFYOJqFrSoa4s RIccfmK2vGCTVjKocqBc7hKwIEAYsH0FZcTFMfnOXATiRrRUWFB+DCqZnnnCMpUkbPJoLDKYUJC6 Kk8nEpLzaMMwHF1ixza3HYh1SS4hVFhmtJIzFBA0lsJIpppFQFekY0vKHtdcXDiI00QyXlcwzGIz JOKCpGMkVnsN3UHJloCuylspi5wnFHgaFIYgUlDUopLxxjAkcgXGkiSMmTIqolmIiSjYiwdaWIeP KJPC8LiIaCSePoBx2SKDGhOKrXFUUUY4QHEkLEQhMYgUFBqIIpRToIkDbcVOzuoMB0GJEywpGKEJ /piXNZqcUgxiKbxMKoCFwrUEp/1ikOq++9xC3X7ZxoPmSpKailMMQ5eoLRhL5DByV1nYa098AWR1 A4cEFEFqWIJZprScFuoPDgvDaIui6zvHkBwUjDvI0DWGF67l5RC/QTz7LgIznxP0Mp7D5q4kmBmT B9RH7iqPuS3lMiPub/P4gYj+TRL31HqT7SZz5z9xfc8T+iSiNd2CHJ/iDltSuYKCwQw+Y+k+xEga iKKi5C1imIYHFXGEjxMxY41DFpkEmXicRQNItP8LDiKIvJ1YYx96ZmZGwmzCPvAVBcOKWZqZK0eO qGLmH3n/jSZuw+AuxDIWkScx1CcOGh5XoCMTq9/ZQmZHckTd27l0laYb8ykXpGFQOSsHDjvPgfIQ pf3YkfA77wS+B8Ss8G+JWFheSM9LAyD+xCkH020B0lXGLGUilkAOTAAzd5aIWwkO4qb36AYArJDp +zjNCXbxPNQx74Q/CFnIgi0poR6y4zmdI/XQWFgRDiExiQr+LtEOSsLT9j5kjebDmRgSyjzWiIUl WccjMfsqENly7P4sLzmz8gxpRAK4lqHCE95GsQmCKiafk8m7XnMDVCQ8KCaUQMg4eVgG8hnwGsNA wkTMEaBz5OxWotN2sUEE63f9371fRBwdEbZR/qMoVReIWJg2nNLylQMXmRCcR/mVDN06DMOfaZC8 MgoJYw1Z2MYyeEBBlcgcBWQKyz4eUgPRJaL8DUYt5wPIcOEMDDrBKpPOfPIJCYE0LkwMjbpeakww U0rw/yAGYPIHs5DsvCpMMXq5WJe54gvihYTNpBGgOM2nMc50kyA83DVHAgMcxYGqseUm5EzrIFQo kS40irQpC+oecPx6AYYZi0TnDMsT+oOY8zyLAyQ0Oc5xdQ/rJ3Dx73YITwWUhrcDgZAw9oCcHEHi s3EKsNRo3P2FlodmpChIF0/RZ2PP3Pl8gYHPsO0a1apILRb9wiV3dgajkNgBINIu03GxAFEQ8cq6 /U7YgqhfPrhznOauRM2IX8jA0vb0lRE5hBkB2wQdB9fQekWnnakWTShRlnEweretrI9Z1iFfcFws yDYCUQ41ceYxieIVPA5d4NaITgkPAcgTSW8DUmquDrlI5odZJK0uLM13a8lRBIXAQs55vIy5xwmT hhybLoQGi2moVUzeUByHDlCgnQWCnoOsuHzGTHchXuALxQ9piE5mEMgaAyclqtLP0UUC5gSpV5jo R+xQ4U2BSHCl1GywZnCFLEtDehC+jgF3ZIB1e0MgViuNs2ELoYxh+Ywl6D1FE7xkKlsrHcIURD0B wcLD6MaP1uvxL87wechajgcDgBWRF8LD8kmAyuw3VfOsrBj0hiO/0UXh2x7xay9Lp4OYSqBhwyBh C0jCOwWqvKZaQD8lkPUZwzDCeRy200wBKxAW7d0pAQAxKZ3fFYkPGDEwYk4eweG7bIH6QcTBhuNH RTn+q5tBRjGJQFkFaIMBwVgOPSbAoRQyJEaEDwmM5lHjV3uMoRMrKG9w4jNG1RHCUggA6orQTB5u CJeTKEWjG1MYkhjMfFCnBXZQcFPG42Ca4RBLK/yPCbARKR4RpzxNvfpL9i3gneQJnMFpSP4Uztsj 2OuV4pcZsrFi5hRNB7gkIIbqguPDUW4C9QXrFkMedCehb2gtwxaJw4Zx4Wh0b4GyqtJw894VFx1B /8XckU4UJBp5zjIA