# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100818114002-6iftfqr4n5h13xb6 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 0255fda24afa32e650ec3f608c824168845977d4 # timestamp: 2010-08-18 14:40:09 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100818071406-\ # tvx5p96ts3919o4v # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb/X6iAAAlxflEAwen///3Mj EMC/7//6BAAIAFAFfXOzlnWm15g1i3sx7BJIUyYAmKYNEwTCaNKNNkQaG1G1AyRTyaZNpSfojRJt NT0QbQAEGjARoEoIECMqfplDTSHqNPU9JphAaaAaD1AkUIympoaDQaNBtTQABoBoAASiqfoFPajU 8KeakzCQ2oxGhoANAaAyLERAbbbYFPvRvvZr5eiRV84cVLj/NeEvPr3Ddu26xrHrRtlgWMlWwbds zm3wlhQz4v84D/0wWp4estsmy9yqoH17xJeEWvxbDyRwXkVqhuNUkpxVymsqiUuBqO9bajYOzQh8 /13M/9xnLdTOD9ZGLqejjo+X3s33SWuDDlL3ee95P9msdPyiy5K9cBJA/6IqIIskMKNyjjnzgbdA u38dPshzLSaFEWU6mMjojwrj99DPXpGVqvopOHDAF5L36CzKrGtZbKdMA8NeCszZ8+MhU6tUTITg j3oN/ynz46ZJrt6sDVYQT44iiCwX5oUYp20Fd7paUSissUFN984EUi5sV1NNMlvRg5rFrK8FjGyj g3XzmZw2SYJnz9uOBhXDuknSxRPVG2aMhVLmhV++wVgvko1CfnTmO8104sBHPK3A3ooUaEYXiuNy IscmZ6SJk6wA2cQUSEAdQ1QO6wa3mYFWAadqfkjLgnvTcF+MTmNYKKm8LUWzakgxDny03CVlJLC6 IJqvtg0GoBzKW7MI3l1gtTWHnSN0zB+p1QnuZc6YrHZPAWpead4xeMwz0Cm7K0ULFLFmF1V5Je07 yJNmsJy+0cPhW7vRCaVF1qraVE84MzcsaGGAc1DQJEtgoVTCglwOtwmJWFKFpoZzcMhKEiSuiBr0 PbLLasQ+zGypdcWq6uSLyuVzGKThLLIvLCUUg2vnx2WXdPFnZg7g7LhVesNV7k2TRtiMYR42tUFf 5r1MpTdWUanP0cOxqsXwG9Bo+9JLpUUX8ONRCLptFPBT84pvM2MRhq9TbnCTkW6r4nxYwcWLAGQy sTNYXoGlua9BJvtFBpCTD4XIGLVO7AVQj1sgjYwyCoDqrgiHmAqY9EGBM91emEXIjhpU6e2fI7fm g/ygIe4ZY6V+NhWpjYo0S1qCzu+JcDVjscecr0LafPIJQuucSRMEns4mK63jMzKcGJN1T5MaxJrn hAjIVrsdV0rRWRxhzXvxJbwiyUwu4cNK4uI8vIICUXNvyk71ubi/x6YYiZ00QUKlqNjgKmZg6/G5 743erzTQbtF3c2Uo5G+3vgoXztd93FSC8W6yqBwllrzTFFCvlrJLr7LfMpZVttNKj0MhGEiXBKxR wgtxIeZ178Fu3kWveTH48azmY9rzraLB5hKLE0VioFpqYJiwkM+3Q44xFrCWdElZnKQI3zHKUFfO TIsDjU+cokRlZIFiRAwJi8FPbDM/Ij1V1MEeBBbGtdvUIa3yu0obDE5FLFqC1A2kgMRCSDXYm4Cg 0JnfZgVBPEyExXAVHBr2u/OaJ7pE8M4B6IMAs7j5C7OYzMF0644RTGBcjhoYmTLSMYRd2MF3/ASB Oa7aBJg2aFVFFYMKljyUM1KY01exloNBkUull55dfo41pBMJuznPP4QpweFCjepauWCHyCpeq+yd fq1ucnkr587sU3hULLqZcRNKgMpicD5OXzc3SdrHQXxCZaI3Kt+IwsSkuRURLkbQQr4IdFEnMFop a2UOvNp2sk3g+Y+vRevalPFM3MRhoBUGrS7qtJGlGRaBR9rxwWKlrXu7DUSg+3CXYKkQZSegZKh9 4LCXXbJroRoeXWgKWo4sa3pL2GAzHCW/+AmyqYlTcN2RdNrWhktTvJWrx1xZ0aW0LXIDxgxDs7GT qnc/oJwZMR3OcU3WeOmc1S9qjKf8FB7H/i7kinChIX+v1EA=