# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110217074801-9xm7p4miflvd263k # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 0eda86f27533e8a9cec2c9a4307404e9dad48603 # timestamp: 2011-02-17 09:49:24 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110216134146-\ # qgx5b63yyjxc3kc9 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV41exAAAxhflAAQWGf/91YC AAC////wBAAIAFAFnkxmwqjMiQUGrCSiaRp5JpgJkyk/KeVPap6JoPU0PUYSRRgIEyGoymg0aNAN AAYAAAAAaDQBoBoDAAAAADQaANANAJJBE2pkMVPaap5NppPJE9GhAaeo0m4MTt4llnUtu+hIUw/Z tqRFlBkqCY0M8uhM8fDyhWaykZDDHbqLf+Ik8zUMM/WPqeeAwRHHc62mE0Rb4Loj3ZvqKPdo1rQj yOMQb/amyqmAx1RMSO6iioaIyHumMBsOLA7pIgYGPcnCoySLzgOxY3I8iiODLqVlWZuxkgVtOB1Q KguRcaYTHdzGMULEb0jng0Ershj7DcAaAyQrxyDJCix6jPyjZmZJg1SNgBimUO6LF7KoyGR77F+0 giTOGgVpPYWjweGsr5GogxVRpSFA5HANWZBCTh5OP2V1jEiDAUlouymTfkkT7ghFDkkWWV/Ooi5t CVfpxRa6zRIzYOv8zCUpaCVSQugTXyMyehwZJ5HbHP84brN4FCjZJkcxMr0VuFxyiQBpSMSpaDwe q5JgwoYEdplxAmcDBHAbXlCdgIKXDHFIvXGMMy+cRStpa9hVsTBgpHrM6veHUOqRPY6HGTNVI0Ih bN9RVA3W4xvyGEHhU8dxab7oI5B7dRVmfy6GDzgBC3IJFZxwfPFjLYcyBQ3HRdApbteqxrEE+aSw 7ihfv0jJI1i4RUb9UPCWspKROnK1JAyRyRSQ7HMGJHgdNRuRWxgc3Cw+OzcYyvn2a3MW2J1JWLhn 8MweQwjF7D5NjVqHbmsDdjQpmDFqOWIjc79Ee1I/feEbaji1YsznIwLDROKFsXBIcTEhoBRKUxjq GB1KygYvOIwZH3MDggU0hhmBmb96ecGTjeKogUjhyWPV4PcBtvsgMPJXcUC7uKTT69kCfzwvNMZD elcgW2RaWkZOT9JxH9HoFvvajY65qm3RQOjCvcKI2xgnG7E8CsPMRAwJpfqnHTDX5n1slInJ/ZYx zMD0mrOe1hkCcaD2QK4vRzM2Te7Djhv6HcMCBqLzZuNiKBb3Ewt6RNxNS2muoapMbegTokSv8y89 3YXjkhUmEJPrtNDyCZ74yw8sqSUskZsNTZh6T9fSmnknKjMxKo2kYy7hsYlD0iTWgukaXV/siDck Lt9DYNRMSe2GEx6ddBkmhyJkmHuehwHiPFA17ssk/C6EVBscCN4OqD5PIvHhxcvsVseekYVtSD4V Y+51wFhdLHskWlgorjOaSwnMBMTFiOIcAvFALugxilqoqb4PhmZx88TaTlwHDvmBU+sidrj12JHu kZI/K9DFmGDJAvkwS5JCzJASSNQGoegDyPelAnBC0qOg9EHkhmEhA0SRUkRjO4RHmgWIGZimHAw5 3I2okskUFJMfQPsGBURIhyKZ4iTxxEZA8baPHJHJI1lQh7CYVuRmyBc0j4NCRbeZVI+qQtlIRQwe xOu6BVJakerhUlvibj0Cq8YYTwibqOcSwKF53k7IroADMoIiKbW0mY4KMm6TpCki1+whEizCc71M UiemsgY4aumbAiAxIO9homymCkk0HwrRj1MG50ibB54hFMT0FOYuLgYagokUhCSWlKDCdI8MkaWP x0F2TkNidyRILCwsBz0IFx914rxDwLxZJHAXLVGC66r1U1B5JF6lPv/wqO58C7kinChILxq9iAA=