# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110120223238-fhki0bl1bd8aapoa # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: f6168103931f235439db7170d485592b14857cf5 # timestamp: 2011-01-21 00:33:28 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110120141524-\ # mynpxg0w0cd9oihg # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY/bvTYAAZNflAAwcmP//1MC BAC/79/wBAAIAFADeVNosaN7VuhJJJ6aATU9MmT0km9I0yT1NBiMamGSlPYmARqPUnlGgAANAGgY k0FMp6aeo00p6NNQPaiYNA0BDDQ0AAAGgAAAABJSmg09IDQD1Mj1AAAGmQV2N+11x/nBR1Hbow1W F0RLY0GhDKFNNuZJHj3D0eQ6XgeZJ3h9V7e+xs64/N0Yjliq8kkBbKz8/3AXaLZdZDIuivuo2fO/ 0X9SPVRUqCG3f5I9ov2Qw7FeCzyBbb56Je1zcgN6rkQecuAWJG2dalxHMkUWH6B+SNYnHor1ejC0 JW7oJHnGb/F1k6Q6RwlK1GBTOZJ6Nv8PejAWFHonXMdOVmKwNbLZUK+WMMkiCRYTkbWLwzB8AdhE wqEEL6IBluTcRESEuFFaQWaArpIaXTtMga3xoWG+RkRFzVEMpi1h0ZDPQViNYzYlhfLKC2ENWH0z A2YM0kcIZypgQsLOFoOsHBSYIJVFjShrZpljLg0x1m+eQ1IbmNjEz1IFFZcCljUtrgpuDrgWuVdE JU1vurQCD1IHhTwiELfiQsQxsinEUgJsVNRFAJ0V56u8aurZeOZuEN2/rznAAztQSXozk3Fb6x9T B9zz6POhMykCJSXLIaMYxzBZi6u5+IL4vgW8L5QvzBccpNW9KpHvAF5xcuNQbjHiYrF+4XhmLTKv y4IYmU9S8gr5rXpYrEbfkgRz1dqBzgMwDXKrF3Fc67cSthvKKBsNZCjHvM4CMek12hrR18eP5nch N+icYieO/n39m7kzqZwrp5YrQ8NHQbf27Ku9rvZxtQqzFMteF/DNs8iCHg6CqK9JLlbuDEpNBfHf wxY8BuP26IaphgakwC+atHXWKtRFKZ5Ftt34SlrGRFpgJCwC2fJ8dEa0SR1byNxhwxGkogbCD7Qi vhgQsIaRNBsAA90QJhFck+rMmHhrZAW0FNiHoQGduuVclhEype8w3ogPP2yJobHhqaWRUnTIjRAM TE9+dgJwsSCGM5IyoVdLfTJgTQpUtEit9cMcMWZOH92Ip9styNVuCmANLnoqm7XELIkGh0CF0IhO QjHCF8bGQ25pEKRyhOjNMiGFW03dogEdfMZoyeTwj1OAeQo9m9l5nQa8wot35yadRGRF70D/ghFj MjTnD3fYw3f8XckU4UJCP2702A==