# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110330112558-5qleclsijpqg52bf # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: b759ae1c24721b02f00b5a6b41c518504a72c919 # timestamp: 2011-03-30 15:09:45 +0300 # base_revision_id: vasil.dimov@oracle.com-20110328083412-\ # odusry0rkbeenhd1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTdR8CwACDF/lEAwBAB7d/// XzeeIL////4EAAgAYA68GfAoMq+joAAADqEIQrTUQAKABQIOMmTQxGJowCMBMIAwE00aZGgGGhCa niNTNJNqaMRpoA0aAAAAGgDjJk0MRiaMAjATCAMBNNGmRoBgqhIhqZMRhTymmU/VP0mmU9IzU0Mm TCjBBtEYZVDQMgA00A0NABgEAAAABIoBAEaamQ1GIJkZMnqU9ok9TTNJ6gPU2mouUFiJPU/RSx+0 j8VlloiKJczSpSl1zGljYtkoWMilJTESkc6WNKwsiaKWSUbH4vpMT5pdCXjSXOhLMk0Lq6pccqko yKZErI45X9LmRL89WFnCM+jNXX16e3IrPSZtEaVXTN0aJm36+98Evj8nftz8+vuObYJ2Cw7q7z7g ee/ooCIhi0ntciIkvagVBkyHFL6QMZAdyAcxq2A5Iw8/UbjmQ7J2SlPBsXOq3gNYFqj8FsUDCCzW XRDgYHaEBjPgl4i3TabbabBtJjBN/9ar/dC5zx6SMqs6lKOHbz0fW4K1l1mV7pjZBhKcI9SFfcWu LU/eNLoFuy0Ir0whlrGsraSVm3FtzcNKRWTycmWZJyabMK0u0n/GZmbEA7wiRIERer/D72u/M5b1 qunaKy+LL6T9PfQf5QqZYTMTUbLc/2kyLmcKszpapoDzIBKBOy4x1Kx9BmlChU9uTgNR/K5g9kDf 1FFr3zCZwgO+0jVqwNt5HLortBtblFdAPhIByM+p4VqO3tS5YLoalTr/IkaB+abc8L0oZu75SAyl oYGBcTGTOJoQRphtm1EzUiOQlSTIwlzjeWJX84QpGdiFe1KNbiD1xuLjwLpUA9FinAwJwCtKyAfv rN3TLuVWI/Q4B9p9Xo9/ujH2cdQ8kxshl/iLhSPZ0Sj8P2lF9vakijQi8/udwLEGLAMRtcDW9qX3 rkfwnOmWNeL0xSX8vKjwvczS6Wp1ODrcF2TPMZ2RY4EsD3D8JRY97nIYyISDIJtUzLlt9IQmYvx7 fh8/Gb9QjmC+36hH1P/fBCK7SOoh9RHSh9AuQuI3Q8+9o3bO+LeihQJOp7+9nf06zlS+dOtxz4vX 8D7DqMY223VIU8vyXASJoWBAsDAHwIzgKkyrZNGJGJjrCFXTFpVOWABzYQYqc5RbEiJMZP8bEUib iMJGJ0g7WaQoiCYYgnCrvInsGRsf2iJEhF2MhGFagqnrKl5aU1mRixDWaoZCVS4mpJ+GICkUiJxA p4EgppfFa10TZgiQqRccEHlSZcZtBA52XFg/KctCQkbn5+vyOzvwJ3JC5MQZy+cTLGB/YiX4SBWU sBFRBrOGkO+6Fp49DtuW2RKYimRog/EiMOU8Yn0uzu54XFbH6mTQUx1O8RcXdRkDvoo4OBj9UL25 bk9C1C82SgC2OXaeBp4MO4wOrjsZhbvgk9+PTlBjz1UvApg8PUxCvMMTsUFfbeKDuzyIhiRgMO2r ifd5TLxF+xmXYFKCDAduO5OOpCwzknnHHCgKffgIu0Y2NjY2N/qIChUZcI2MxBEsaPIliRkpEs3N tytwqX8rrcO0hgII1ly5FLs1ioKLEEJLkZ0JaFxQkXl3eCxhZliQUUlEaClgaRqXiIGk66TL43Zi IrKG163YGGE9WIeKvosAwNoq2NBEyUqFBEZyUxFIceJjjbA4EC5PxH1AxWYbgszMsTK8i15jlyuq 4l9r6S+nb223LF863G1efxEHDKVIYFTyJkhF0Vic7CCKtWuu8YMwEHEFzwIBELzu7TnMvBTvuOgg 1WTN8oRnIcRrNZwNTfA6GZXMkVNsTsuuBbaEraW4lCVpmxrhryQQQXGJUFruU4GJfqcD7448i/Ah SduysbhFQV5uybIlgUSpeXrfbYwLrygokTfiCkZlCZgQJB2EcORsbtBI0gHBnYaT4zyZyg3oIIDQ uUcTMFNaSLQh2Fi8uWBrauY+NTCBFSM1HygbGJxKV23OR8OBmaBnA7zlHOZwxM2QjsCpiTgTtkMh gSLpJMRjAU0JhcOQ+bo7jGHEGUlgcKE6dgjYuUy4w2IEAWh9xkSWNjidDa75/MqwOVS/f3bwWLUu RF0zmEtXKZsG0gKQQOzoBgItIuhdZtsbYxtjou8yPIgbGp8JH0IZ7BYHI3JEf1PMOj2nppSihSlI lhm5UkS1zMxMOVKMROoVBh5h6/clIX4eQHU7xB7zkvrTSD9DPqiJiJlL45XfP7NF/7+c+cYZxvlC MIOkXi+LGWY96Yj7YkjJlUel/Ef9Fvk5GN6BZ4Q4jg3xLzMl0zMzMzMzxq4WQoeFr1kPWPd8L0cl 6IoYl5FsF7DEjgOs0yJEo0wAPcJeZ84eg8yh5ejjeaCR/Sxr+H0qkKKR5mRQiJeY+Q+FDnYRIy7U gBiR0Ef57UpXtSp/LoVpVHq7upQP3nkkRn9uvNAf1oJG4l5Aa8gv8lSAO4RLqR/ihY2maAde2QLv BQwXU/I/P1CPAsSe17mRm6aYMREuvsZWVg5HkMibp+US4c0C5kV4IeIzQxnYuxLfWYEF9DsRMtZE ojiqOZLxODkbGojU5yOdr2tpGVj9aF7TpG+zWw5SLMxGV67kqpKUt274wd0ciPybGpo3v207ohIh 1xG3HjIEmIJi8kbpCsaTXyEdlSIhlTl6iV4MYwY3MgSiYE2IkBj3eHwtt3HuWB4s0GXGOaD03GKD xKB1JFKDsWSTBcEoAMVDxPA40PIRI8gVCx3i7CFdwTOJzNz1Ip0LO8U6Ynx3GXDWZue9MazuyeZE 1aIgcZemBFtT5lJkgKBCZAcxMUZpAe058mfLEoVAhlvi8vQxnjarDGsRDwsaYcMpFIie15kSRJQk lARySFu+8++7Pffha8QcV/AjHofb8dTdlmh/LZSEefdfFe6L0qwvPf8/XI492Xg/Z/zAvEjMB9gI 9ExCV2Gyjt8l4m6Kgmlzubi5tmiTfZSIKPjBF+FTCAiNScHe/bEgz3ZCniIHaB+Et/j5bIbspYmI jDE5EPZvIqpiZWFmoiojq7ULNz0OqW/s7OPfGYxnNHn+ym3qpxenyu9nz5yOdsM7U0i20iP3iNMR oQ6JiPC1US2y5cE0444G0DPkQR+ggYjdpiGmMQdhKdPeN+Z7Gjie0A9Z/dR42kGKlDzTBaxh8pQi hqD6l6gfBIpBKbSRdeJLeJ71o+JnsbCOcEkamkbvUIyF6ASmhHahHBUfMMooX7/eWVwd2P8xRLhG G94Lcar/ktwPqkfEPH0XSXIQz5/csfu1TGNto5zEQMDYINJC6jAjrhy2glH2iNT2iDqrxA0bp4mI kf+akpcmekRVJGRki4YLBbL6DmIlAJgMSLXa+/yAOIYJdPZqkKIl7xBkepY5zSiZgZxJSj6aGwDQ vWDKXYCCZdGIvl05ZW4pCghH1iQ0juX6HxAaUPV3rO1zIJQS1uIqrIrbwVVJcScFaoD8iQeZZUmO w4Xx+whCUYSxnNuXrHxGIvS/ESVu5hUCBAgIg5h20gq1yhMJiDCPHS5B/X3mO5vh3M0YaL4FF1kx saUAHjIgotAyw0vX5H1tUP42kJFrB3CMvJWlnsvh+jZToI+tdFeMTOSQtDWCibJKC+OV6QupoedB G592ZY2MeYBEofzSExFBYMm019klUOIEZmSv3COHDoXCMVKD/rMk5expNBEDC/qkRjaPi/MQegC1 MT0mG5E/HIoIPxEEhRbG2DBg1gxQWjAixZiTSZIO5oQdvzRhMD65iq0stxCdi9AfmRknwtAC3cbc APyV6SMV2FPhWuhrDCtwkxgYDd94g9QCiIyakorldLv6whByC4blAfZCA4tsKOJeBSDGQuBXYyis a+2Zl6TgL9SREP2IApdmBEKtQiFmE0orjxEHFYiLUS+BwDi0a2Mqn5C6JQgHmecT42WuoDSCRwEM vZBTVwojMGFFKxGC+sDQTt5+onl1Um6+ai0xug6JSnHQuBx4zCBEReK15MU0lYR/UScxEh+0lYmU GkiZvAJAaCWD0Yg+bDoMRoeQwUE7+PHWZse8qEehokuBfuM40SmXiKKQ6iCQGEUECo6LdVyDugth eBcf0KWPZ43FDjqyvs1EF2RjxOFcFkoGbEQMg7wwQjXxKKK5JkNqrGRJilxvgI1IhsMJFCmJWYUO wgcyJ4rRnLLOKSjixsUPJKGROIf8VG3dSM/tV7+nSTjqIOvHr1VsnepVkmzIPY7sSIjqep2dePQO 1282pD5pdJ/9q/T+xdyRThQkDdR8CwA=