# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100608122645-psnrclg7j7n1ynvs # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 0f32143ec2f9e5df5311f835584f17c7e96be811 # timestamp: 2010-06-08 15:26:56 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100608114734-\ # zr70kxe26ztgwbat # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQlGN28AAd9flGAwWm//9/8j 3oC////wBAAIAFAEZvAcqA6ADQ1NNCJk0amm02pMymBNMAgyGAABBlI0JtDamptJ6mJAADQA0AAA A1T1GptIyZADE0aAABoADRoMmDjJkyYjEwAmTBMgBowjAEMAkkCCZMJoBM1Cek2RNGJHqNDTRk9G p6hM8kKh1NkqFr+94bIx5n5GqaJ1KSCYAsgH5XDTIk1mqHMxAWI6DpEQswijoRwY6+kTXJ1AROGw dxHlq3ONon6oLQaVEupNpn6zFDKhIAvP9I4POHtr0jSWNsIL/FQ0YGYKeQruCWSEdAOYPrmUjIU8 3aO08/cV4/VaAXsX+dc3isuUMS3STNzOFj4rsugMxsWQSy4exC26bKpqeq90gLRh3JtUAV2E6FvU Lr/B+qmihanpEaZEOMKkiTicGWQe6SkvXYrV6UupYu5D+FSFxt6+1/ViZoZwc+dXwSmfXLZLP2Kr Yz1yqzB5LcX5+2qgqZW9eYwiO/HSLWVnRbiCqKGE+VoqdCnHy5yVqugHN5N5IxlFps41XMQVlfLd et5nVBmiQTqy9jGyx9jFONwnp5kcVGTSp6e7NHdWF+JOnGtl0ejWWotiN7mgIbHqEsaiQzNeDBcD DapM6IaJZCGft69xZrrbKVh7CyK4rxFSshzWOLnG+1BIwW7KeYXoLJNTRdrTh6ZIrLd1llkaMj7y GYeq8BidZeAqeoTpSKKaRBuEL5s+7hxT706PejgMahXPHBUkoGSMTRJpmiThNO2lQ7zA8cuUz1Nx fLv4cvA543L38EL7L5/22UvZmb6UemDfRfU+3CRNR5z5y5Eqxo+ad8Bj8ZfNfebMpE7ES1pqxxAy SoPTKY272B3v+nyfFuiRU+Id5o9i9vZUheXEoA7g8O8S505rLyAUBxQv4wpImbN1urFiUIUuPF5q uTvi/Wu/8j38e/bHfvjRfD1Xgs5CLgPhN5OBiwOeoqrWL6cFEiXqCbpKCtPPXeY3RcMktorRK++R dMk0/O5VUrTeUdEYEbaaVMsB2qMQlX0qbxVkfzVMZRdQJXrQjggfibT/vZbQRmDNAAuZ0SqFtTja ybq11nRqZAxk25XzVfLhhri2bHpy8G6vNxkQosW7bV2Jk2nTYdtE3rRv0LYFQqE7ItTBnXHUNtKT n9eTtLLYy7LXDunlAV8uQoucGZdBJtQM/3tT7o5rFjIrKjQlYfFNF5RnB6f1ZugKpp156boxRN0o 3D9G4Wm9MtSF9zAM6S3r7b9YVBU7BlBkLWG6friyyiTjW+ZlKIuu3RChWxr4UnaAckLXsTfydwz9 xqXTdC7OtxUOiRMjyFbLcJh0JKIQZza4Z184LHEI7hUiiyZfcW/h7ElObAZZ1vAHTo90N7V09/mJ VA9U4vWjjs0MYLJs2ucoEw+iaOsVldMZ1p2Mu3BOgIOBfpFNkYVdxaNQaIpKlYWkL9UZmknOW06j ZndFoKUCD68uhirKNShqFyyipW6ZwTodgGDKvF8Gh4D7Cv1Zw1xAjJ1glD7jEF25UyqkoAaBGZIj aLLc+htPHgw1VO35kQzXAuFHmVBt4KSmXtF0+Pc2vUTdCrX/BoPif+LuSKcKEgEoxu3g