# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027194218-ket6k7u3jqd97kur # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 247b5d4dde946c8d5dd8810d9a3f4f46cb74def2 # timestamp: 2010-10-27 22:43:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101027135539-\ # 40230zhemiwsiftc # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbDu/+EAA1tflAAwWmP//3Mm 2kC////wBAAIAFAF7XjQ6SNtvb09sB6AYSUhlTwp4oPU9T2lNDR6Q0aPUDTI9TIMgSUTVP1Npop4 1TxTT0QaAAGgAAASKSZoKPaKHqBpoAAAA9QAAj1RTQYgBpoGgAGgGQDJoASSEZATJppo0CZGQU2T SaMgNBoYV0TU0PGsNPmYF5YWTTVhVFbDC2kVDCNiVLn2xDa6achRTV214FpSMbbWgY94e05PEg3c 7ndCLmvhQyGBhqW0YacMnUbMR17K9PxNgtUhFZFLaS9EAhvy66PHZiDEyKoyNQhz3C7XiiHHpCxH h3foWejOoF/ICvWAuLhSF36zQa72hMLpFYm4piIm675XzBcLaIUhRukCKtuRptoc51Vtk4hmZu8Z eLy4HIFABbAnRHpcoLKTgLBIdI6BDhAqFhUYPLEjKweMJkURExZaQIeop+7zWkLJOFzHALqwC+VV /mcTiGTzJw8kKgqB2rZqcoGgWNhd2FePnIfYsJtHyFqI6M8xWiLuMzxMZBcb3CwiYGGGNGVWZWbD MQ1q01On1m4BUECAp7mrWDDZOAV492BrVAmg+9qVxpGGkRhLOYRNqoRoxENulJVkycdU9aRk+BUL VJ7J01oqRGseP/sXO5Q2pgyGKdo6QmnWZCanQItjNnB5FkQCIqJFQqR+NTjTFptDhGTKNplCKE6t 0TOVvqWxbuCdamkN9hAeUTsmJyXY8VGZ5krqAcQaVieUjctkaJ572YiKbnXUlVBKki8eXzimywrv xNKLxPkeIrVqJqxrMGLX5UmIwkQYkK+1hRlB+O5VK8dIvFaWZuFuExZYJhWUGg3CorV1o4diUCGK JRULitRNCcxC4hQONuZOJWtMVahoyJSlnRFJKJYas0JTlAGfCYjCZs1gVO28IYvpxlLio1S8Wswk wgSHEhjx4EiYIjhMRGmCSUZDGkUBUmS9AY9jgXleoGcckzeob5SbxcLA+xMQeatsbGNDPleVWTEX wmkEvy4hQsULIxkZGIyHIREhIWwppaTMoRYZ+3pOFjgPI5Jd4jGg+adz8IWgj7vHfX3ELajfG28a lcCNHEVJRF0wi43ARkFxwIxcN4mZnp/JU4nI/CJsFOQK8zsKImDzPLOf5j0DBYKPv7MREcxDYZr4 jj3FjrkKp4GkWDtfz4o6sdxbM4YQsBCylpFyKi/QXmEiJYVlpYiAsU0pvzL8FbEVegkYZxZuWakT sgPFKSZTs1Tx0NBKyGF3M+Ocqga5ptWXodjOoY7mZ2gqSrH1cqxFkr6YluongXFNDjkcbOBtj52H S1xYfYcH1EiIRD0EwvXHbrPh25jbUczgFgqgJCec8xViYVzC8selbp5ob0siXAT3hoD6HkdVwZeZ MmKjDig8sOxrY1DO2p+0BnwVLG5Q0I1E6rN15YewmJjYFiDITweLUb0q5SBke+RpJiioC/kBb9+S PjfE9PEWUkmOnQXAEf0YixSzJMCIi3exzE4C0C04vA9ebgRziXiEwu1zdJWF9RWAoJnOCMxidg4I ZAbu4xRYPLQ3lSpHimJgt7CPAmnZgO9DyKUEoDaBopUeLw0gyHiGYTC5dTqyEWThdZ7WbASpQdjO K6L+BCsStRM4VDpawK9YwwnBMi/pH7YxMF9xdDt4Tm5lUHysQBsITCKjvLwkXTCRJGD7yZQ/H2U6 TxQRU+4eVubkMqT8FWLIB5I9WGY/opJ2O5HlSBCiBMJ5Yh5+YWpcFweVrEKyqL6TT3FoNCZKtKAs JninkfAUL8lg8kIbakH0bApglZ1Fncf6zTivFeLYBvwRjkI5J4hwrxHBviiMdsqyrbIfwTmc/xdy RThQkLDu/+E=