# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100624060146-enwqipupmqrghgcq # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 23b4456d8ee00105a118d88bebb090c5299bf463 # timestamp: 2010-06-24 09:02:00 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100623110659-\ # pk5bqnmo0j7hj6md # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdIs8dgAAXjflAAwUmP//3Mv DkC////wBAAIAFADel7ts3F2TO3aEkiaTRpNgmqep+kZ6p6mJHlAY1PU2hlNPUCShRjTU9MqeKae kNAGgBoABoASKKeTQCap5pPUnkjQ0BtTagDTQGgcwAEyYAEwmCYQwBGABJSm1M1Mh6pvRHqR5NDU GjQAAaADLs9ukH9O0457to9elwG6cHKMYT103Ns+vxPvqnv1OLZ7nb+fSNjXn69+HH++c33yv5uR 5235iezTxqBzBQoLGa2j3lJlXIROtilURVR7tEoXWYIUpHFlnSLbMeGDxdLwgIa0EaKNwuOE11RF ERIKoENNcJA0bFO4mbtWikHotlEa5g4tPwb2UbAJGuTmQsdhxrtJRan3a52rs4NF5BidgX3ytwEN dXtCH1A8g4MNLNKHh5sh+AIW9wYdOF0TYqwlwjYKeLKDNOffhqFGRlO0rLxmUzdRenpjozyYbAom TyIS8CH2hmnUcg5zJJiggLGA296dYSYoQVuoI0sZWZBywqYTMck3CMVZOFBEKpWrMp7CcYrpRdZS 6JWXSVYUMmGXJjNZ2kimXIjjasWV30cr0bYk4J1ORQKqPNUsNhyG8jXaU5O979F+6ldiRxCXqYZm 4OgsjHEPVewcgjL7B6rkDwdhC1drY7WD+b5FNe8Llo2zGJI6eH2SJLE2w1UQDQkfmuuTTOjTgQp2 2/Lam17ijdIrYPCNir6gZYo3y9ahWmUuVi9NXf1nNfm2kQXJIn3i33zCiFduuoxRMamTINTPDrV1 SsB8VntJ8F1K13khiZQSKbCZnGnu6vjVOzp5giQ1ar89xLVHrsbNJRn4VZW0c3HkCqOiZRFku+F8 Y9hMEE6Myx7aR3bluOsuWxpBzZDF469tbDYXCxIdULheRCaQW7IGFQiYLkx9fKmX6TJUpCk/VpDE 5r80L9IXC1BbQ3Y8LA36kzUFiR9RDQF4QtC2ANpHRWkMpl7DOqaq8qR0JG4PmcRw58V1hhqxNLMw lIzFMkG+UUovhsXAI1vJDaYmC3dyDEiIUSjeCeGjEeyRvhBQap4ZIXMYmjYBAW7BelxieL7F0hOL NlWFJNlah2jGRE7TKCwqt9EJJEyaL8VbGCkGlWyUulRO6xOZO9x08lqke+ZlolmgUhAGpzVKqx6l hSrRV8ZvP/SMVeEmik9Tqq5VwIf4r3/8XckU4UJDSLPHYA==