# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110622083241-qanvfneai10tjvkf # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: 4f37cc97c0377258f6dc63f50b174fdcb8c81029 # timestamp: 2011-06-22 11:34:52 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: matthias.leich@oracle.com-20110621133803-\ # dbrics1pynl8e47g # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbslCz0AGFz/lGwwIIB7f/// f+/f/r////8EAAgAYCEcDunXb7Oczegu13b1jc6tPOz6fcPsed9jvM+9u8+z3GVHu3VClsLZEueJ Wg7u+vS9O7Nrl70Nr25zTvr3fbdHwvd1PbelADcxdgHKcvfY8PoPhJIEAjJppNoEwp6U8aSn+pPK jynlG1D1DQADTQaNAJQQNCaCk2mpI02ow1PUAeoA00AAGgADQBpkCFCGmgjUDQGQADTQDQAABpoA Ak1FAkxGp6RPSfpT1TzJqm2pqemoY0NTT1Gn6oG1MQ9Q9TQMhhFEQBMgRkjFPRomj0Rpqb0U1N6k N6oM1NHqZNAaep6jTCRICaBATVJ7KaRmjU8U9R6n6oANNDTQ0GgAADCGjJGRCSZEORgG8SSXFQSi 6LDdRQioMjEPrcrqMk3tCPsqULUqhiIKAgwQUVXM0ufR66m35qzUUjmlB6q9cbZrWqGihdjd1KQZ VFKxQFEVtCmMYi20KMHY0MFWI6o0DBEYIgKK2hQmNUa/p9nh/fun1cXCcDjCX24bb/I7AnyblegK DjP4vFAiShthx5U9PalyemmPnR/l5Ldmwtl2xIwKfP+ax2IZZjHDmJLK8khRBmenjeCO4qIPPXKH A33XJmRv2XPNOCQ8wHC3d6Rrv+NV8NUcr0Zpg4HCRD1xIBJN/YdFHCmGZGDHkxq51PkOpq9Ks+qI 6Ov0g8YlOvctNoWeDZoQhBK95d+0ngdbwBAgGCw4LncIOmbspT66bRRTo7mbXVE0/Rz/Z2L41FZ/ kqlBHyHMfL0Tfbyb+5x3hXDLEdrlezdDsImw0E4zMwwMliDDdu6rNHNklHtfCMYuTm85TnTTG013 jLmpxC5Oh7Z8RcQqNGTUJORM91UnGwnHjndCQUHbRkwNEWG5sugu6IshkmCEnD67gZ5ZkHUI8VW6 qdbEPaNiS8QXVF2cDTQE1UhIwRyxnbd4NrF6BxD08Q90+TBjDgxlCYQ03ZHY1ocY5R0j3AOuBQAw B18wZvPFA2rI31a/XClio4B5MA4+dOMGrS7RqxqWoY9jQ8JPX09XOZjO4VK7zHdu31yOqEZwh0wg wirJFYMFBSIyKRQUgoLBYSKiQ7u32/skCd42vV04cfiuuvZumd8xY6rbj2Mhe23A2HEvqZbaXM9/ c+DW6Hxgw7q0mEmqXjj6Eid7/fWQSZrxJm2xSgnjAA+89RqMtEK4mcjg1dvatmtjwcnNVsuRJJ3b U0F8rB3EgCCKxcTcazqWIeHZ5mVEllpM0miMpSbKMEVKGToDWMKYln0jsl7I1SGwtOtIGIeYuHlB PlK7lyHpA0gy1dZp6FlhWFFS4s90ipW0sHlCiMCompEFQlQQ0QTBgsHlXm8ZzEWSq4W62UlTBasq znRJU0fMT4VPQe6f9+s9lPiX/DOWlw6ZmcsEb1qDuYhqQzdfGXWCfAgO5yr8QojOG8gQ3bEja3sN Pe2z+HnSNDA2UAWNgrzUa2tuVzR8bSBax736HwbxzOUctTnuKzA3U15kTpNr863FTBJrSzIpKquR 4PldQIuabV4G7jH/uNcpgbB9qDKgyqpkJ0xWbh5pWe/07XoH0ejteZEpGdihvkmhMzX1QGeGTG1/ wGlAZApL4zJ4WfbvnIQLaDQ6eG6agdN8tXrat7eI0wfhJk6N4uaSuLlE+eWelORxBpPmdYTqo/qT 5yV7a9oVvlUxfCwwhfihFoOFI5R1VZmcHG3iZ6r9taoqhnyXSCGu2Y1vAZardkyElHLgJV5bzNpH jo8lwoWXz1ba3sCwS1Bwa3EEKoeNV64lCyXN5nWuFHJU+9tW0nc9b0XC2s4PsMv9A58++7ff7V3n B0L6cefdwsM3jt33xPAk490niPQh6Q08/lPkPi+Mw9z4vPSfGUXnz++GsYIggwFRVB6eHKsERRVr OePAOepQqMZedF1zt6hVmja723zOvryauIAjLbHTAELSfBDNyF3gZPdBIZhzAJEBBAoJYCAeEFMb AYYjpnIDiRA6kOM0O52c+wNdDyVTMTVLOjXNEGh29fxlqFVg9TT9OgyVKfb5/NxrST22YdBmrcxC rpan/VKSY9biigHflnfJMrqHPk4Xoabs2vcSKT4cMDnl64TnOXCXNvjcvsjh7EeY5OTTHKvJRX0s gRJiLHKvEKLOiS53kuczs6IdP47jGsPikIE+Eg99WwQIQpbDTy7EGMUG8/YpodYrCEJM5MhBDHhg HKCdskpkowRGoFgeCT1M9QwkpwDAHLBkYfLfRsqK9+T383bapvbuM48k0RvRMqrHNCnGKjpPEO0e MsHbWrmqtrUdBvSSVp5iAXO1JJUh6JV8UJw2TuKQTocCyCxK3xeKHH6HJVcn3J1CtfKJ7VnoAWRV moRYY9l06cNYw3PJBxTI17ndOnV5PTTVjExrmlNUpQTpxlvu35n52N3hZO9me94w9OOMzszNhBAT pO3Op1q6s7uMOOjs7qz7orqiKuE6SAeAJJ7oSHV8MIsnYHngfxDVsVV0qlVVXOENmzcQqqqqIc06 ju9JXW9ffnEQgsvGgtJbIYc5QZMMWYLwqEpIYoViUBmmbmzFA50lshokPlYQtkbxiSzibY7oU6jo YwUpeFUYIF7ySShWjJBMs5QT0EhEBeic12xlILCHvTHoNW7M1zdELTNJ78zRWVou7pkVURES4x6r 6uTLmC75xsaKoiIg09tFCYyozWscKQZSILFaRA5QB1bi2ra2yZGlBCYExsUKG81NDYblQyMywzJy 8w7S0PyMsMDN2PIUN2Z+lVdS8H/1zAlHEh1kgXDvhBYHb3rLANK11YS+WkSR0mCwosJ41Ey7cV88 CLtCTOM83NTYkANVt1lphSnU37YKHO9ofbJrqWqqZlX68Sz1D5bgbFGUt/gQHAzZOBKqlwPeZEEE EFSxtOFNHQwLbYKYGT9GjcqvE46lxJG4lyMUuMmg029rXacanRopSdc7v5/Zy/XdLMaOUOE5s1Du jZQ5KpI6jNCZBwHyWLSKpCzIY2ga8CmWRM5lYXeu5UlSMEizHaDWRlZT7jkc5GN4Gk4yjODvVWMD lc0hVOR1xiVDZYWUcdZz7rinPTUUKPSQ1vEm8uhelEhVdhvNuJuOozL95sMS0oMTDGBsYlKolK84 mrvXI0CKTNleDmNDnWMDcIQERVdTve04pXyCoiJFGVC5yJDAtIlyTgpic+xlhVTAvMxQrCEXGRNO nYA0rGKzuikzsdShbF0CnG1m4ajZrJrWkIp2gQFNiNFyrK+Vq6KqoCmSXYcsbjZtZIr2rKsmFlve K0h7Du1yGwLDTHgWxhjgV+hrZl5zoCGkADA0NpsNvJrvhmEmJ4BgMYiSIiMYxjP2oQl4HEsbGZyN TFTffoXKFDuPIi4XNDIzLmhgoR+A5JUWjOvaJ58IbSvZBSQ5QvoebvEPVWBuIvGZfppxiFmeW3bC ynCF6SLJRBZ2kfIUkjxtDZbwOMll1s7m6oePeaGgE4QJk9kBgUU528+RZQhgmOtDcnjkpVfObNbH MTHmjpwS80sohInTJxQYVVXYqLjUdibsiIimItzNiDQbNLcJtMJt2qSO6ayMFdzUFqhJpAqsmYDg akypuYtFzY8lEGxnnA8SkCq163pjDYhppM2WlXa1MX7BVDNsjOuBUyLyOkiIEHNoKsrACxjgWCr6 nXEyeXTCCRCWc1NjzGi0xDmpfkkKIPSwtYliowylcmSOs0cs5Qid8rXxFCyjkpdoODRRINy6Ow7b DbTcdiaLutNKbEiniUYMDmdytbdGOjGNHQ7oQ5twDGZYabbrDMqa79/Sqt4biwyN15VgEZEArhvb kjdqASeKdOtguda1jUCBmYKTkwfK7qV2C91nwKbXFYLjk4xM0a5IgWxhqitllIkNuGzIxFibLLfe FMnkHz7A2hmTQes99XfgpS2KG49Q4N65ddi54SG7lCFchAx5EZj5YyvKpuYOxEitWWrAPujRdaSK jJJJLQjYykh2ODkWjqtVO/gSi8xCWipgP9iIGmUiMHRKY50ljkuKKVRERJGSfhosYPIwRsxMmKYH FSqB6z1iHJ5l2rgWUKnG7bVnjmGksLF6XrazytV7SRpzIEHojJexM8nrRuRXOCRaDY6LWRPXiT0Q JMpCSC8g79i5UihTuI0np7RaczcoYYaWMmME2K9HCB5SMGajwbnBwOeFdb9IiIkVKDUxFzY3LhyS KFlWZIc7pVATogqQVHzsZpJKxY0JwZpm/TckYOvwcC9MWmQIGHK283LW8W/E71gvI6DVxFS9JORm 6ptyuyKoeZ2giK5ZERDq5fmAAOjfBem8yghjBvYlbs5kuIaC5UzvFMswOKQNQslSZMqiIiZcodiz yzMmLe3ic2XozmXJcmQnZOEQSpIvcViRccrkocKKNwWJHWx4dsm5o8DdOxcRA9hAH4bDW8sUYbCO 95PJvnosxFRJVWM86octZwzMky5ni7WDwSSWeZIsdVktczXibbUO0ZW3KkDiuXydjbiqpCJVARRN zW9JayG0ndbUSxRrHSmjRPGaxwMm2DY9uGLTyb+KU7p377EyZUsUpycRsbOZc3HYvoPY4LZcToFP T2QWtxduqJT6U2XCI4bRast74yu7xETtskkshILkzOXQnHTpC0TubFjWY89CgCO4ozTfD5GDpdJJ dRlu2Q5y+2z5mXa3gvgRQG3EJXyXMlTAPSjHtEDjyKM8uS/RwcHknxhU5OjcMHJmRGS5LJyaLGZg 3egyZQyNNDmZD4Fl6RIGJBL2eft4kIygxddjIBBG6GHUGdWE1cWKoto7xODbDYA3F9WqjDLFoDgC 4WsOCg18fhp4viw3DNzA3+KpOVtiwJ81FTNw5qDUmpyRYe52k/mSoHnhBGPaH5mjBZVT6pkVUEh6 DEx38OSbDaRksRVaCA0CMVkYQQ4CUiIEi0MP3RIfEPpfeiVA9Z8WFSwO4HuUH4+lDNgRfcwo81/V /gofiD9x/uBD+uG6ZnNAYLIxkEIoL7MSBgB+qMnUNv/Zb+MrR+9/iJ+CmKYZqQeW0PD8i5+84pND /XgqTmlA01ASoMwjlwF/lsDFzJ4M9Y+Z1rCWrxThu+kgenicBDsRAvgEP1XcigNhzwIQNHKruNtQ thPxNHi0Co8VOCBReKJgAbg3EGS2D8sOG0HAKLqNC0tWuMDwxlbQOeJFFCAMyyarXFEkOJSwOiKo xmhWN06FFiocdLFoXpDpggacB6uT1bjQqhC7LiElcDYtsIEluYRHJHxWeaEEnQ0KQU6RqHcMIbxI iUd2QYDJDlJc99xDugesszcrpcUXGjihFCjNxTHKQ9Tl0SLAFkBsPXMHz/H9ykH0k3kG8sY1iD1I /33C7SUAkPX1g/fgXxpUAskU96/tPsVD+EvIMYDMR33WphLYblNwcg5onj++qcggPQ8RJtGZPiwQ fX/SKCf7K+BBck7h8uniGulaouTRCWTEZDGk0MEwLr5SRQvQEtZrMKibhQZMJUSJ2qZNDMEvklUP 8sQnKcjOf8ZuRL4IYUckUyGRUbZ3IFCS7Tu5IwKelBPsc2Okn9c/T+YoWsfsm+TMAafsCpYXn3h/ YquJTgheVL+RmGZ+0yIP2lxfcTkZGZUoEB1Mih0IcRFgBMNOWGSw/YTTCSX/HdkA6xHaS4pO3YBP 1B1oCFaYu8Qcj4joTCWCZiZ1OfYjqdih7jg1WuqBrCqWsIMgsCPOS4B1Ozui7gIHT6w+RHUmnXFu sBCf+dIVWLC/iKu3JEh2Ntr4kEhBOiHucBGX7wFRfHBIFhZUjpcID+QdyfRbGaCaV8wrtegoITPI GlJKWUMY2wClSTk8aeyCwCkB0RDJH0X7uGBJJJU8YG8vN3tnQ16empcaRMj8f4ZlSh7xObFCp7h7 PumqPrc3FLH5REDW5U9RAxIqfLPhnhzRtksiIiUFNxyYvzoTFBcUGcgSJAYDi0kYYZdO1Z1SBrBg +c+4q+ecdsGwSZccK0hZkFnbRnPowpEpIhmAaRgUpSNiuD/UJqVti2JjrENi6VKv4YaQhgZQhQaC CIIkYgiCIIgiCZYaG1pLojTU1FpZZLElSy5YlsNllVxXgkTKp0M3B6cbhozH15IoqzyGuSQBoLGI yCHP4TSY0ohwkknt+EyOgNo7cZ8dpNQSOJv/mggUERinacCA5ZDIkkppjsKncZGB4mhRVbjQ1OfF PaZXEXmwyPIH5vPLQJGpvARlSSWgotGMEklWZyGglgX/IdeEZi5igsiagsTXYzIIKb1fq7lC8JTC XPz1BS6cawswjRgAiBoAjVEPFO5EG3tcBO4epNeqHPANk1gchPJrsfNmXcyEFCkGMhgypRRKhd3L eZMTojIxgZFwESGK39o2/tPVlRlU9ciRiOOhs3jh5tODiJAeXFxgNOU0MSJG1BcXoFkKTgTl6QqC wmXAwNjrCrI28WABqEhsOBBSHM4HY+W/idOuRxOJ7063Q0sOSSUlEoIcQSB/Dba/T9p2TmzNeUIG W9je1BikkttZSYkC7lMeoBUZtdcdpleWrlPOYJIK+veX29+Z5jte9C45jIbW5bvKEYWPYeX6qrUV r4iTNZdsLLBhlQAjmN0Vju4WO55cNbCEQlteBuHE9PCNsoiC2pu9t58QQXzJELjLHGgSaY0Mc0oY GMooDBrClAsuum9B4yEk8Z2ZHLnv1bS8pGO85FHcVlo18QkqbMuRHC5rXnvZnveovKDYY9RwcmTr k6ZoPcqeBcKE2Jl728bo4yCG8Ic8C1ZOZRhSz2rDKFgoIA9803wRAEKdift1iNJcZdoCxpQevZ2G w1GeYvrLKoLm1DDoKtOsppnWTkLLpO+uWbMrwRwloaBOhaLiZQzETPMC0Ew5W9Dm9I6MK8Y1k5tW TXuespx4lwsSBs2Zi87yRqWpViQOyZOydUVzPWEKfYoCuEB82hI9zIvOJHRaEpLYJ6oIsr2HM25q PInQNx4d1yFVHzJ6uVQz76aPEul0brMz4Z2l+tD2MOBWxkG5lsWqB0PB2trCHfZR1xY9sIFfUXCH M+YJVd2gWwjEKnSthKKZOnUQr7GDyEskMf3k+ZbBN8SLfBkqsIlBNBySDiwgl4nL5idw84nkZRl5 ESk8TAqHFJMak0WIJlShIkMFxgctcwdy5k3REQLkxTcoXLeU+A1NCxuSNQZ5z0eiEklMornI5FDb q6HiA2z00dupUtAegiWK/6In1IkolzvJ8tfgAXuTA6L2d5IVm2hlGkQ/YQUY2Egq5UQ0uE63chTb 6Ehe+CICCBQD0GShO1fc5F7QqaD6w2Po9B1fYBMvpogS2EBSEhYBM9ZtkzJnLmHgwP0oqKiCCg9Z hzYMBOvj4twYZUE1JMyGMY35r1a+Xgj0LsK/yPNOsVTsTET+UeZ0fIAx/J7ZCPsex0erMgiGsF6p ipQn3Le9YHbFw36s4QQkPDF6qtV+UZgfIS++RGMw9zg6YIm6EU7H4w/R1GCaLnjsGyAI/eT9ikie lUgkiR9Zu2AhkHcC6C09fpbuuvefdwNqM+fHWLaXQ5M5sFoWVWAYgyZIY8nwUb0D29iYu5CB1nmH 3R0GKrvG66JiYPuWzoDlV5vr2CfOdvEDOAQhhI7RQ/rQ5v25cwHJTRQYRiPfAh20gQPy6AH3Ied5 gvgKFC/sUCB87vWDGSYbYCRNwQkH21B4itjI6MDaDAgenf4dSWFmG3YyKTKIMonIhEqhX2O/ZtC1 9UnlYzHT1EF9tifub2YCC59TKJUh2+mSxzE1SEIiCE1UShToSKno1/ODQ2WEv/J0IhlYcshNlDma RyozrHM2dZkb0pQkQGgKzK8jgdQgYc+h8yHsPqUgSfZ8yy/LJTPU4pPTu3MInGS7fBuqkZ2TVhae dYXHUowyurgKc0VQMMlbNkPxMDYrRYfkuvnxqZHEL1kOQNezYbcC7h6RMVLxuwbpi1/7KTzDiRZP zmUltwhnnUpVbyoK77LM0SharYiEgSTAREQkQwC90FpbIUAfoMqtbxiSBghip2uRi5Wsoj+luTOH ijicI7oHFwwuZAv1QaEFIRWAxkJ6CQNJZDECV5u414qIUz+Qw5PFAQDFfeCQO3PK1l6DnM3DvRxD yL0AcvDfklyIMBG2AeIGXnlfkwC1+Dvv4N52wVbU3BtSIVLh/g8tWng+NUD+KIMItyWrEvVDEOQ6 J+GhQ5egfTzCzo3mScMthHefXZ33ixD6hQo/NmlR1gOwDQNB7JGJzYRe0gSuyaolYLCySH9dCiPz nrbESFGPETUB2P0rxppa4Ywg1Sz4F/EpVDrtvza70Dl+hxbyveA80NR+cT3ueKejy5QG6SSE9czE HnGFmCyZCILBqNE/QT9j+ttEAPibw/OCvcrVOKDX5OusnsPiL5wOKB6TQAJgfvflse9Jwr4SBWp5 RHqFcBuR7i9gQArXTfYMc1HuqiPSGZ1oFFA6Vw4ixFCGy82oeGfVY/m7fXkuci4SQpIkkaeOvkp6 7JntyJkuVFfZmeLARFZCm3F5TgFi8ocid4SLLksqIu+uiZYEWKlDx5bDHQZKlEpL79Gk7J5pkZuR 2ICyCzSELDPZHfxYYbJJE8pmxlUIdBdJINs3TegmwTmjWZUcmeuUHgJiuPUSzDPUwoM2ObKksIeh BSLY3BEoYN3cSd+/SOUdSWpYBZpE9cL1rVFZs2JjwVQ5LYJkxJ0ABbSMNLiQZhcEp0QiAnJP6JA0 IY0IYFJxAUKADIPkQSgWTUMOiurhJC4Lid2E1m6F2rAIsIR5FaxrNHmYk3hmpmmQjCioclw6DlaH WsRb4AOAYEJEQQxbbxQOCLRDvR2BdQqZKD1nNzbNYUcqMAbwSfqNVseMKXCwJQUPeKFczsNqoUFC 0WRRT74zfqmE8onQnMbn1PzG4TZtO/laJDREb3Efz06xXGoQd23U1ARm5ps41YosAMwXH1vIhaAm DdXhB28msdEvBm1DsCsgNmNVXpAfOJ4GpuEswfJoPCA6CJhCupMsFo6wA9wnygldsJ4nVK9RCqVE 8ya91JJkCQ6AjRpEtCKd87rQtCkiEskq+1Cpt8yXNFh6xxCBMetOAo+0HwTGDkR3TSd7LMD5SB+5 uFiSv/nL9P3i7kinChIXZKFnoA==