# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110329134423-7fkbfwjtpvxnc5hy # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/MERGE/mysql-\ # trunk/ # testament_sha1: 73983c5353029af06c732807871cfb3a9a8f750d # timestamp: 2011-03-29 16:44:44 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/FIXES\ # /bug11765758-rpl_corruption/ # base_revision_id: gkodinov@mysql.com-20110329083458-1w0rb7bxa2c3umj0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd4M05sAEpbfgFAwXO///3/l /8q////wYBxuyL7AaqIdVzrBWphKKoVoNsZaGhbFdsSOZXHcNmDWkTrRmMqgoGqoAO2UABICQAAE kiMlT8TKm9KflTam0wSeU0/VA9Jk/VDT0IGgB6gJJAAmhNE0yBJgp6EQMCNHoAnqGT1PUOMmTRiG mhgJoYmjTJiBkYTRpphBkwkRNBETTImJPTUnpk1PUeJNNAA0AeoyGgOMmTRiGmhgJoYmjTJiBkYT RpphBkwVJIJkAEyBMCaaTTaiajTRpoaBoBoaOAFuIMXHbuohj8GbJ2SPZSZuKOV+XETwzPZoNqCg qa1vtctNob/gyp5uBDvaYahtxBUR/f/p/TzHTk28wc8bUeOB+xBt2+JHoacT+R8MTlWHc6KHjNQ2 PeW8Z+2F5MhFm8r8n6w4OTub4Qo9zsyxzNSwqsWYRHwZd/mr0W7aAWGJdbRyfexcaqUQx2iOZFNU xQwLzfje7t1y7WiZr/ORC3OJRpQQjoYm2dTF63d7XKtvlqo2B64PE6gmWOItrZuJs75HjW8uc1HD hzsB61H1pnXvP+3b7+cz8PZ5n8qq3/eiuaPPNZy5yeUHfB2wVCqKqUqRVKqqVGJDbaGwbAaa9P2I SK72eUrhgMIWhjHHo8XAaH8jF4xPKLLPCEcIzmXV6vXjxNr77YtipDTNRHkbuNPTi2qdnqLajzbk vfBmdjEvbaLvLy94ti25MGWUm4xJjMGHEW1RV9QqtCckFYjW0G216tnVps9qvI5i9otF5p1aSRxt NUZmqjDyy7kfwSvCyzdyaaxO46ms2V5IQ3G0bDveJecPednio09NGnzD5V3HZ4zzOw8TH2YKo/2j CaOzevMP3gh4/5yLFCER3x9qH8l+tHrQpnYwRvxXSKq1ybvPVdjVusx7dY9JnF2jKM4kwMtuWd73 0BvupOXR/3nXSRpA+wwq/cCMzexqUeqhchKIbOTcIDlhn2e7kFW3VyfjREtdV7cLG3+nNaeUkhnO +yJF8B6N9Yy/tV/vt2V+VtbICFei0rBmzoxkhf6ul0BCxPZcny54WaGXPxPW1zCEU+XFYlzjaahB iK/qMCHkDMTTJLZjIyJ3OdYBqIDGCXmApR53WB27dln0BjR5i3VF+VWztknvj6fEiCWbjyC0crZs blWycpoI3eIUlTyJyYMjcnTPKQetF7zk3x0HJghPW/vXw8Pd8J91RaH75ePtjyYfQPuIULtSXsPn O/qbPg4G5lx9AeHROXDhtkVylrUzux4qa4wx2y7VweYRqLvY8Q9kJZJUyYTJp9/Z2+bYwJJjSBfU l4tEjAISgv9MAbEa7jOVJFtuinY6WRDTDnOQihKrmGSyIDRx1Odwv7ztMWLQvIqxJVR5B2KpbGNd oKhfcANe6XT4EjBiqVL2l6yvFMJPNG1wyN/VIzB6hdPA2nW7mb1TtknoWaWZO863ofX3FkWOoB7t UcC1jy66PN+X5mhMcV6PXB15WkmHOcp2c/D8pqgjlKSeSzulB4whfnSYKmAOvztnoE5ckKNMiJ5u hWVqItNR8yAt15ERDcBEQtlwRCRb0NvvdMeZIJcEWxERR61FsAYEZR06NnyePj3u3ISBvwa5OWiw y7IYxjvF32tDZdl9QknTgSu4YF2iGIpiuFJgBJq03bDJCviSBiAkAtqW5lXlUNJitKRURF1ouXpb ey1L9AUsCoLpgZKWzkPpYJFhoQSDW7wJyY9rECAQ9yAsRPIr4JUoR/upyhbJBaQotI6EDBJYLeUC jwFg2dxts5EJXW5YdrSsCA7hgETUViRJIUFGboAYGhlUIkDJ6/n0iXYcODoVUyhoW3MBAH9Lli5d fie5f5rh4vigPwQ1k79t8LInO+yF/Sy+k2X2jbfaqkYVyqStGGUNF0HDKUTBoL3QvBcxnALlpJ0x LJkotBGU/y2VVZzk4W5aJNFzwHX2NzQaCY1qgs1xEXSGeyQu3YMgtcuXoBj/FJveXwHwMhFPGoom pvol+0ig2pnXy2tw0XePnnmQH5aYehYwb0v1DJ3AB60HkmEbnHHFtbbZtb2mls47Br3QmzSUYhRN FfQ6D6xQUdANX0VIj+IeHJlwRHEkgm4bQhE4WpAAJxZulkgJre8hFz8nqIkUwq2Pk1wAzhNovlyV FIWuq8YFJAtQtKGSgMMJi6AxvM662bg7nFuXL2Lu7YL/O7JpdjN55Gtpb3VPVPJdwA9y8V3AO9Xo p1NgZmSh2H7aQc4lCHRn0j5dod+pqqNSzFBrmC0Cag/lNmbWzPLlB9+p5DrNpqtSaWATIC3nhUPI oVW7AyqFmT5FBvxWycQNEj0RkdqPI31KZ2N5Xmwzbj97W1y5q0m/E12lI5EyLFh7YH4VfeXIE1U4 FQwVU+iXoQ0hzHLlhQUmEUumBlxPB1zK8xE+0vdTi5Nze2/BvdJw8+fFw5zi3uLS2smxrwb8NR5s RGJJdOiqfROXQW6jl25OF2H1lsk9oBGXKbGxw1M5dtmTkaLaYjWmQpDieYxY0FF3VuCgAES/N71I kcnJRZIDxmpnYgZKkDEAFY57aSMbTQvBj4pYKApHIo+rEJjPNJ8EVMRwRgnnBw8zOQ1B2yltUhIU MbShoXyznnw1DSUXM7A2ubHMJMTYJnU6GkUSPUFttwb2lt5B1NS6cpcjZkMyq5xQ33eRIGxMkYPA 4oX0NDPo0+xm8D5n2PFdBnKvNk5zTw0bjqz4Y3OpdM3t2ZkxhyZzV6M4dpLYNc4xsHQeRdu4yOBa hzOvWK1JoFvuULEI4ZAaveMtdzUeEJDgB2shDXPy+8klVpjrJwXGKm/lGayp7CNTJ4jyxnnuZj9i TJhGfmF48zfqn0MHKKedeJvm+oxXRk6Pn0wx5E0GVR1VFKwVNLqYtTQdCjnd5RLx1RGnradvY5ux yV+Lmmlg0OTcvXwNd5OOZM8djQ1iMbZPNHMXUA5JcksLmbu7Rv4avFiOkhVY6oiZ6SsVauzJ722D aCVSUerbDTQi88tCTyNT3Lz8CZY3J52u5YMJY3g8weB7GigrrxHJG29W2hM7I5f7goLhN5FlqaqJ 2Li1oOTESKmDgMnmRXAxtg2uVWzLLOLuTcFhnF5EVoWREVb00cJtFDqSJVUVEYiTXYRLB4mjgLCl Fpqve6cWqTFNRjum3azbNbASqORp0Y25GRdSBEoSKnJinIcWIYeUEd1oFlNHxBhfNcsmMTc+jid+ CciO9YMSjB9HyhKLNRhzgGIICBDw6OkQqEoxGqdVAt4F5TsuRzC1DKiVz3Jk1id2Y2EXgczBQ85y NChIix41lhrz4sGm4b2RvSMJhM1m7gcmJwYAwzPgjwR2LtFxF1lLlh60ceVMdVzKvMDkgkv2yPJg pvYcH0lSm25Y+NCL1ImPE5AFxdPsWkFHQ9ihtU1HxPGunmOL5cTIHIoj49zsTUBk45pUEd1U+awk SL7GkCWT1DmKemaucZYKsUzk5d1Ghu0HhscFsbxZC85Yy24jjEqXZAu0wbGhEsQGIrcqLwUCUaFc SNiBY4+Bakw3LGnII1BUr0rxWRDShhS22D7itzuGSaEr0mjF0j7ZsYot2uSSqrDaMNBrGeZgvJ1l XsAFkFaKYLqnSHKxFHp7XLSqWVih6dh0Sanl2owyIWKizccVyDku07HUqVIWLDEsEHuj5gtNCxpQ Owc5eQQL4IjpPOhQkbA83YZSNRxTZgWbP5zxPWuBzL9nLblvZ36pmeEy3ZwZu6qXQ7wOMuCc3BNc Q5iZyJBSKkQLYKJJEBDmcEhEC5FYMEjEwePfVmMjyISqVHqtpnrqX4LlJHgav94BjA80B2HGdTbJ GhMAkNoMPXKi799SOBps0zmWY2PEPbrI0IBYcdJlHW5L8rjFtcHJ+NYKfaD8Xg3+E39ussjYZ2cJ vUJbA5mHRenSaC0UviXmRfLaDOdYJvOEBhCMZHooxrQ7DDKBXQoDDMqgkZaGllVCEZELWFoIDj4B 8Wgb/Uy6jxP0iP1zu6vuRxsV2lVJUpKOiMFDacJNEjTE2JiaaQZWg/mgPaEoR/UQbVQvOFC0qRZj RIJARW41gjBHSjxBisRckmAY3OcmEMyZj3AjingiLHafDej+Hc6kIgFAwI3vVY8Ds/0KAR/SKP2C HETPAcsN4vAEfgnZjYIFzEVUEOkfiyMjEBl/IZeAI4VqjJpmiY13W5S6+O2Wl7j79MOnU8D0ifUf Uq0k0Q+lKKVIuLkXSQwKkl0FLhRJgH0vR/aiVGCUH7L8ZHuVF8GEVBTFLCn9MftviPxiowkUSvyR o5SHM3GMvQdFs5UgV3L1gB6TCVAYVE3WpcCg6sXSe1SHBU/TAcf8Ipc/yBjlypg8x37dMHROIGxq UoOIa7H8DqDi54HE6HQnTsYNSY9jHrNAkQHgMMuFwcZh4FyHBu47A5tO95DSqDaibzxPI0mzaatc rlZDkn9/FfjteN1p+5Xzg9TUunBKXKnwcpqn9jykUi0KWsWWiiyUsVLf+HszZc7bOnfiOHTlnPvR 0SRn/w13TM1uP8W/OakmOul0qLjL7EqJYs6Tg6NhcfFhAyYSUkjzbHxhNlp03nKK81msv2E0088R xYzXaWDRT392Zcu+tSytjLBpfZkvY/KZGT8V/y8/g8uXJGxRZJROwB/NCMkjaOQsWOQxIX3jne3M VzyxaHLovaFH3l0waGU5P80aOZ8aXxvTxuWjFiVpTHvkuqSX7FpZ9CWIvdRoTgmg+gJCYyQ4cHGg 488ZnP0PHseZBxUfqcnOVuxh0R4XaxqI9Ch2HDFNNjtZjNKyKakjU8zodkxUoTMHkLU0JZI4MHgj VQLnPc8D65c9Oa2fRg9qHPn3jXOUwwZa51lxdCRkZGMOhJGZff3LF7/mIvkmxL2fyNPur0L6mvkX FDpsbiIE24uSSySG00zqcs9X3NsqqqqpVUqq8oLh4c3g5fmeLHvd7vuU2ZNUHk4exEuesynRFBgX Auo/BbmJH1Ht6Q1ulZmqcoTazN+txcVzsYcEhRqD7JNTF6sJ8mu50aE1szSiUecNbg8w1FRRHXNr XlnWt2O76N0R446bT9UZ3IneDZHVEhohUHkCzQWO49ZX0e33/KddpPaWcqVgfFlnUWUlWQHXV/Yo PWh3xb0ZsrHYrkNpKzgngFWdUld4KZdy9x6sUCknr18K5GKumT+jyAoIEjo4WE9ATEaoND3RusZp y90ggqjj1IFh53mQb72rZzQ7NF1/Z8qcg9i/samCLyHy+ToDLJxIYeTO17XsHNxeMHdBonZV9UqR aqVLVXbDvjsElmxExkWTU82pr2+EDuqCu+58+uJGx3PgnrT36+PKT1zKfbaJOST+w96RkobmTz+Z xxmuSmgu3Ya7y/563JZ13PXss2RIaClnz/AH9Y402DL+O8A8tI7/3CIvrQINV6d8rkakxlFfcuOy p7tGFlRLFesoWgwsSxJvD0PThjqWtXzsG29ZvmrRKr0+BsRdFx4mhuPXKDGXySLFSG+RLvNSb0XP EPaO4nPdEqhhEnZcmlEU/XMDl9NabT4cKV7nn9/wn2/DvV2Pf3zej5tSmp4ExXKV6t7NpyYtbT2K XFDBQ+hK+R5eFzudg0n9qr56YMyL6Ko8dg4ybSfe7KSMF+7N6aceuIxbvV+uDU+IKiakPbgj6Nax 7zgxOioyN7OXOyXnYckce17R9H2qbSpRQqqqUqhSlCqV6VaUphKJpKIqXhaLX1OuRHefRGGmU+sy 0Zd26b5/ohnPkuWk1Imie5fsfVtc316j0mDCxffDro5y8tV6Ir/2hpLxR6P3XRKopgmw1lPsvqSv 0P6mss9QSoXsS5h2LRs0ecvEnrN8t9Vp92pRVHvIk9jFlM01S+EOxOkNFQ3XzqWXC9eKF8wMSD8I hZ67B7jQ0GvDekbZlOEmM0eE80D2vlSoYs5qKG8IEHsQSpG25EK8cS/H5jRz6W+qD0+Dq53lSyo1 yug+umfVw3P6LvufM5Hcamp8to5yUiilQlWPvGxO5Qr0iSzorMe0Ro846dDzL417LoP5eT0T0wgr CZH2nyPybEYHUnSaOXGpG41wePjFzDejbkXams8ifDhEh3Imue03w7nYDcTyybSqd0+8RZDYjQHu c4k7MjSmBySh/1VVfMohNUy/uVElUGa5qT1dc7agv+Us74SKg+GCJaSS3uymuMT1xv/eb4QuXfQu lmspXfEaGR1fILv1zmyaqzg7ZJeWkzheweK2Guq70SOCbJ7yXHfHXN0dtrOEj3hv+2/dBtmUhcPZ kiexzgznmYNxZs0sGo1RDEUnIGCLAzwQp2OZXJLZpJ0qik7rxqhzJwXmiYgZBJBN0iwFwaJTQSI9 S4C+C5LCQyhChtg6/tfCzFFaZWxORbCGV786mNL0S+0n7yoQs2yeDDXdfFes8sEk0Guiyu0JgY05 ViAOpe4UQthgboqy2PeB4GppfgDTvGdSRmqEtaXS6JZUJROaUdU8Y+3zk/+VC3tbpU8KTDU85pM8 gV83bIl9v0nHrMEPvPO9+AJhkN1BLly3YXJqY75BRQ+U0S+fnZkXYe0JFIlpH8TNIZjZgSvF59FS pdbVXTQh0UjpF86p05qtjVR1nGOueeLVZFjTEbD2ODzbI7ozQcOpPctBUJRUTW/hUjUmyIpMNB8O K9rJzkRPI9JTKYUwP0TMavvBrYm0ul5D3kv5I1hqg8He1T7TA09hDQ+Ivxqo+q1VLQsLku/bHpJb SFRrUSoVokJO9PVn3viWcoxWTRdLKk7uSom0LfquifNry+cSHg0dttSSLp+ZF61SpRpLRGhwnEsK cZldtrmenCOMMllj85lKadjbQcgO4A7RiO9C/SdCCCDmpmXDbiPSOZiIZAxjGaE4lw0NDUEKFA1B KBza3cRYkUjfUUo2y7gDVvmcspuIcJ9I0E7dJ6hsW2e87ZLLDZPLnbw8baKxizKl2VS1R41vFTWn 6Tanw2NWPUNkHlNpwkncXx+Mx86j805MfGolVVRVd0GeK0ck099S9huLpURgUYYwcYN7pUqolUqo zg1YKKSLdPQF8eUHkpZ3oOaHE/TwtLpvqQmqKF0SzXFUiaRYdSJhIdlhFJEpCtXRMNyVC7h+9F1s 1gh7/+76Vvi/DC5ZID00RPMh0HcJopC9JIpQSHRDLUZ3zlFI9p9J8zuJrZ0ZjPItBvRlEYoNowkY 1DRtUqVUvRgVI3X4qk3aKqqKabKyto7yxL1+PPzQ74mcksLjlJolWQXndGoyiVfIjt03VdIXUk8m Bft00Oza0d40slOUtxUtIqrbCniT3TOM91RFUtIjKkTYT9z7I7nZD6zDsmjoqqutLRVTquhOJYG/ ubE23HQPsccQ63ufKBXTxm9Flb9EflGYn98lSQ4RWx3yaBN35L3L4PzxE3cpvZGiZyo/hTnqRUTO 4hdHFcNEdTKnInRnvrhXN+qT9k1P0bUxMzpdYpUSKthNUkdxPojc2F8SdHgmryB9JxRwnNuZ1xm+ D84Lo9tUeBloDrO2YSTlijtMzHDGK8AepOU606Sjf6/Ms0ROydSdAwS0hOwl61M9h5Pl0vlNSYmJ daxU2T5ydV3PwxqN81YoKcI5lTQ+EtPWZnDTHKe8uS8O2NWmNjjIXz3g4mRZ/+LuSKcKEhvBmnNg