# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622075822-33le940p3ek8rp46 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 5556531d7c54660dafb0011ef0c5d832c7c1bb0c # timestamp: 2010-06-22 10:58:34 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100621105333-\ # papycpjr3smskyxv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQxgilwAAoPflCAwc3f//1Mv AyC//9/8BAAIAFAE+Em8CscppUN2uEkoU8aj0lPyZGEJmk9U8p4p6j0geoBoxAJJSemgZJ6o2mkD RoANAAAAAEiiYppqbETRppinqYNEekZDagYmgZBzTEyZNGEwTE0wCYBDBGBGASSBBqZMmmQJNpPS eo2U0AAABkMFBWECwii+oxkckOMlHVvvxcKf3v7dBue9YtWjPqsSV0NVeuVdWHDPBOHyO5vBtNJe XDbG0d/0DNVRlsMclbzxi4VOZFwYTb9PLZ05/YeRl9PrMipnj55jwlh4jsN6BmqlFcZ7oBIjyS6j auXRr5266aOQlO0CLFlVChAvRj82e32q10aukWExwHEJ+isVP7QsAPAXIWacTn79HBbZadUb6U8S xwLhghbDobCskyOMkQJmMzMhb+JC5BRkZJX7OueIdfUUimLKhTJTYDJeuDINNQOAnGfcLOKgF9bU 2XOFj2YUK2NjXF0ay6NUiAWFjPorFgo7YQvfe/XdNTdjCszDfMZHcLliZ7olgwp5y5astu7BNSS6 LgHSQqqIAS0g5tgDAQpfPcQrcUpjOLXfXFGziwzfARV0GJaWZ7StylGh4btK0gQI6HTE8dhXEVz8 xuAzAaFVnq/NDlFqwJkAeUl2seWjXwLErxsongWApkCDp5rzdrh+5STHSFtTGT6yQpgZbLxayApj ZPZ6MimZXVdREMGAa2sxsXgSuiF4qSh+dPtC1zsL2FLURApFO+OJTjJVzq2NYUwIE8hrWFZYXisH Aa0iJQRRVqjVZK3QQ0bwLICrJ3jd7VvFiA/GlxmLFOe3lLqs0AsfDVjzb0KYkRiqQB4HJURTA7xW H3NyzQG7brweIZsI6eY69V4vPShVloxt+EPKYj5/rIfmIR/YYOicRhUHdtwYL/5mXA1wwhe3FohD ducQhWBkjOwTFwmOJrLJELPr3vRPz9glm+KUxyfkpkQ5C7yofE9Ssl5SJKho+bxV8ThyhLOQudkJ FTOju7OkQyeIT2y94qqzOl2igK7WRkTPN6LdLbEoL6bDDqQBlEp+qcku7dg+9haC27SVbtQ+IhqD HocEOdxKh5dETynQVqlM8tAvNHaw1pcrdymhngsWHfAdPJ3BMgM8SOzr7pAddR2DpNNnRJI8Z5Cw 58dtNhvondQ3bjlv9IF8MbO8YDqhWtQq5lAFU1lnq04nEqJc0iInxhiFxK2NxlFdXpUq6eBwLw0s bd7aRNFn2KhbBaZVga36lSVZJLlYhtEuNx3UKIESHYupFtVGOajsy4mDYifVuiG53qOeyUTVgXIX jYi0S0TKYkByHODkMhdrb1vGMwk47AGLBjGjgK0nSppTZJX2oWoPidqYdtwVxbC42TglGK9uKooV CObOC0piBBuXVVMUNrYYJOYGXXw6hkLUlwpfpqSQzUi5vPDxPsJTRZYovTLRpLKs/J+W8CIEsVtc MElXkVVnVA4aUpnTHjPBOKQc/LJKnNhU6TmJRWXG606AKHvEwmzRdA0WKjVQxJUrK26qcTUiolCY xTGtwqCLOQ8bvDScxqY0RzRDohhfttISK0Vg4U8wP0Klfkw4EqBVXxNRiSgrkZHVydzsLOoLCpNq aqkJHeTf4p6/8XckU4UJAMYIpcA=