# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110428073349-hjvdnwldg97dl34a # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: a0b943617a422ab69330e9ba7c2b836deb311933 # timestamp: 2011-04-28 10:34:32 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110428072940-\ # 458g64atxe7x7wq8 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfFV5SkABAZflAAwUnf//1fn viC////wBAAIAGAIb728do8lEIaA9DoJGgKd2wyQUxqNT009U8p+k0jIA9IBoMg0PQQBJQIYg0TR qnqeU8piMQNAANAZADUwhlCmmQ0DQPRANGRkaAYEAGImojT1T1Hkj0hoBoAAAAAAHMCYmgwmTJky MJgmmmRiYAhgEkQIEyYgTJiART8U2FTYo3qnqAPU0IUCFJrZZoT36InsrjiKKOnNnCZhJVeMouyK alaUtwZ0Q7JL6yIBSyEqsjLlq5XWVfZo5w+5g8jlng0jgGwNYBJIIBIDy7gcNkX5taERCSuVt18P Qm4xdEYrro2I1HftuD8nsxU/LMlgiaaWa4JWr6bfcrcUpFOWJkjDC7lWbSOKXi+0jERMPIGAVVKK tChqSgoKg9i1XLWg9kHC6KwKqplNBSiWGMrCMAZygQWaChpwCszTiAEChVDyd4q9pik7iZHIKo0q wnu8t0jvWSKBD8sGjtDspfy2pKTJHQCqKxhiePjSEIQO3jTzKdX99khhTVpXMi93IMYBxEgQOoAt 5QDxue6gAtAN7eriZxn128ZlTJt1uHMLaVnOsYYSGZhrzrAPVcw3hGkwghfNkDWtpUHMdaQXAoA+ q2kdhXjAQUrBbiFPnlLWMkoyqZ9Ba8GEycqKrBio1UK6vYFYdk+6CyCqDRWM6M5eL2wLGMQFnmd0 +Q1v0kIHPaCmWtu2567K8KX4Fz62tlA2iY5DA07aOPcCsNnl88CfBstxeDAomgNJI07atjXvEM3o 3BIH6biW0qKsR5WLdDbMAurSXR0TNdiUT3ZmTMzfUEbS3DTK6dJudgQ2VDCNY2FRpoR43DJONQKS pAiC3AsC6twWvB67d42AK0vMOng4Uxqr04O1qcDaxcNKdcAzgAYwln0GuPBVwJ6nJZxLZxYHnqIw kCdUKIYgCmpmRWCvMYdX5z1YM1vpxx13ksuRidNNdYb0nwr5syYJhgQJJ442BaZGFxkCuGRlVJ78 Gtxg0g/yqDnPODNAWeGdwrKpl5mCcctu3J9r8s2zUTfvtKTkCrSTJkwW9mFIxqDF4qrtCl+uYKRm cyvVdL51gqPzBMySV4/KRcMeWEo6kOGEFJ8rs6yUDwqJn5M2uIrqpjtvd9YKAKOeiEyMUlnoOiVp HeCmOZDl5rscoehK6xSZVsU1b9zUVgZQRRxNRpIsSYpU1YK0P1Ru6jy13awHTrrCEA7aHP5B+nUs gXmHQAVhgmZhj+ZZ+zEfy9QEWr2arbmjYLljDr9Nq3DayZUTWwEYWtDqfJ07UxgcFWWDBhhiL+0E vx70jF/xMCMU3/XPI0jI3JghQR+n3PmCf1Owgeh6HkfIsHn6+wBQ/f2LjUHx9gRtC41N+psczIbP fwsrsS2nI5+wB8dYY6fuM3Ish35kAgojX8aDgrfVgCpdywKiLVg/MG4fEtqmDyM9ALcdHYdORuOJ 09MSsvDbl8EjtJApmK6qOEzss6OuSLTiJMERWAqFelzVcdsAXAStXYUBUKFQLrGz6YbNxoj2Em1s wIcWq/MEMa2UWDUUoCx4QksiISDpnZ1Axw0LKGK9RIV6FNowAq8C2M2kkEjRfTsPA7vqCu3nBaZ7 hWb72vhPFZgtJwNoL3pkhlrBfIFWrNGG747zKp+h0/fAwDVG5hp6uyMiAv2pwejaKnUgQyYG7jf3 HQdR0ndZfTxi7rmV1Z3/MNYXGTXsNijFKjSGI7zSR1vWdh67YgT2kGYbHWug+3kXKan3v0ZmHEju yr1bmeDtacQDGbbOomZu7ipPCLMlsTCYO0zt4z86jdyKeFmiA9z8H0V8jmTkblmOlREjFeGKCuXg 0gXA539p3jm45HUbS8sJ9QLqYgSRU1ZoF+Q7gsDY3kx4t8vxCR4sbGyWALPeAwDKPXhTzNiYGOQj pNIwMDB9mGwc7mUO2BAh+gKmxBvkduLDY57m/hZBBk/aV96MtFYp1VabeAJrlYlEx/gnc6XQ2l+q KY2k1VgrO/trilcAw2T7hdmTxSz6pdPrxBqcxgQ89oKPDeCZz8mgB+thklUgOUzWGoFglhAEclLY CYPpgCHB2DVPtLiGjTvtiUa60VjZ72UzEEaADjmvwe6GB+WSvKsQclecAaQXBOSIQt8p1tSTTh/J yMWdySDjtcMpMiwViBmA8hQxKzUwIYwYLgtgkCcIDrIlMkSHBnYoMyP3YHGEy4AqLjQ8O/RMYcA6 YUOjK/ed2mQI5sjBJTPejhAjCoje3+QRglAJh5QWi7sl3UrpxC2b/SR6c3DQ4uBNEDRY+5Sbvqbv qrpOhXJ/Gs6RWOZKfPHlua5kXGl1vgkLjEMoTJr66FgLC6UUxMFjAyztgiKROq6gVAi5TjKROQT2 wCEwVqZCHUJDekeqcpZcB2PHreLMQqgGuJNUqwjN8qE8YbGDIIFQq2rzkCYNdOGuYrqephMmlGoU Sppd3VqYPkcadQhJWJRhMIhLzAifTjVuunMjpMnGxA7GDUwMwzJtpTLZp1ltjNjIo5FnnKxXJQD2 pdII2AvQDzYZgiBGtSiWIG9S9O9FLPPfrnoBfwigwTEZgD6xh71MMtEi6odOTPSDcewFkDka09dd HyGnGCCtiHpMUBP91gKIwJ07r1wUBE78J1jhAhEZm+CzQ8NEeEF2HL/CW7/i7kinChIeKrylIA==