# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100525130549-hnmtwreebkp5mfq7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 6478f4e4f43ed5406a46aef389e56bd611d0d221 # timestamp: 2010-05-25 16:05:59 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100525130444-\ # p46qqqruexmc2tua # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQghrH0AAdjflBAwemv//38v nUC////0BAAIAFAETXgAyAADDRE0QADRiDIAAAA0AA0BxkyaaYTIyBgRiaMEYQaNMAAg01JpNip6 GUMT0xEAZMBAepiZAeo9IxxkyaaYTIyBgRiaMEYQaNMAAgkkIAmBMmRMEGmiTam0mZEyAyaHpCSS C7Vq9Jsw46wfLQuSnQ2HWVQoYHYwG6dRKHjRUfeVJ1XEAkRlGnibPbrkke1gTLgPU6KRY4VMgff/ hAlZ2BUwUiln3+STgQsodZvPwj6YomHpCxUFUGhAzXaZIIMmJxLjwmaXHw7iOLj7DR9VkCt7Foj7 16Bgq12QFxIYk+3mpePXrjJ7nVrpEtwlHjXPFLBWMqxuTgVUELcnjva+ESYwlrZI7IhRK+eDnMmU pvkfMuhaEb+865ELlXzoyJXzOHyKMklpg1WnWSILCO1eZ/dNWvzUl81LurvsNDLTIsrC2rIE0m8f EkP09Mj45XFydh+FcQavJvJFyvJ7g22TM2pkEmm9k3KOCiOM5CO9Zkte2nhKFBew6dxhPJErnI3K onYmE1ZOTD9azLMIv9lv0bcZ9MCNIdW9If5welwDjU9V23CmuD00ijtxJqwwKNTlXWot8asPSyhY PJI3ETWwUGIMmmK1FFLHRGoZTeltGqPBUX1qJPvkkpbREPJZo71ElQWQCdtpORj7L+7l5b8/wumn uMr3WtpvdnraWREjyJyaRoiYJJWmVS8DM/P2qzG0q8HPkXZzz30JAjScIm4frGxEEnvep2h6moQM 4EBHw0YgQ6EUuELEXVU4NRp/AtNwqLZU2GOUgKw+79CwMw0Jl5ojJKFHefDrXAoEvE++j13eLCW1 UnxXyxIg5iX6Z5EDTbPSL7kwlIZOHIbzzuXb73+/3jtpqXlZCS20XhQ5fN4MaFLObxvImdampKVu WSrmUSbogZ68qjJ58HiVwlhp+yxqaNaom2z1LK+NP+JEEuddLDj3L2Qx1SMn8DGed+WpcetmSU9F ZDlC+2HZvzmKHURh07uOyMT1Hs5dEBW2tbp6KFop2tp3OO0SjYpXzTLblidslTbdYSid0KRQmWxd AxgmuwcdOZ1ktJ6bOOzucTbbBPfdVw0zSi3hiDdH0n5JfrytUewpKSQuTQ34mavUFp4BTKvrlbDS iWlGvMh2Xai9MGQl9jAIgDYLMySnCdwPGEuicSYdPZqo9UamkO5JeoSw1jL5HzGdmXr6KyFmhcBZ GgjIztMxX1zeMqHspSAOZ2+GK6xRLdOuybUKJky6uo6WEpNjLUbQCRDLvc8l+olMDlg5UxCnbl45 4KsTsM9jnJ5zaiSqrKXmTfj3SCn7Qeu0W7YFWLCDmQ8LFxE8VWktGnOnOMAoVNsVH3Rzo65igntV CTl0jtJFT61fdE2touKGlW/aSk5UxGlKjCDcFUP3J3V2kCxBW5PrMCaF9FOtnRzhSnNBOODRQVJ6 1wFbjWsfdMvdxXB6s/xca1TrFgmYWgUoWQE5QhYY3C/sD6GT/AODSP4u5IpwoSAQQ1j6