# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110420071054-832vu7mlacjfz9hm # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 28de54c80fadd011610cf02524eedc470bec54e0 # timestamp: 2011-04-20 10:16:04 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110412062243-\ # 1h0zori8j3my3tp0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeGRcgcAAXtflAAQUmP/91MC EAC////wBAAIAFADOvAaDQNBolHlDI2k0GmQ9R6JkyD1ANqBgAAAABoNAGgGgGSMim1DTKep5ATa TIyaYATTQYAAAAAaDQBoBoBJIIAJhMTQm1CeU2hR6j0jyRKmx6b/fcKbLgrnrkAINB8Fc5b81SIg 37T0WCTI7Cgd9jsrPq/lCpfn0aHGAnTmDlzUVgIMBZJDGIKUlAg4uanFIm42WfGVskKlmkZ5pFm6 qiR4tW4pWsI3qFkHYMgqYT1IsIEgo9i5zJlj8kWf1WC3q1VsMzcPSURULbX5Nz7BFCfB63Be50N9 NWpCTZO9zGn3XreeTKZlrfosco4CgIct/VTZKgjrA0W+yIZezeqNJJhWqhlNrIzXJY2K7TgTzz3U powOcSQguMp8rZTXCZmN7ZXpzCocPVmw2LyY3K2UY4LCSTG7efVqVviTdAyt3VzKtE5FO5ZxWGKp pUKMU4opLKs9CQVqhRwL6DPKeBp/AY4JG7ewlZBHA3IiZZVWVMgtMfWgs+aSsN9tthKfsUpCULZ2 dho0cEWvIuTStEmCWZqF7mXpyvKXdn+Pl+a1wSJaWTH9ugjjW1cKmD37wJHBYWpljyNUjVhd+qRV nzsgG9I6XXQyoR+pQV7G25eFmxseGybPbjggy7dAYrUxQm0TzqqVEsaqPN5+H62aJMyRWkbtxV5v u5Ubi8ZzimpTyp1kkUxSTe3VYZ00HJKW0Q4ntIFTgEkQdffU2JVRogwgUwaDOZQ3MbrjLR1svFu3 y4/kF9dzgmTYX55+XPnaThFO6qZMLNYpjG/xORSf7+PPgx1P4FX5ojtsmyDGbt6CqXhE0D6WaY7v rn+00upknGPiFck/3ndG8JvEPDKHpyX74JYpu/FI+8wvBcQpClySrF0oSGJ7vC+b0nsD3EM3skZB 8nQZ3C9WTQtLvgVNUsh+VLEN0Xg57m53p8NJ0PGTLbpBkhrcwUQ75wPpI8ggp16vVrYsmswZi4K1 DNRsSpDEk/byG9ohjC2UQCpvKrKpQ+jrVoM2mkBpF2kIooLc3N5FLTWGbSWZ0EwThqmeoOVvUVuI jORT0EyruD1FT8PUy4KgW6Qj6r/ij9f+LuSKcKEhwyLkDg==