# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100601114015-n30uofphhbi71z1v # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: a5a93c49544ad0ee3a6660cc717c1bb8e9f6be05 # timestamp: 2010-06-01 14:40:21 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100531152341-\ # x2d4hma644icamh1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRvwUnIAAfdflFAwemv//38v nUC////0BAAIAFAEb3oADQoAENEp+qHpqmTTCYnpkZHqATARiaMEYJtA5pkZDJghowmCNNGjEDTJ kYAAhzTIyGTBDRhMEaaNGIGmTIwABCJlT0mgMhkyAZDJoNAAaBk0AyaCSQIAJggE0GjRFPSeTTJP 0p6TCep6NT2qEAQFwsNfdMPvQLPdyGdbq5MnimuDy01g16OwAV7ClNbGTYCdvTAfL51zS5aYMzH8 YnGE7WVbNkDU6eaMfQmUqfU60BGLpSDsiMRHQBDwpD7PK/EQCIDdonMsdZcIlWl1TAQmmyUj+X4r n+HiSie0r+q1gr/FVy8V9wyVq7uQ/MpS4S5dIqJC97yxdYky7eKRvztrm8aoq9lWN3uBd10UK8XJ Re1AvxhJa6sWQ9ScKxp3pmi5TGHKULdtS4J4tSOXvLE3OlCyu6W7ih8hUvuFWnSipyimaDSw0HYk Yib+V5n2rsiLCZXXea55eqRYy2O7DRqtQegt4n2Gd28Ez1X3qDx/fJynXVs9mEQ4ebeaMjWVqmzs wpNzd4org3NZ6PZNPYpyWR2yJ12k+EdfVTqYRpcrNUDZCdQrYfcqJyckXLfqhuVR2rBejZVNdhQL OnJ8Z2nL44SUTBlfN8oTdwXzK6jEdMvHGSVgNkrTTu1vVdtqcET0w0rzH28xQAc9lDZVUr7JemW2 /RVaUXqStuy69Kd2qzC0eU4Kq9PVbSrdWVX1EieWmv1+Xx5er2Y7Ka3LHRxpduxaaRi8mcmmaJQE 07UKCtXwNx8/er89Rb4OfMvD1e7rTMGC4rvTAeh/2jVUmZvyf/X7j/6+5NPWhj6UH4DFNY6MEpZJ FEwOE4f+ELsIjceL8Oa8YCr37H+kAxjMWKvIB09Z3r3c1DtKUiB+nvv/FhLisT9MiAVpH+NMlmRL qKhehQkSPJdTx6G/PZUFOPvIfHyNgP3pV+WpefsBixdVBvH/kU/ErPzUNS3LeqFIJvnE4S0Nrjze JahLLP6rSxpLXrblzHKu5RTfIeE1qzXwXuhxXcYrCiiGma6WTIidn+gRUD8a232WGKZIAfgqKJIZ dDzUcM6o4VmW01wqHikSYtUyZdueJ0msbfrCcTpJ867thiXuHJ7h5tJz78+Wnk48OwXc9/bw68pC 5GSY0DhIX+6fDcLyX+umSo4l4r5k2ZSZppdfUalwWiioLX2BdQvpvzhUiitHHcQ8MN5imDgkfUzC KFuNq5JgpClwQGSIUCTDqLtdO2SomOSS5LokZ7j/J8xn7TFXvlWnrQqHp5E7C+aPtmXETEGU5EHN CGKet+5c5shRZMuzrOTJE2xljUJt4BOhl4ueUfQSpByycrNFIVbd3rgY7GGTjo09QtGr1T95R7fC nvDftCzFhB0If2tThVWeDKg69JIVKqwjT6I5/fpQVFNKTLrHYEKvYsMI7XEaVyQ6g4twKComYklO jKDdStH8U7s/4QL0Fzk+02lEMaq4s51AVJzQTjk0YKotxx+Hw6lxoWwVv2XRHLBYJ96u2iimYVIe 7UoJ6hr7SgWvMm+wehsb/wbx8jwLuSKcKEgN+Ck5AA==