# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110605170151-eo9khhhrzf9op05z # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 8e35b4402134d867da5783028730aa5fcc0b1b95 # timestamp: 2011-06-05 20:02:05 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110530100507-\ # 4f5mbtdvz6yzct14 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQhR6MEAEbv/gH9yCSh///// /+//6r////5gIp9zdH3vN9yuA8PtsipOvrnede+vt92Nx22g1IffY7u9u3ebZ5GnvZu+G+n1K+te 2KqutpnbTqbTY7rNax60ktYEvY09Rq1WINtq9xviN61s+nu9fR66pDQQI0TAaRoTEapsk2pspmo9 T0mTagaAaADQZA9T1BKBAEJoJMAptUPU8SaAABoAAAAABoDTIEKTSeobVP0k0ABkZBoaA0AANAAG mgHqBJpSaQmmkwkRvJ6gU/UQ3qmRoMgaeo9TR6h6gAAGTQ9QIpCAJoCYQATKbRlU/Tap6j0aNU9M kenqn6nqaJ6gBhGRphIkEAjQmBJk0aaaMmKU9kU/VN5UbKGj1A2po2oAaB+oaUkvxYAjvPP+mF1s j90Ikz29vsdHEbP55+3w8LZy8C6vP5tg+7dx8cHquHiE4iO46PdIH/OhdI8nZ7EDRMoEi0VFwXKK jhzTMjnMQ79dxMQHnsQoMMgSD6tPaKvUufDGTk/u1+pNC9VXt3YuD1MMFOnCeamy9h6mwZObbf5c pTQfLtkuZdfLfxsaSxQLu31tGrll7zyg36WOOE1i8WyjPS+MZf4w2ee9uGX7wuGaoYH6emBSOAef cqgcbsLnjacZQATSes9GXWxitNqwF8MVZi/h45OjE51F9yEIzzKiyUksHDC9Wio9c3m4qxGHrmFs nsERyCBpSiGePv63Cd/VOe/N6cwZQTg3zVuhG6Bb8JKEQ3QLjCgmxFGLz3ECTfCJ3AN91t+qcsIM 3pkZRWdXCiZuHcLNh5MTusw6gYzA228ZnUCLhZcHWlgTNxAxgxeHcI0S4xVTdPPDc88ezb3J3PPj 74YKt3n5efjqFQC4QP4wA3QDzwiThAKRCe41CcqqpYG/BKg/PpvQm1NMWWrBfKAF67A9nto9G2le lj/H8iPRvfn92r9jggvwIOd5y/9ktVsabj2Tmbp8DZS3IauN2MLOv3xFRWviwbbXlIcvvSHfkGRR QWKQigKBFkFiG0DY2G6SLGzxgOhIF2dfZyi/t7Zx227a0v/peHhrLbIKyQoy4c11GgVDcVv1dpIl 8RUYGXNi8VgxqdBgMVcXmcVEZU5d7xh5FKiC5KqVRwZNyVpKksFEOTCjCGSiTMu4OmYVJjJEkZlQ ZdRaGKd7NwmJzKkwXyGWpSLXqHpIkkSYOiE6oh8oCzcU90nNJUcBpetHIrBbQIWAENGpTnNrBOU1 XTwtPWaWRN1ebeyKIcgE6LkVGriCoMaxelYRs67fADG7sW4atAPgYhgwTdQU1a9hLkQGfaHc+4ae 69Xc29a6Z178AOgxyX11+ExPcN0ljPztRg1HOdcP+c+ZMFhPNaxHI+ZAAbA3ni4pnZhAiGb2X3+B zqe8I88ZdAZpZbhY97bjt5hUIi2Nqw5ksxZ7W59rIHVtSimtgnH3Oo23iZ5NVVwW5ovnBPmOwud4 4VOj048+OxoFuNU0DpWe2mR8dClpEqG52VYC2+BWM1XE8xQ6CeKCW3zVNHo3HHgidbWvv4SoRx1Y IpsH0nr14XAIKZQslbLo1vV/TbMcmHOMWNYpnc3GKAms9+dJFM1x1W3av/O1vDNLjN4d7v6naTow u1HnPlZZjS1W373j5/IV9ORZUOJ7u+ZNtz1963VSWRrS34MaZaGse1NELWUds7T7aXGeoHc7xTC2 aNKq4bXaN0LdwcDngWz1pxgIEu9nsPgM56azYaZKHmFOxk9AxFwTXdd34SMdN79Fm+mynqIhOWIY eg67yt70lDzZxjO1agtbE1tqNlqqzhp9k6uKUV+CIVjvzbZjfDWl03n43xvHD21+LmrY3KKYta1z IpTsJmN9F4BX1Ru8Wce60V0VAzTOytgYL2MbR5c2lRfR9ROoe+lDzSyoz4146yizalB31XrmZ+DJ QNOoRChY6L+fMYo9eDeXCixxme5G9kibV9tuffpxvZ3LUmBfjBAeZi65o1Nc7u2oruU3rCV2upoo Dt6yxBsV/BmoAtwQpQp/mYhMJ91mppZrLiekVihYZnQGlwrZnugbDwxrLuxsrdqydhhkLQjzMONx HxlZ5WDG2Npf4A2CMwZeIdXWnkLm8s+FfWzr2tRmOfOAgaDMeUdZmfKYQ6PtUvpOrj12yr1G7P2C GG4kAH64EPW8/GvtAhA4YbJGOQwN5ODjLyEaIoZM342u6h5hGNsgfGUTDbzZfD4Gem1i0lhKk2nI mqk3GbbX67tKaT22qe3eCoRmwzyO6UpFJ/N/BAY9/kWWxIqZGSSpEZH/EzDsmbPD/U+6cJkvyvgJ YffppLceEKT3neXSVyaOAMGB10zl2IaWQOx2XWdxfl8+bF0FajdYT+DSZ172oy3i+UohaT7Mzu9y tlnaKM6qjn0mHOuPVYDcR2++6fIUf4NS4O8nCZE3elH1IAkybc8sLeD4NDeJA9dGkKmUwYE4bJ1f TZ+Gh3ap8jFhbc7vgblZeYet2CSS3VYsuYF2+ho5nsZNHzn3MCh9bddYu8+oX6XxdJn3bcZbAg8x 3FHNhaFhpPNYdaVzOKBfdh6s0Mde4OcND62H7B7RHy0WnPIt1/ucy+0a8HMHH0eb25rQbuCdrpZE 87h38Ds2RtPj9/e87jq7rtRxukDSn2UN7V9+ex4+XZNHbzWMswDcEIUCFwyyxbwnA4fipiEnEvFI +1AeYPf8O+R9jQ5wH6m4gSx26kjPiSHvmRqoSiIJ+E1kzd33Rv5emO6mSp6YCkIFbAmWE9lBYTa7 WQyhoyBhkPvs13Zx74xZtHPnN8DZIbwixJpt2cgyGSb4CawNJYELM2bCEx0G40y6YjtYzwl2pJk0 44IqOclL6i4pLYRbSFXFANTEKRgpJFwngecQSc40RRBKpZzQnrO80QolYqk4cGIIHVsm1x6mlkD5 UIGxawyIyomcJhLHAFNTI5mdtSxwueswwghRUEnqwMqLo1SLxScnhtMSiqu9581tbkI44zPK9SIQ PjMaTQxZhWE2FJTgQnHYw4GqUp1QIagKrNZZToymXgSlfhapkLlsFRGTkKl5gqkmX3c+jpjqtKbX uFzjD5TKcvHSazcW6NUzQjSd47BeHFhyqZ7bZZxHEZYxqtgakmNax2RQbkmwgnSdh6J2FZP24LUM Tp7NLJG1XLChhAbShgqY5ohBwOwcqVOaIWKGRjtK6hB3aJVBColUzfU2QKCoGyjarl0hQpLPOSk1 Oc7vOmIpFnvKlLYKjotS0AAUSVgURfZgjFiqXKKQX0Kz0xdJsJaolDQkl8HpRnxYqhzzUhzpcSpy gJs+tM8xkKENrIZrV+ZJZKsIszfWVDSjrKr2GQgyvibE8wiMoXMMhvDuy5uxik+Oy7GtRKRdxPwU jIxyORUoTKFhzLrWCYmlRe8XwXFUWkWtOsAXPBA4zIV8UlSTKcz69zlFrq13ssXkRELeCibUxYnJ EIGFBXRks4y3QGcVJunRysyadbVKlRfcFgwKZLkaxKg0LCop4kxpUtPUTtJOxYeJPoltrBaZLz3I JI1C+NT5O9c0QpNhO5yo7WvszaKdpxOBNEgkG4tF4UUDM0PCcWRFs26S2ESFsLMCaV4pMCe5MQlK WwJRg9Cq3GnkY1dW2/EzYM5mMwt2qBGW3jiGhCBJQZZchqdKaHorUiQoUEUPPBqTJIG02dqiqKiZ VOzuYOItC2vG1jZawi9lCxTSaHqxXXkJW5VusXVU3LMZKsmgtRTjfXRIkYaTHQndppzLKjWNz/R7 hv1wyHpOYFbXIt2Go9RkULV96mdqoIi0TiIIZZYhc5EICA09pFrLaXGWRSECmKwsgQlZx4KPQL9P hWzAXKS8PmniBMDMzDWEgGS5RoMG6pCQwI7aBgXGtqS3Y11c7UgVc/SucxqqyE1AJNg0CAsL7eJx gE6+7Uki7hPrd4SqkIivNGCgG1AusyGcFmgupyLEyI3XCXNhcYkya2meyfBWmpfM3yfFrdjyKcrQ 0NT6HJBoxqvIZGmvKmmDPLiVEY2KMoPjfb5nRyGpkabDVaDBkuAuGjQIaJPRUtQVJfQEeWWte5Yu namMJuBWUifUrC5pgmKQg/oR/XE9zqRzhwJF+BYjsKTJxbfw1FkU0lqKZWI7CovrOQxcSRmNBPsc 5hrep72i8uwuetQtLfudCTz+Tn4cmJnpGafgN6zUTFB3nUnZLMMNSSAwgjpMbmamIv0tjoVNOZid lNnFINF0TxRIxrVdSIpu+GxoaTLHb5WlkW22i44F6iFI1Zyi3bSnZXQ4qgYv0pa9KaJ5mtO3AKoO JEOWbVoTlupw4ETNOQKpISGIeQdfkLwIby2FyFUWRVFaW8q2yTGtUt0uDscuZKXKT6PfdL0sy3JF R4uUJPBghayO3wgreTjVGwtXGHHGIF4DnpHcemlSTHqlEaegd0hmyqSUHFxKXXO53Vgg1JTNSxIc Yocipe3GNBHnHDzQ2yVdu+wPd4S1mkHFzFydgDS1WbTSEmThlgSaUDgZkXMznZWw5PwFvZpzzYZL ZJziUXGLIHizFC1JsVQLxfWlDUzV1htzYqObxs5zXjdFC4vNRaWEdQhMQvRwx+H2FQpM7Z/nNOrO vqbgIAwiEuPnnQ4FfMpdqJAUvqeJGnXOH5c2R0ftRCLSGtaQI4JSlovDIJREGa7l37JYSQIuGsWL YlKV7yqVESHMM3r+qc0TRfSqd/Fg7WjuGfeO1ucUT+jteL44fKR+LLeMHl6oxPa4rqh4TUdQvan6 lEHwuM9kBvUfvNocEgfCOD4r06k7j+hahEFbbZe847U3cLXk2ydoqqs6pDv2YKigqiQN22SH1PNI dmHupZ76EAofyfcOWSBQPjh8vrYfTAPRp6Uydys6TjIoMBRuztkDx4nkYF5UXOA8/xX4m303TSlu d32A3n/F9Hkxg9GoPnQOaqArK76YBtyNTAy/rSPyk+awIokAGn9HhfOOwBH1wIghETabHDHR6bEL AuwXpIwLQmF30QzrejRpJAPGMRs+5uUKXCE7yxgufYkZJFl4i0vd/BVHXrdbr0l657A0hrpHVnmA MWzLJwy1zWICL65Q6eWyunAW1AzLrLYgggwmVP+GIkyqCeaN6AnkgHyqJQG4MI3s3kKTnsJ7ECWq +Ry8XAvMrglB1qmm69S+EqyDVmX8dQhYE1KywXVdeE7qojkheuEnA1kZrvb+PhzoD9vz06c5tJS2 sY20Nlb4kIlCLfze9YyGH4CTZ+uiel8UlX97+WSTbD9QUqI/AqkHlS4krUHAMPMIsiQn0X0BQsTy DsaKIlpCGEQrgK1IWoKsMSFKjalS3sw+Nqsio/VcUGgP4SiuQ7mZogVRaPmIpUmEFS1WBqnqCc6g SiZ4CxxjQTsnJTGUlISwowk3AvhEEGMSIZMTXMyUpzhshmWaXULUYmpEgG5JKITZGYywsWpFPMGb S1KeZ+BmY6QGD+86/D7ywxf2Pe/E+wxfiZGrRUczdTQQHyvtJGRdI27yYibeERwTjLzbt0l0uFi1 nyOB8iZhj7+aYhnFh2GHyAvcZvp+HP+w7CRJkSyggPy5heRvvitl1QIELLrqW3kNqdRSPi0vlqMb g3gv6DnBhSX15mpjA9DAdLukUMxg2Zryh3V9QpuIgnCBWguC23Lbtr8mEU0F2lg2WHUz/rUaZ9Fe I0ZLFtFrIB+qp012XT7nOwnNgTL2CiSCmlSss9Vls32qpKiRRCDXlPEaEjPFWhIWDEDfdl3+Ele7 lO4o4HyNZYVm8sPOWFq/gUfEqJl54XOBj09LHYnAg94kBMweCDiodQYHzyHMJT2JSwe1xCtsKB9X 8zc/4tE88V5GCnrefY8Gxdb1vlf2CEl+27zxWleAcapdSkCwqaVWDeznIg956Ch9Z5I5BQ5nYalt vNPM0JmhxOaWRgXfiYKDpNRDbulxHzGJ+sAg9JAeOCsUzUajQdGr1sYPLI3nQcTRtvWh2S8xGE6c TnyDJp7/ztb20P3lEsgxL2WyWalK6kEgOEH7epqC940Eq8I3RRJSJEZQyYugcHa6m1nnDLuUmSCP CttJrpg8ItYOdJ3CFSKJgxQ3arcofBQKyerZQXiQlcrKxSbaY4FFq6EiCVZkzpOfZy6ihevSWnNr KJI6STeQUM6NlpnKi4vJuuFzI+a6sxH1zrckhqrTYEuRedRw8hD2qBDLD6i4tKnTibCYzsJSOSgJ 961GrJetazBGPXZo8J7tBSVzqZryBHzREIc9iMFUHkJjKK6qMSAQ35snCk4H6khojvO7LbKrjnJP yzo11mXlhfLrwd2FtYItsidrGMsXVGdEGEvml7VTqbL3JVsyqWVhcywrtEniVZJhiVr4fe5l6w02 RQl68OThLLohiHviEdUqBG9weoPzbe47TgdO2ZZ5jzB4DvKzrLiVZaWFNpS9dbW5kPNUMios8/Qa yhU1lmkzNJLe+SRuU1HLAGiCXUzd4pwtFmSZMlkWwKy2pzakkWARDwNx4gbCEqxLItUmzhoPNVcX 5c8oYpIV+MR6dr10kFSKDrK7klCbUk2WNSWtFZuAwdLk1Ia4EqjoS67rbArHG99+o0pXqNxZzIkA i+NBPbjyePbGwSvR82wTR6woGvxSQTy7F46unhrHZdPJHJhEygdthn0WyZMqZIhZrpvqVYpFORkM YsAqtkGFO8Nmw2Rnt86HNL8CwsIS5Gw7xHhcEy2CNHx2RyHZRvOgXNxS+Yl3d/D65m50szimKzRC Cgsznva6EDxsrKNWjGFtHxKlTA/TxDCgYa0cD9WhJGi+4YRbAo5JtMdJ5+ox7Oie6m43eBr0Sq8r S0kKF5gTqJ5mIVpK+YSskyr8i4a2IGiUy33TofOwm/DSvnv4dLI/3cPqISIEDaEzsvAPYedvebtl itIdrSYTZMyQvw5vRx8Hr7wnVBVAVZ9XW90ERL7RnkWpeBrheKRQtFBUsqWn2EdYhOpuzq4nsPL1 l53Hs9lttKzsMcwN5o1zyLJmbl2o+lYT3qaOhSFLkeUIe59nlpXF61SsSwIP7YLqEuD6nAztMIHp 4jxnfslpw1va5F8IMQkQAQwlYQkjnLgJ2TVDiBAICA8BcpQIgBwMHfy6OnmwHN2HHMG5MEmbBexd 9cJ6oA3JEBnviJCzY4n8jIMNiTX7O338oTF0xCHDiXxUwaCc0joVKBNgNLkmRiTkQq/bA7qlLmCY c0RCQ+Z8hHARmH/dQ1polm8nEKi0R4PzHaKDo5r1kTB/OG0ATSQNDmXqkxGeKp2YwRFJeSfn+AeU Szt5+0MuR6RjQz0P8HHJQHWxJaoyPcPRkPmMe+HwiCIhNSN9bKOK3aj7ulp/u7gyUtgQL92toWrf ILnNODuY8Yrh6IHTCzVDjTcGXIbEj1LG+4LhK2DQuhhdWfIqDYjnPa4Lufbj8sU26xSzEajgpQDw kCODH47oBkCvk9s+g4qCA8wCZ8jDlvt4m1FZno9w008hgpLj8O7on36i0MwRuabIBgfY7k3mRzJ1 4LEEQkPRrCcjzRqgijZkFos1sc3KcUzp3c9Emt4yk313f06kaFduwxCGCMG4L+J7XZL9PNweg/Ge czIyPrex0v0O3wdTk8vLw3PE6n0FhjJ3hyP/80qPY535/mua6xwWEQefw94ja9OqIY4AJrFvwvTj SaktbyQ1aIC2IiCuWhZ6IJsGiRIo/Sof2PUHssyBLm2p8bEklsIgvYQiQwAhenHYjYdrPj0qJNah Hlm00NgmDaSavAWk2Lx4gHT9QRpQIaAGByHqta7SSBcGuApMiOwOh0W2G1/WdCo5U4WN/LSCf5XR EBzaAYVc9Q4joAqskMC7lqNuhgZhiNT/khfdEKJAjiVC9q5jV6zW1UU+hRtCsfEqGdSgWP2CuDXO 6LAZscpzBkkhD8lBkfWnNnAjuUiYwJofpVxV2dqR7lgYsmm2kSkpaclqdBByd0nqBtsi0MmKwJse d2r0VuQiaVt6uZeCvqORYlBHWvOG0u5n/2wPi3JQDQzzsjtUegY1gvcpLxF5tSO/QGstB6tcSCOq gmHiX9mmhiXW4wYwa0pjLhmDKMQrKOY+5ek6lJCqAJ0IOmRmWD1oaR9QWO+1KXgw5d2muIaNhTEL gylPbpNckjZzYlh3MkDWcNNVYql0RLZN86M0OhzIE1SGiQYkhS2Hgmb5FMpASw3uo8E5LCEk77Eh vqhD0Pw+2Zsipf0PEuOrGRPOygiEiYuhFirIoCgDGQWQRBWFLiIJoSWIQSwtoUSDtTsFdcS7ZJK+ c1rHMNT1L1pYiFYExGUWA1IGu87tLINJLIkBmDpyTwcsRswKm4A44z6cUPxhSIYIVLfpS8UA9iUl VKTINi+UIbzARDJgz9bEbBc0DnhElMg0G/JLysK01di1F60Yrzlf5hImBm/2SzHPELo4BMDGh4YE MEnUYmTbIfqz0J8HnRiAiiIMgKpJFYkRiMMbIcwZ3QetOfAoKH0ZskPQPA4UP23nPjpFTg0tJrkQ TiG23MPc72OTskRlIGJT9tE6Yg/9hZV2JAjmzgBs+h53De3Klhaa/MLygZvVRSEaMokpYJISwH1O TkUsPZgd6728sLuAg4BmaB9qmB/T0e2dhWmcZkHrz8kEBkBYtRWGuZKgZipn7zHXO+3F4PS8b1PU vS7xorjgTWfISMUwj1LpWhKRvzOYk98GIxtsbAVfFQoiQxjGIxkWAm60KWVFAMIUCdUJISgSfVJB JQLQU1joKH3uZQfSEckyRVQhXTcDnGXS94YRuazwVmeJTwASErH+UnnyuIyQaF9+eYe7XjbR93+E vj1cMqLn+yAV3UmGziQ835iQST+1bRG1CBNGN51iZp7VFwMMq9DFB9ba2FyL51YAQtzAqy5CvIrg F6yJEwGx2w8RPKXB6wHEkhwmgaT4Q/D2N8EtHDXEtstXFq21cS5B7A6Z3h7ucDRmGENGmExgMEVx 5YXlNqJ5Q3swKhpJ7UeqG1pDuT1TSImMWsQojuyrWZJHq9ZYSSpffZJ6S7ow5ErkfFRccxdyktoc HpTOEqIyyGXKxEBxO0YV6pxd6iBcTGXGMQomIE7XINrqJPhiCZoYDmKdcUOx3t2Q1NmxNC07pMAc UmA0W0xqUCUDEMTJMVgSChzWhpBNH9pIv0ni7h1srwbfNJHUQp1uKtsrjNgy0sQc7VqRbJRYCun9 0rW7bhLQbBsuBWNGaRrZRbVlRph18LD2h5092d+ZOaAzpZxkPC7bbbbbbbbZSm4Lik1jvIDaHFCM JH3SUkYcTJ2kA0k6moxCNd/QisIiqgiLAxiGwm8CKDUCTJ4xjII3vSrFO6YWtlVFLwhepV9h5t0p r4PFqck8SOvnTpdych02tpYXFDx8t2vbYVlUXxVhSVAhS5kyu0MhJ6mHJSZzPW+9mhRl98SS6B4Z RQKCCRoTmSmNoaKCRNTTTQ2NtgyxbTQVKILSIQg14LrSLVJVZEsqYSSYdAdKrZvGISOI4SDeUhTQ 1JQclB66yKGTi6F1pc4ZBASwNUCRPoVb0K1IorA80d3VC72A2B4tI35/6bpTuatr+hLGuw0G6V4w nMEeIORmxdYSjl3zmZcLip3BYwQE7unPhoDA7e9m3GZU2Qh3QPfDvCFqHESECND6HNA8Idm3br07 pQhei83RbyPkdmVcqGkkDCFRsaqJJMwoR9LbTBxw4j73O7V0vSkBp8LAyRKS6iHoMG5BaSW8sthG 4UOBbOYu5uKoIU1ZPGRDQG2YzRORmThAqiIFJB+7kCXGXJra1lPNc7kmVYzRD5wuM/lI4EXFpcyk vom8S7B5niHlGHbfU8ZsjAhFJSI2Fh8IRTewVXDKRXB4OdYUL4RAkzYi6OR+Y4pFVeM+VT6H23ya /jnLwZxHa4uFDvgDo6DKcmHGAv3sm2uJI4ePnmdadcQwiwGlIFFSUTkMWYQ7J82cZvPROyaBreTm axSD6m1lM72tufgdj2DWK9TkmTHbGTYhcVwdeDA6oTnBRXhNSa6zQxEyoJXqN/IQRXretORDANJ+ nJ8XmE5WvWp2i8YwprwcFNA6+N1NjufWpQHbSRtjAR3tXudjWTyCT1BHuSGGLJxT/4u5IpwoSAQo 9GCA