# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110322123416-667jj4w2k08i9pfp # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: aaca1c7e607572a2a15aba352996771a63644171 # timestamp: 2011-03-22 14:36:36 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: kevin.lewis@oracle.com-20110318154814-\ # kjxi0lkisssxm2mw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRMSVb0AGmf/lGA4IAB7f/// d+/f6r////4EAAgAYB/cAWzjrEAWO+2uu9veb133lF3Hq+2hFWg31zbl2DQSPbbsO7uHTRum++h7 3XOucAJ7DILndkpeZ7mqu2ttOsh1QL2d7b7tz6ptsEkgIA1JppqbRipmaZTBMk/VNNqaBkNAANAA lAgBE0TTQmU0jyaj1GgANAAAAAGgaZAmok1TzVP1QaGjT9UAAAAAAAAAAk1EQSaNVP01PJlRsp+U 1PNUbUMnqANANPUaGh6gDQESSBTCTU/Sep6TaCm0NTaNRpiMQDQ9IaGgDQAVJEJkAEaajQxNSY0T TKaPUGRp6hpmoAAaaNOszOXugJVB++MqbTwv9XuzmGuauUVFl3QJKhQVGKsH3uwdlZRGYr9laiba 1sNEIMog0CYajFIKoWAkSJPnZcURC5KlRRZovtoIWgsk59/PUz6qtyktO9w9GLv/bIerJXpsomuI UT4NGiwQVYUwtuAYQoxVN0FM+iisX6DXd8dvEvHjnfOPH1hxDjFfZVK9DKVQWKUgFTyYoL8jpAuj SzsZbEwMw000HI4PLnvPVpX9P4+489RVVGIfOFVwOx6uxevt5aSH1ehBNO7JgSruzni61mXiUxw4 cJbrz7MePuvrXBllwTjbIg6Wqt7PnwW9NFNDsvNASioAqoF1EgUozEKELGmypxeKartQJexYLNM5 sOhCmaJTskUOjNBhFKQNkDXffbTfQ0HZ2MYuSTsdSxSSxtrItI3Erano1lpw6Z5OwnUA76kamknN AhWyD5MTGVYOXY1M3q9aqXeqZVZGwD1isvIWzPtSGWhvqWv+dgO4QDLT1wOmvFd/0Q8pujSvI+WW BA0m5dElyJflH9zigQOb1mXmmzGUc4yP9pdAmAafpamxdWJf9bC+n0Rx7XPozvY7GGhAoesGYaST q74qIoCNQUgsiIjJBRVIRjBVWIqoLCChIsOv4k/qEkPT3+blGr+tWHh6eZ0OnjJgGGQQmfRvk29T VMRjfY4IeUjEPUXKJY2pKJLPWnCKM6R4Y8QuBozOqjRs0cMGzIdDbq9vj1MBOaO/BYTw6rm0SepH qUnDRwyQhWPogah4gIQtG7VFr0mOpuzOEPCo26ekyBq99wNOd8zfJjezRMglE77u0RJdoOat9Ylr HxLferjV5Qh3lwjudotwiNzFbu9K/cZb0pIsrE2EEktJbMp42kJ5u3Z5TkCgkDCATrCS1lEVBpxc rdsjQ1ZwW4IJmEjDlBw6JdFIii0EaMGCVbpKiMjT2douskVoJEVCEiFEW4yKix0rfUu96rLaVfA/ 6HbU7fL1Eeknl89FTT2T/g2vxJz/fB6e2gOl4pM3xxLmZVE+3YeNOSrL1kgX40hkXNq5eSl/92nb ZcOkMwzcTxG/BDiAnEnvYRlw9SV1maYCc09sAdOzB3eX7ltJL2NaFZyiFoFohzXOG8l8y/aaQ3vE QXLkpdxWuI4EqECTGAXHbakbwxNmtq2uT5MkcH56Vlk1olNnZt2z98fdL58YF83NaomSMR2LJmDS jHNWqAkXcgz+Ida7DdiB02iXMlLg76y8L2aqf5uEkucIwxWeYv26ie6w5DjSFv7zw6/M23t7zuPL GPfEdFpu6jeuxDAwMMMUVYKqTugdP0VKZTOcNvy97TTVFIjnOZiuqyO+GsesMCwiUKT1pAi8rveg S8EoKkcCfckSgpORYsnMsfXOz9XaYedVg7hYEO3fqB6j+TPg8KdQ5foqqPHoI1TnLCAW3EbSlgXq S9zWyCBYJ7OIG6IRRa6QPiMot1DIc8kJ/eSjmkYYY187ZfGEODsSHKhuEfEXLfc+u5wPyUblm/3s VdNSTmg2hE3er4dsQ6PWw3owa6NFs0MuLoRKzvCsSIkA6J8gFHWVIJwwnpmWv2eyQCIRTJyODK51 ZiLdgliPHBxscM5PB4oH3yIlp86B9/2iXflINI6o1MBgk0IiAOumIRDtqZWSR16doQSDsV9yE+yF eToCXKEzPVW4M9vbliZOSt4LKlel8mUG8sTA6TMaSMKKKKKKdcUR3lNl18wvJaxQWUWJZdFt3V3Q wRVdJ8JJIVDzSEPHzSICH4ihSHfPRKZ7Z3fGiiq9aNVUkyFNGreKqhqqCqoSuTWcXi5C7x7Rw0XF 92dIFpJhA+BhqkymUzpUDLILIas1SFjF2SaobIapbJimpugboswkDRCe/dGE3c7VN0MpnAcC9naT SzTSGowTh5jylxeZBO7TRpoW4xKRUo2iAbhWkuKkXTB7nwjAZkaSfmLPOkGMpsZSockhGwP9HYXY O9BK42w26w5RVCqwb7uUHRo6usyYYnKKHvhhADAMDC4JToWRqXuNVpE8ErKsJNBFK1CxCAkFdxZF SZKROjh7wEzcoYmXDUwaziVYpGspEqHgxZNTducHMpocIDuLxtUM/IQVL1LGQuCyYoIAez3J7URN CUh7CfufOTthswa3ckHW3fci3TjeL1zPMgYyd2FyEwZECXmImJIeebuFKqZrvpaoGJUYijAKtZli 6Qkqr6A9sCJ6OzlhlLKhIwNSmbCzRU35pC3tPoHjy6lm1+O7TRHRdEto3RERCRQYXuCqeZY8HkiB VT8KWwGg5BkEAgOm4xe7Vz5hDmZqsmARsFWt2CdxsY8MmYm+WJzKVes61PStzkDaTSWyV1Gl8AWl 0samodwtrAhLYzOs06WO4REXAC3GAy/Bxui6lKj4ncdzW5Rxytxtds0l2VL0b5qmV+CXtqztXFyE tIYY+jJ3ZGN6qtllqfigVM21tLvcqu6W0fBRaZd34XLbItxKfDnZfVdzNGLW8jg346G88BTqEnDd Q8snkIgtUgQD4a252YNOPPO7omosYGMS6ZHvxMefHQsVD2FyuwdTCMg3OquG6IshTV2nFH2eIVqt F7B6S1xrY5OBzpO85rZtrtFDmzEAt0ZgwaQzcaFMEB4nUxbaWakhEBUpdECg9nATZZWBah0pJJzT nDGN+U6GkQQa6ZLFoJo4p1ChMmSL/BoHIASY3C8ouZ25EDYsijVQ5F56W18lAjKhyHDdTkewa1KN TckiJAptfwoGjlMHmwF0EU4XkiylMwqcFyeuzcyQUOCC8hpuWLG5dArj7MXJocJ7cpJNQfKVKlSh EREREQRBEET5iSE5tzmDpMuzwdOXLhzccCrlGOOGjk45OvkJ6eE8phIdXMDfG42ojjLlIOGPdyE0 ECGURz65njiVik+LedFXUnFMuIGKRbV1xghCJQCHa4SxDbBDUNEwcSipu/NqVlWoaYsLjM/HCdQb nD3tYI8W5sTBtN2RtmmDqcTjW3mzc9LX17NYnBG5qr13yS32N0L1pg05yKhI9A1RX1LxFwIASbkL N+J+PI58E92hARy4LKx0coPwrNXmaEWmVYuByLoGG/fc4zctU4NFuCsGFnwnZwYN5E+YzAchyHPk uzjK72N1agZuU0ku8hO6u8m9rLSlW2k9arOcrPJzanQiqE84W51bmGqVKnVB0QPEFQTBvBq6y5bU 3k1cFGASwbiachE1A0MxIoSUKb6JgSz2C+Sa1xUhVFqMhQelBpT2qmba466Dli+dGxBMXR2MjBvW VdyTgrMrD7ilIpNZi7J65zJncEhjajc1Say4SuiAqjCYIlRNpngvS+05HggcMSld7uaGhSgXPlQE 7ICeACTTet9cofeWUibtKKYFlPvhh59KTKutndaRVnk7vPl1C5z8QkTNtOYg2zpJpnwVkzM6Bj3W 7yA0FStNHEanJ0ZVVV27T+KKvVrDQlC+gDWCsnVsNG23yDaMIxa4iYXj0954Q6y+bt6WdVggxjYb gdDZAT4PBz1nnmd/GYKWGw78mVkC8k0wnc1u3e0xVva9p29plakG45nlmbGDFZuLajl0Tc6cuaBl kbM+lNIE+VPHp7N7bFzN2Ijl3aUhGSkbNh71h4os7zqsNF6C2lFZWpSVRgE9aogWLlWwzgyWkpBc 3klHVrCzKKcwfJ1CSSWBULpzerXBht+1KFSdFQi9RWKBYDtUrsHVMYF5QM5K5TIzdDALZRNVtV1t DKeQnTPi03tvu18ED2OPM6Ccc1cuK0zuNjVSrKnQoPyVlZUtiMC+gaRBMErTF0FwgChCsXCSteYV mXWuJb0LCM8Gat78mNzksGhCy7kPy0Z0+Xp7XEOZFqlqY04Gr1g1A7AEB6upmFzoS2lDxvI1U6Ch 3mChvepvhjXzwXJLZ3RE2EAO8JX4MTmU8BxqWF6czd/IXMmAyYLnIH5PRYwS56sTQEXydBGMCAC1 5YZ03FJzLBdINGnVnuzFFEWwxA6+PUoSOhqa2I36Utd7TRJMzaby6nC1jKbHFtcWo3Y6+bF6oNMV DyoFIrAUtGtY5VwcK6DDCxsMtU2Kmk0S6NXyvRfrE4O6lGbjV5OVe4E7cg7uIbQ0zMwVQEreoZfM 1y0T72uHYQA0PhjLrtt3tKW0kdHdTMglfv7wmOok03TO+JJNRDA3LEJQFGm9Hq0kGFIv1HPL2VwV TJNLFjjFZGXBnBUggJsr0W6LuKb+WgrSqTMXOYPsqcE4CXkGelTa1tjYcmLccE681RTgsprb9j5o TMS/wHogJTOG46KqqmVMKzcuSv0W1pROqziGJwaiTyad5k3Y5iAEDWmXxY+Gx8cWXAsXCHYKl3Il KUQ6TDBQcPBtmAcbRwD3GOs6nwjO1rrBCeebhYpfLUVisYMD0DMCAGg6JjyxI87JhKh2matuUQ3Y u90pSlSUEzXKx3Ao8EyR5nFaWmGAs4w+N9pu3BJBQsVMh5AbBYscbHRwucE3nI4s8XTxxne1tRrO BsNhXF4+OgBb+c9PgN6Es6o4O9JE2H5iOcHvQqJhPyaHlqcik6FWowOxWUmSD2F0TEsklGRWKJrk kpqzKO9AvIy3vp7POvVxrmntpQ9VeqlP6VRPN7+UrjqDrgUnFnRVJqlVETUEy56yhww1mFPN6VHz 15RGB9L56CD6sLvTeUgIwZucg8koYHQEhRQiIgiMRi8xaDIEgksAXuCx0PVmk7weYUw6U6Agp2xA PIh7o8ZRTTERNbq0vE+sPWH6o6TGb6FKSMYpFZAkMBLE8L1B/olg9DeezYT1+zKqe27omig/jKRh JPVmdIbBUK4RMhSa3YJD4e6QRUZqgZLRSBlwIrBykf9US2xmYmn7jqcWGDYZtqP+58Ta3DMdJ2Ql HJixTpBnOxfr0V0k2lGnIMBg2JvmWqpwf0IznYwRjl/4u6ozhVG3E2G2b8XZ8PR/YnZCD1n/GnfY naV54J4A8faJCBIWIc5ZLNDZ6TylQb6T0WO/it2G5eWLgDEAYYYYYYrCfoT0koqMPh9tpdCckEmC wLoe0toL3OiZY2MVtB3LTqz2FLjwpQpdjcOWTMjKWIbhZtjEks48wYCagUTBBNNJNtHRhzGA1YFY ZsZmRYMB3hndgXOU7Z7p4T+o/B+rLYciJ+ow/S/Az/A1oHXJiP2cc39Zmo16zXZS+mL0bj2JJHs7 lVjvbXX9l2DYZSO7YdeRt7bkkTrgk8KlVFIp0oPe9VOF+zpZG/293ZbJk3kb6E8SiWkkpDJ9jyNn JJI1p8JHnX7T+zZie7rTs5Y80ivafXYxjfFTLm10JP0HFJI/bea2p8yytRpykY5zGj0lMbEsapbV vtlO7vv5vTUgX8mB6ubE9rGMWr3Ph/S/Q1GDRTRdPRtnorQ2mptO6t298TceM3GzM0e1msaGib21 AxdmO4trK7Tly3GLlc/W5yPJyeZ3n3/pTtKSpp8sPpGRD7qCyFbTkWS0rhgGCFGYEkEly4iIMEnl 9uGJA76kKBFGTqEAPomt6M3h2mdSh5Hc57oPMPGh6gcWZqwzLMaHveJBv17jIzyQNZwamLHjA3ce 5zOp8uxq6IG44LbUC7fv3c8My94u/bPl/e7th1fjCfr8Z9J1893hxqYF0kTEJ8JJE5nVE7FSNEto ll5TkwztM5lin1IVFSESCaSGs+SCMGFnNIGhrXiR4Yh3DmJaqWzN1DCZPiq2LJMNvgH0w9G55wT3 zsae3yYPu+Wxqp8271ZNnkZmwuX5mhi1c5EotuYGjiknq4X4mht53eNNS6zdBOM7l85LxNw6vDVE 1+93anzdcDc48TaXeaB/LNDwith28gnCb9nVtPg7nsaThhJtxTsgWlo8kTzkdoydPsmo1VHj58zh E7fBluOvxt6PyKKOaqDiTnh60ySC6BmxrQ0O4zNBn2wZDhMYBIIQICY5qbU2K6ApLJYrPEKM7Rc2 cSDuCowYKbR4LA+3OLu0Uc1uM37qBzkdjAd46lu8kEGXTPN8P8cR8Kp7HZpQ+62wsrgtk+Jk9kJj xPiZqdGbWyxZHNsp2nttUoU4RTOvDO7JEaIEpvE4VSKtiLQw2jEOvuFRLjDhDlygob8UiX1r1hwl Lwhq5Gq8nvx3xv8a53thn7zquzZbfdm9c/E7/bXtuczbMq1n8dpNxj20adjTRrudb8rflMAznKKp wcHZ/EuCwPGB49ZZGlnuG+hik4eQisaKRKCkk+T6vrrzejZw8dFNcXeX03+Glo/Pj9He6ZzmjGig 23tnhc5o308OpyovP16eiJIp032LoN5lJB4sIG6HWbhA+fRrd51iyeJgBTLwoBpXWnMpiAOpjceM 5GJ9/ZDsDsN20tNwdJMJjiPFdfuDWFLamO2lH9RQrOcIHJtcmxvZoF8SjpfvljU7kTkwRO+JR+KR 9KR5pGYrb7vqXHcfOJ9r1wb4nwZBco5HZwCrRYtywu1h9yQO6BO6BPZU1jyRUMMaKKIyFCraVYna ADN0W2d/xKWgpB8yOkrn8AI6jPbmeBpD0MXtoOzaYuvTKI+VSE0eQSYPuZ1/nfn+iZx4fE/LCcQ5 sjbTos7E3GCazDlCKHd5tZ3wtQA60cXA9TVrN0+uN38MsiaGhPTRAz6pFDKJeZLcwR3U8wA++q2H IDf7GJo7erUPcCnTGSO4931HmbTpzQU6Jxw/ml+KDnNSOG/jcpv0hSSQmYahE0V7AFrnzzZC2ALP 73cq1LZ7QgESdIDQTRlThq8BsoVT2Br/fa8irsee2eWrwQT7n2+TvN84vskeoeKDeWDGkL6FU6ca hjmgpHgFRoUqCkG8vyDpVLEA/ckiqUO5bAcgiEggkp5laEViIUX1a5rfc1m8JjyxON61xUiJ1wJy fGbJB3MAvTc2dcVTsofeeRhQwpYNCQpIFhS0ikW+Rj08YpRpNfKSMfzVGGZvMaLyTdvPq0MZGIyN SJdnspX1180+tgvvyh+WqU+yihxh24lAkIkhgEOklw059yRnYwCZy0b15JKhSUlD11tZqc9smCXM 5QmZQCDAuXoHQd7EwXClUqRE0IEIFlgjQY0DUUD03Fgcg6Mgzt6/nqLLpJH3/K56yJSceBud/Aqr ux4PQybsehqzaPWSRPyUdJB+k4Sy4T6DLYo72cir0sRen+iSJgDJPZIZQ44E1bTg2pOlCHGjXJ6/ GQzmWPNpKl9skZH5rtdxyuDBLzisLRdQJ4bRgYeQ3B1zEMyFtKSKST980QyiOCJ9kI5e1GaOJh6A WhQNdRzDw5c2ZToEFymOdUPQgXSkHYZVejKk1VyjfZYfqTivKVBeWhLyTFD67YO9Ro+/800maNEf FpLxHzxhE0uySQbeVfOe+YJfbrCfNl169Hmlnn8hdKeZLTFim611FUjFhZOdvU9VFO0THryEmSXa W99Wn0Sk8jcZInr7PbWfaQt8NqCXhjItg8fFq3nDwtM5qSUDq7764o2/dLbtyQfBIi8SeCeak8qq H9sXRHGETPGAmRuelZJ7WVc6FWV9aXTuWxpHLApms4HDITwHBcqDfTVPejsmVe3Rmj2KVhbtwGUj lSlRVC6RvaGuRdvQc0WkTY+znOlRFUVSrnm96VaZAWbKWgk9cSwXAVCmAFZCaoKahOiUeBPqBEPA QTvnDcp4oqXTdCVCoVV7yxVRSxXWPw6W6TfO4RuqTA4s5fJGJWbWqzA5rNL5zd0NgLBiAZ4EJo4x z00AHsMyQYcEinAZprpVWWsgWGd2qGbAaIqxlSEKJKDUoO/swWwZwCwDWX4EoLWW8UstDBq4FKCw MQs3uW8xdCeapltyJ2mssxJoZeJfDamwkazVbuqSdhUp2UUvdJvha1g6VVrWqaHGp0NmYDhXjGhq pag1WlkAAoC7ql2bUAs5GSwEBt8Gdeyk5l9SSYGEivSJ7uE8ua9Li1XuZDM5z+J6T9h5UgvQLeFf pMFqAF0EcyPWmMJIwOE5x33mkgf2Lsu+Tk54e4idPjItIMHuqbZqaoa9MtYeKZdTckne+1nIuJNs TDapcBcMYG0TdBp8WkPgUL24ggc5z2eSyJwpBqPOAsqjOi1VLP8pJBMgIyHqTjzLtqnyWYCTq9J8 OpZR48MVzGJ0cXfrYEjfB7O6D5DU7rvG4eM50HLsOnvKvXDdUODaRP6nNY/4DgDqD/xdyRThQkBM SVb0