# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101019131456-7dudnpwyg10eqqxi # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 727bd68032e4971afab578c9c9aa6e199b371c25 # timestamp: 2010-10-19 16:15:03 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101019120033-\ # 3fu2ig4ynvhgijng # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf5CrN0AAfJflAAwcn///39n nAC////wBAAIAFAEGQbQec6GZbdwkkImFPQGRppPUzRNqnomjEZAND0RiBlATCaYhJP0mgaRtT1A YDQjBMJowxQ0iNDampphPaUZI0YAGgGiNA0w5gTE0GEyZMmRhME00yMTAEMAkpBT9NJiZQ9Q/RT0 hiBhANAANNApBRF83tCcxLNKtFWSfOBC2dXeNvNQLa7ayDoi+dr2pnQ9tgZHz7aiLZVoJERkD7Qv LKglYsb3KSohGEUUfr9Kt21kPf4emYvSzR+XlTBPjimgOdDwqUm1K2sfTXT0g5gy+JGch7BbyTKh 3YL73pRpWdsuAkpXiIu1r9K4T1iVtkOOyjTC94a0i8HbktiWZLm0YeSV00BG9uCyWuEQEXJobRhw joMyc9NnsnwKDDKoI8D0pTUdqg7CFDFDK+IRewjLTvsJn8RSmEhFIqVQNIiumMoBwMG/w7BpB13Q kbAOk8l2vNuNBFBcg1GHEMswx3AQ6sZlcwzyv5RcxoRmcbgLNZNNg/hpjSmciBUDiRWbzStS7cjf GBapS98LUL0HdniEqBz0CnrqjIMAsDJGc8g7ReLxvF9+LL56oDeAiJWA0FQ/KCcDRN1tiBMvSFA5 mJA0YB4mNqORz4YGRi2AT8CoJnataji95ZkDbbR4jJBwzFxUVLamVyw581yZdJTMbaC1pcCHxLBW +yokH6SPmh77CI4jDC5DROig5JQ5EY4GyMdEHRoS6iq/WWTsqhfhyzFOoLUueWhiYd/hTmR7I82+ syUsHBp45fhGhEHvpoKqaLbIA7s3SEZAGM3lr4W9CXrId3akUcPc7FAOdLHkHyssi3Ti8pEvS8HL ZmWcznDZ1lXv0qzGOjU3KAyKxjrTS9idg1L4KdPOh+O3XRF9yEnIkUEiXAC0JDUiLsA6smrRTixV GJW087Xl3KeUsVxSEwGcU0uoXNVTi1vBd5qG9NNN8z7S90sgX0WHLiaDMzrc9sjbK9FFzW8XH2A8 8uMsTLkE8K689Lc2mOsbI9TBGnWzKyy3ViB9TlEonznHdzljG+NM7wFgW+MYGpTx2HQ2gPNVE8DS u+OLq9TIky1wJjqn5SjLoTHSbpkX4cipC5MxQNGhaBwhsUT3sFUbhTA8teE6MUeO5XX2YEtTwsAa 0LgcEMCRnickMBgPGKn2Rpp+5I5Cdg1BZs8jHAIYHLJBwF+DCAMEUShMMxwsAxDynf8qd+L82kXH bBqIZGLj9jp06UlLepsSLWDhDEb8Z8pDgkJVhhUK2cNj0TDKB7MnEbS5YSi6aRdgtTguZTJJ71he PRJdQYNsQESsb8TBoIukgMkQJxztYBhuQow4QFUA+8ZwvCgiyRxipOoWbLlRgwfJqQ6FbRMjdbaB IBjUlug0JekjkkbAo0SAyEU4RPrE8UScuUWdU3yzIN/ivt/xdyRThQkP5CrN0A==