# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110321072758-s31dty03jh6yremg # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: c3c1b00c751b83c9db2c31990fa0dcd043693d89 # timestamp: 2011-03-21 09:28:14 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110315132451-\ # phdr7rtq5gce4947 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeZaiDUAAjTflAAQWmP/91MC GAq///9wBAAIAFAETKvDdjOGiY4CSSk/QjJhqYI000nqnqfqanqGgPU0PUCSkwTJTxkiGRoAGgAD QaCSEQRmggmjQ9QmmgPUaeoBkGAAAAA0AAAAACSgmhk00jTNSn6U2U0DR6nqANAabaLj69tOxdZV ZJZfbW/pSr98uoTxvIg4dshWVEwzMzLz+f5lW8Y2zua5nGv4vbW/r6dOj7sdX3+n1Odf6km3jMgm YYaa2aRjoX6eSCGQ0woJu+fi/MWaFI5ioJxcuWVUE8C18NUW6gS/JaLgCrIE80Zn5JE7MZatBK4U EqUdItAglucWKmBa/TDAy2lZ3byp/MVaVIbJ1xjMpEiAHG85ecaQ/SN8TwHturmvmavuHZP8YyJV TDD4iw30j1Zq7ZhQq0DACpq/HQnY5nFCtAxt5QI68ixlqxq8kBgbh2lBtgs7s5oyOzGM7CJEKTMC t+BYnL9AMAet9uRnUWPKU0nkAqSA1oRsms2NYcyrajIK7dxKA+ieaK2bHUDjYCe0wLG4Z36lfYop LacS/VWQs3symJgKjIdJqKjxZbFoVjHSKTdIyZSyfMLGJAlRwVL6iqOdn/TvPADjrfGeJXpkBcLc a2K/TQDUTpbryOmIWwXJZXkRolXRxyFY91hUaw4k+42I5UllIoZEyDGkNBUKPjWNwopnB8ZRwLpd 1cTIwJ7ybB2vyfLW07gpCm4NW01aiuxshSOS4e+hsDWOeRGzwPhQXodQKy4ZMzXc+EqxDyJsX0Ki na6O3s7qg1OFGKwuLDEE48dZBJ8xhtrJ4kc7gWcCD9xJtS7yAnbxysJcxZjFRyXmZ50YFwopo8e5 mw1dzNkl1cetQtYEBTEBQHChl6rxjNxZhJwpxLc/BLJ7EMpiDEJeh6E7tgcNgOhREiXWW7jqLVAU VB2gs1wOih3AS9h3mSTQD17e0tNTNbELja0gaGZjyNGdOTohTRRS3CpueOuW9su7jshQ0A9hlSmC XfbbVjx2EiHodGLprwOOp3m45lwsVMvY95oYMaM1CJWMFKJ3Rc/ADXCpLlstnGON9EqdT6eETOk4 JxqLzjx5HqLojG/SXj5t8MUTRVp4agczjwEz1GIL90RVC5mwYIwaAOLxJgXU59HlsBW9Ul2Atq8z kmH6MFXQ653EgOjXBBVNVSmhyUCZkQ3ViJ23uWCZgh1GnWhZxeZpKpHtg/Al3otXg6pmFTZZsMHr wFxmq9q1bN1sXBulMXKQpLxTykkGvi2ASSubVTxehWqeZ2A+HioxSYqAcA3lhrK6qFrC8buHChpM M8yKHMhpt1NsPgMGTzhRkKymWokmrToSa54ntClEDbhR9t9wv7C6qV2BeMVixMyOwYht9yyAeBCq jtK/P+LuSKcKEhzLUQag