# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101020103435-stzwo66g76u1zqfz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: db92dc7ce7a9f6bf4a566385c9dd977106bf0303 # timestamp: 2010-10-20 13:34:44 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20101020085444-\ # drizi19jxee2kdkp # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcDkBWIAAkVflAAwWmP//1MH CgC////wBAAIAFAEPuq6AG5oPc4BJSEwk9HpNT01P1NRsieaiNMgAaDQMlTIb1I2oNMQ0AAMEAAA SKmJDU2o9J5JowCaAA0Gj1NDQMpAjanohpk0000aBoPQgAABJIjIxDQKZJ+kJ6oGyhmo9I9Q02kM NQx27eQx6ex4mtwbGb6AnredLOVrm5f1LQoTGZtr32ItjPfvECjPKEXMOZ7/Pe8OuG+ESj4l6ldZ 9tGTBrPM2D7Tz4Nv41AewvWAESfXy8/UX0Epi94pC1CumfVbk0gWMmFuwDb0JLSg5Csv3JHlRJI5 s7qlmwlYJMB7hOSRxZubjhZ7wvFN49kyQKG2pQXzfLA8hDERcSgnGgJGhYhnaqscfp1HAVazLDb/ Ab0VP9lSt+fzE4mfv8OZHI2FhcVGExqbFrz2A7crjhurq2chcCTAZEOizle9hh5cr3jFYCcaPRv8 2Gb0EUyDi9hUMMTo87C6tpsaATAm8CFshdg0LGFrmtGiWGTweSnqA0BXmQo9GL09Ge4ud5lfRmoA 0cIGVTHRpWC4Rs80xp6ZFBTTlxpIyLhNZbsaK+Z8CyRn+AD9RYW6OCwT8AMUDnNQVLYYGpEXkBhQ kUuC9WF5s+Apy7BaqxMYaQSv7TUwnjE456xgZc3aCkVI7jsRV2q8svKmFxPYkUiLsdLHULWZo1ua 3Cb1BwNFrVchkRuaovLz81yPz7ioYDvEe7t6n6VF8he5BSLMm3f2uGa4IqNxCW1n0cd1vA0U7Igx ZTEWE5hE2l2pBq8Z+HaksbYEYPF0oN9RNHlxpcZAU2vaLOoOcvfWRONwoNhGKyaqi62YvSYDRaVI NHy7RQmYtFp3iyF8Tjpn5IHOSVUlh4GnhIxLtDOgWxB3IbIKkbuFkHZrBWrwFGKaUvwYkEe/ROJk KedZFQPZBKSohJrhx6CsnrYy5zcjmRe0BWI2rkmBplquwy2OJQI0QSieUjbM9QsTlcTriayhOYXn IDY8B4rhwq5MaOqGwTNBkwP1DIrFUKAzFqOaNqXDFU2OgVwrZ/yI2Ui0irKkwYmJWioQfVaJBFYZ TIAohTBBnmCiSgC1emumcoC0p2ElZA5BsoGPJWqSHCY70YqlSJ5Cyk8UQeeoUzSzZIJVCYwamSza LWgYELEDpMQBcFzwLUlrRQodkFU8W+u7DA5ZCtjpbMDuW+qiCO56X1j3mCaPXqKIi9UzLcc/ejwl czREy5wYT87cjoxM5iYgGX0USCIgMGjGc2Y+IbYOnEOjRrWRciSHCe4K4XQA8QKnp0vF7QSympJY CfwBgfYVqIdJDhN3qiWlw5ko/ICYH/G/r/4u5IpwoSGByArE