# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 5d6431a585bb5f52a25f7c8fe44132fc058d3765 # timestamp: 2010-06-30 12:32:03 +0300 # base_revision_id: marko.makela@oracle.com-20100629131219-\ # pjbkpk5rsqztmw27 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeIqLn8ABABflHAwW////3+n 3iC////0BAAIAGAJXTZ33bw4AHLru2OtexeuuKS01ezezcJJE1PIRGT0gTxHojQ0amDTUNkJoyMh pkAlCmjSep4mREh+qNNNNHqeowjIBoAAaAA00gBIEaaNDIADTQAAAAAaAkRBTQT1Kb9RlT9Ej9T0 TCQ/VAYQYIND1DRiHAMIwmmIYBAMgBhGmTJhGAhoJIggAKbQmIam1MI0h6jQNND1Gg0ABkFLMRA0 AWQSwIY4aZiNQMZ94MC2yZhbejR3+HjfvquJDy+k8dwv4HV05POmfFzN62C5sHoclNvV25mbHyOe ywXfXa9Mt2JiMhqqgeYOSzXCzsuRJhmKmZTT8GE3R3I2xnPJXU5L7mdubjgRTb88+ziZzlwGsJmH 2ndwN5rGDYmw4jrkP5Fsje8Z37bGotLdYh4vcxs4+eZCaQZiM96N58/vx0mvu+fdOzLs+la6FTp2 SBxGBBPOnegMOfCmqRVJyRGFjUcp46KXqZFYwSzaYK8qryl2lUnLWIRvsDrhCkpJ4OpSsUSd8nbG 8qFGhhHfK2FxHgvNcsSHPz/LZXAnZM49aZXJq6VdE6GXm8SrjgNGV8LUBZkho0XK+YX27qxpFjD2 EK1r5xWs0MTBs6Ie0eHqP1YxIHsjn31EZSH56Cd4dT9SrN+2Bi4Ohh355DQrn5efw5+rNmq2N1qd Pozym2aQuFwyAw4W70EunemfskMGvAbKFBRMHGJ2VCbGEhcApXxV1XXnNxWZKr42ngT3r0iy8YmD c1o4SwbO0MzOfOJZRLOaOvsOUyKBY8zji9QsRdsw6g7ndkMwjexEcHkC5BrIoUwOFCA9Io+nnomL qCtCcqMCmq0IzAukx5mHUXN6PNUUTsFktwwrFVY6mxey9B9PrsQHt5ePWXwqkQjMXNtGWwnyA2zy nr10rA1c4e4Kp0geOGEY/QLOu+W7o5iWznOFqr3hmMLbSbLueZQVsUz9dcmqY4PM6wyEstsV7ZjW 7tURiRbpMh1KGJAChoIqFPSKK/Fhm8hGo6bjqstLW4tJtJGoIDgTONOzBZ2gOwFJAa4zCpxdYFFA sPhHKxjiBJi/G2K0awa6JSUXKBGSeEHZs2cwHdDMrSmHwDFLNJDAdQx1LQUiokZFEa7BnuhjuYsr iW4PSR8qR6zZyRhoUzshMVEqxRH2lxcJjmmRIdiy0+omPuuCse1QRhEcC6MeqYsi9sp5wRAVusdZ YEy8SMzTejygmiajhz2xLiDZPMMA3dcwjkpCgGMHKwil3UEkXSvSamgfZAKrTtPoPBZVdSmmu9A0 HgKhWgV6pIlABgHFAiZk8MSdtxfWvc76hURXkDUCAYrRxfYCQYjlAMC5IoIRNsJu+LZsjBo/ItZ3 GehhSDP4EHJFBZv7Dr9IZimXHnEsyPPy06hEZmGjmyS85u2dDjTjsfZDCtSLHf3QPwjVcdCqpYMp 9pmoQjDo1DMhGn3432oUQtFMb/xehHSyo96VATgOpMszQ0nA2yNDZMga86EZnMYomtM7hW9f0K7V pa5j+e/k0LhmmfCtmhQ5Hj4zx6xQkPIxc8NNA8pniR7qhbWaYXeahnOcVs6xL+P4yosmXcc+g+rT 3RLWRZUU2gdGAoMjtnXSJSLl5HwGIUSFdN+NSJt0CJFLsiksDmiYBBWMgtoQexhQa9/Eb4SwtXZe Ji9osC3SzabsFWPLrUTEfZUkMTs7zg3ONGjPDG5weQsADg4mNovt4AajnF29wtmIFQcBbBaBfMGo DbzLHPhqkJ+3ZeJXtgOLZEnFF9k5QiIof3vMEWt4ehRD/2xixLpacRcazTQm6zGj5vDzm05Nh37w jSEyHNbSi18Dh97bUtBRW+44LbG4vFG1VEzWi+ELThs72HxgRpJQXGbwGUbpvCTkhKgTFpccdzSh 2kO6BmW0EfAgeoxG024uPgXoxqGWTHSyCGl9bLNGGVlK2H1bqliaVwpHXu5Nj5NOpbf3RKeV3t/T FBErUvo61qwZDeMUsTr52A9O+Pj1W0OIJDO1pOEWkPsx0rbxNXIm1lhyqhROEccIxIO3BEHBvqp3 lEW7iWF8nYBYTiUVK6sI5OUrTHsYhwRMLkdrUrqmeFQbIohbcM/GBcXOcwMPjZAsOFEj2MF0zzEy UmKHWIjDlA0OinIB5+GaG1Ip3ImQA0iMVAzFQmzboRf8Tcq/NWauOPuFlxVypt6Tp34TVwudkyZm OwMkRP3Ods+anmHBtpBY9qzInSisTon3jmEv+9m1GpJcFUv7t4LFGMCDLSRJXpkq7BmKhJghUsF6 LL3eyu7deiEEXEyaqFMLbh8xSC9mrihdJYP8ol0I4nzJh+OtYi4AU1HCjItKqGoJLWVFPk6Nh0L3 10XZgzKW4GRAwjiaJEwhFSumqdiErDAydBSvYpS1pdeAq5jIJqFaHCKguDqDDDAwu/r7soM4k28u SsMrgpqu4DgMJ1EtUrCDCUGSuJKnoZOHqI9tt71KPvEs0iQDCivK6CwHzDYybw7GqL0g1hzrZjlx cYNj7ekJrAvKVuUVMTkn4FFdJsRa40mc1BZkQELzFFCljGUQLKEd6t6gQWajHIzFzS4ZmJAzLp0p qTJmsS2qn8jXn32KqbZZedFiStU1RW835fyXYgZ2wrYX8i0LQimgTbN87oZXqO/HnbFHBoeFYGFt ooFJuGYYglPGVK+4mK42CftBCtNILlYSxRdBXhjKBIff7BlWixpDaNQUQYvYa5EoBKLnKWVVLF4O 5xGIMVs5aW53NOoY+sB+udWi5W/jDEyqqhezbtXTqirBnLF7Iw0sOzRABLAlGVSN1tUVlZLd7vJv 6dNEAkmCbUUBS3NTYttBNamWg7hhilGxst8D8zjhrFrw20RDGGAupap7QKLr9UYlpb7UskM2pRMJ xRFREGtNI72cYGasBhM8t2xLLW3nTWUKBohU5p251pL4BfxrwfAS7v8XckU4UJDiKi5/