# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110324102159-\ # bye4df0rvnj6ysrg # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # testament_sha1: 97d5377d17c4523a2dd2bb0315b0e6dd67c39f02 # timestamp: 2011-03-24 11:22:03 +0100 # source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # base_revision_id: guilhem.bichot@oracle.com-20110322100827-\ # zl5sbwvbyz3xgs0h # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWHHFmYAFCP/gH9/9Yp5//// f//+/v////5gHP0z4ZDkQpc21btwDiodBuyQKoi7NKQOtA0KAAaDRtqAAFCgoIgAUFAoCgKBRQlT QmVHkzUp7RH6qfoTUeoHpBvSmCHpGgAAGIB6jQyBpoBKIEZAZCAiepPRqG0m1AB6hiNAAAAAAAek HGho0aDRoGgAAAAAZAAAAGgMgAMEiTSASeqJsEajTHkoabTCmIaaZA0ANNGmjIyBoyAyHGho0aDR oGgAAAAAZAAAAGgMgAMCpIgICABMmgCNAT0RpMTE0ynhM1Tw1TaRkeoaYQyepvG2hBqaQm9QmhMB gJjEkvMe8d08Z1ys9xpHoMY8ecI4abxlMpMSBWQ6NnYNYzViraYE6TNigt9PJUTUx2aJ6BiWkEZQ vIxY2RSxgIvfoim6lSbpSzLVb34Narw7gfWcWGJMTXYI9TjPllD9Y8JDhODIiXCbP+bVM70ygdl0 q6MC30pXEhRRRLzuiiF4iLV8nJxNFMY35amhRkyKTezbGKZJRMVKUuYFGdxiUkoZmTJmzetmZqSk pmzLJkyM0p6NmzVmilKSkUopRbFNF2hZZGJSWUpRMCyylTf31M/SKVn2WcDzB+GWC7HQpXKYYPqk vJEhcHiI4sDr7JpHYrQKhMY5Wg7+y4vsUwxLREWN5fN5yNgU+CEdE8IyA1ZzJSPZURyVwpwrfSTH jRTgy25Z5b8MtKyz1yZ63Y21Z4Vxx3tNNnfrl7NvC8UnLgzvCTuqATDw+D5fk7siXKS1SSSIfA1Q +GhZt/xmGA21OSiJpUSRv8tiRqqQUpM6GFBPEwQKGCbQsRWwggTBPU41PCkA2hsY2202RqoLUICr EeoUIEi7ftg9az6XvGyYuoUz2i6To987vZGd8Ux5f5CpzfQlJSlKb1N6kpvWG5i+VuYF1FKP+3/X lo/icqbNOSuv5zxKFFCkopEpafSP8x7gY2m02xpsG2xBn5EBhPndzliaSXQg4am++g96IsqQXGFp Rw5IIYO4FMDgfC5YWtG/ccJMX42TjgBM1rWku/vBupBcTVtvGoVSCbbb9HYujKpeHTSCy+x2szzg zeThmtESwiYyVX4IP9Emwn1EyTanfeMRShUyiyTtC8CwtJBdHpWEINWzydImjc7lxvF1/DTSWzuz Fn6Ixp5bnr283GusWmetC5SHagRtQeIF/ZcawLKuvve3wdO1rWOGHQe+BpyVo8kVhq0xlKZpjSnX pamnjN7aNKr7YLhZAHwhYzQmw83XdXV5djmqVAmesAYAxXFFO55XAxjUTMsoswffqV5HusHtM/0S 1rrCqorpdkLK2myC10cAK5FJRaDWWbeJ1ps7D6+QZOwKabcsU+keOOW3O27jzWVV1MZneZeFuke2 KS1t2JeBsLC0XI3zb/jzZbly7Wxi6pZBs1KD2I0epPZbbhTViy8u65wackOvSLxl0+q/parU+7y6 rojwQYNsALB4uZtey/RDWrfXgNhesc3Sk6DGVB0WF5sTV8vTtfkKyI3RKm5oPP6qjM0ekWkSRGMX iFzuIRNXHh0n5UATkmcIBOLICGmYSUKyxkoXPqubVoWL7g2YCkBTzxV7Cl+gG3LzKPHYawT0MTWc wpoJMlPW6S6nB2sXS/Gu71PIus5WDi+aT+KpSp/FZSlnQ3o73vLJSOKSWfeTpWKHMsopSyLKUZLE WYpmYF0XKTuYvKpgxWYmbLem1/F9j+1T8p+59jExUpZSznMmTJZTRkyZFmYyYslmi6M2ailFH6Uw hYXMJLjUyXatVllMmZdYsasWCxkmBg+tLtUmi6arIxTEsikpqTDcKPvxhD3Ucac1I+omc2DY6XUm znAtonECQGJNIPl1jvsolS6BaD4fxlE7nbxUhkjoF6541MRhSnIzpxIW6JMV87oHUFFwlg4GJRiE iYSr9jPKmmt1GxsvZXNXr3OxXOSogqT10Q66iG2k84/g60v+l/zYtO/qO6d87x64dMTEa5xxi6hB BIwJDb2qkjFSUpS7F4M2DNMUxYMlyyxMFLlzEuLmJY7dO3vWZFrX/2Tw3J3pjj8FeXXC1tJSfD5k fbW/MHhQP1B6H38d261rX/C+Uo5k/DJJ80fiZ8k1o5ajnTDOT7JPxL4LJHK+V+g05c7+AcMzDNVC 1emC7dcoeFtxKqsPKOhj2ffh4g5/M6qs4YPPfT9nO483lT1qfknsRBu8RTqpSkFVVKV2c3UJ1Wnn n20T8NHvqD8HxnXS733iJ8iknxYJH03xpVDdv4cR6B87r7Pg+DYifJUnsoL0mFFBr6rIeDWY5jNi Y6fd8zF5hkjdeQWM1bt1s1QmFLrKWkn5FCZFYl6wLa1aYWVrUngaxGwtjEcVAnWSJV4zRicxBywM w6Xgg/aLzhXkiFuN9zGuRO8KxtxiOX39q9YbT/ZgnQwhu2YSTy0HOwKRqfo/XdoRlkpcZSSdtscG xk47L3+h3fE/T/dv/OrfIOOvcvEY4FlY06g4u2jEYVIoKqvN2USDqbX+LqiSwVmJMzEHoF5CG6yj fIMRmZVaNVwIZEm2K82FhS+FM89O1TqZbcct+Bp25KYvlx7xxznW4YugdDvPUidnQ6FweBQlFKWW B6GrQaup19eLXNs0Fs1c84vS+V5cueK3s6c9so8MLDoZk4tK6pIU2O20xMSzB0zd5FptzYkVLu7s vhpibO9ra7sZyZqVLkZ9jDK/M6GFLrKUqndVY6MLGa3J2ZvJhI7e55ClHWp2KWWBANZcTFKTN5M6 TVQ6DM1IcEjlffXoLVv474PMhZpS1NNXKO7Jpdd51vCkXURxa53NozejmhZoVjxyGoxr2+7ZDAXY UniMj0DDQxOSsm1jLTmeEeBsczGPoyVNrqU6nfHO9EfQxeR/M9bbu7eE7dOfJlfhbj4MpHMomj8y WZbZiPVToYTtFaEa9jv3RbZjk1m+k3TBwU6q1Ucl9d3s0kS0pySbEfFWl5cNTUgcWJMrHHUkNrKD xEJzoYHWQ5E69x2iaU0Q1MZkybLx4nKoUFQTeJCI41jGpVSkGttSgZilZYZniIMe7GBaysHOXw7Y ayMd06dGG9gLY3z2buhoRSZPQ7n6257WjRd07nm/mZhiL1ZxyQthZLk9qFBIuNyRue0SYWy8MjGZ b4yks5Vpxax5IhDEWvcyBAeW2F1ZvkkRtY3rUM78wVAzqTAgGQ64iSGIdUENCA4jMYxLZSVjW0e1 7OTfjl0DUyqQyMMhy6zUwdUtfc9kW2+PY2ukwskVmRi28VxoVF4wUmUU1mRXLYPNxUIYSEIETBTm LuHVodUcVDhjjGb888HuVi5l8L255BylZU2MS1qi9RY3tb7ntWz73YptyY9LLjyNim2ratY6LZil Vc6yT9V3MpusMzJHC3GhkPxLm/CeAKUSKUzVtxna4ER5R7GiwHytLhdCszGpxqVmota2jRvY7htV 4aYcJvxl7Lut1udyKzcqsmDa1YqZT3MnF8E9Xn6EE897AnHf0j/P997zl6OPVxFsqLUjwZ3RWdYw 2SM9K/d+Ocqg/hzLL2tasFO0g+3Cv2f8loooUlRLZS5K63V9F7nLSiqqlPujz2VKlEqu8wc1u78A 3yHzeWJNJtFRGB+aT+UWJaH3Sf/Y/iUgqEH8lC9LjLZE2NDY7DwjOTTyJQB4QWin+rgp/Nxj2yUv N2I/kRyKcknBZ/u2R/0YodPjioheeqf7NCgHaWvJEHIFooxx30TBolyHF1RhFnMpUYJ+rdqTod0n YOAomH+Q5U3HMtJZMWN44EyWi0KZMHvjkH8V34pduX/O/wW3x/OOhZ7Dc4xsz5O1WC8nVJoLYScx OCco1Z4mMUpKjKxNZaT5VPbRy7Xa4KWaOlscWkf8ehZ6RyOtzx2pwb4zyitKf6PO8XamjGO1Tkjm bFqSmipHNJiI+E9/gpwLcDwnfO6EH7kHeCRSbArC44vn6YLlAt45o1PJ64+0+B55HkdiefXueLwj kPoPfB5CkuflWP1MJhPNP6DI/rSmZoLlo7JrGORqZnoS37sDaaUw1lhUVfUpcvKMqT7+B/CtsplK qkWkxiYsUtkaH6DFuKkTaMjLwIILAUmBlNbTtVKJYBMFL4ShJsTZqWk4HA4F1/2Wtsa5sNusn78z 9bFG5nNbkzCjRHKnEyi5ijOHFyKUuwYuGBwyw+tJiFJKU/I9J+QpgkpdgskGxIPvJJ7FJJSlKUpS lKSCn1BSSiT/JHFokYRR3T3/09qH9j9LL61nBd4/rYXa6/scrYyVTV4NAftyJuKHkRUM/K5X4A4O eEehrNEly/prtuD69ju22+vA/saNTjrI7N0/fP3E85+9LK4RzyYxmFhZlE0ka2GjXa5lNlWlIpUp NS851Ka2QY15qRYTg0eVMiSGDVSyYMvy02HH0VNkkwSpD+7FNqXCaKkj0D3M9/cOGOhXtHxeTYMN s8rmXXlZFJZTBgtL9Q6XBSlKU/g4jfp+ba2Lnb+X0EPc5Z5j2+j4VPat2PkZY6SeVZ6W1ioHr842 va6ni4lnreT2U73wvByFkznOwBzHUt2WmRkYKgIooFDwTE7MyBuoS4He+BvI7z+mRGs9ndNFJy97 xfZ0MW1k8XR4vNOh4tXS8XKdE5XVRK8w0b3jD0OSJJ5abDnI8pxdmHBMpvpHCUbHAmCmQ2sTyKl2 VS3TQNmnAFeFbilI2rKWLUkoWUp+K36llLrtshYluRXGfDtyilRKrkZWcH+x/D4dYUFySuOQYIQU YMGh65BSkMga9XVaHBKdgp2vQenn009LyeTN7G/cwYuCLvQ3I9DDi0gsJYLFLPP5BwbnFv+/Xf1a 61OZ1svjRwGLAqSTiRgsn2oaWdyoh2FE56wchtKGySqIFuOBEuDeR67qCGskruJrXrJaSOTjUsJl XSot1rCwEPnldtwKnDdjeSrB4Y63Y0v046Z560ntuxTiYClkWRdNlVUlZyAwYFDIkmiKFYCRrBy8 mmVACAoavLWHi3ru1TdZzvg+Ola6tbPtkbnzNsenyPOwVjvWWe8do4uXptJWMkdBUOgUkpRPIVeR Ou2ClKIxdLo7tbuV8jHGQ7Gr5bLSNMPtjBONq4eS9MF2rIyVPJW9RgKM1f1Uk8nz+DuzpimbWM1z 1UcnK6+x19elez/Wzpkns9/3PXzjslTi5H3bOGGwlhKPZH97HqaOaoU2G2c+CLxSURrJHST5GXpT HZLVNlr2LFKhwixPS1z8/e0RejJyWTNy20bV2bzKWOSuuqqfDS3utNGbNdNFmXPvnxZkdNG+G4qE L9xmN06JSa0XyVI487GSTMdLBDKDxkkibODglOYWoryjytpG5Z0sM5Pd2Odms39DH3PW0Pj8IOk2 m5yPa5HGGNc+bcwZw29rwj+0fMOAxKev2tr5HlqPCDJ9up/nkLPqx9CVPuejlZTh3Laa23tYjssL Kq1rSUjzfEvJLqOrE7nHBImLCwSpFQlkSpIxj0rZR4tm1T1PKbWfAeaO96vSH0SEw1cBziMBBlI2 UFYGikJB2XK5i0QkR8ItOyfZktLls6VZE232TyPcufF73i9qSYJ9b8LnS9GO5qwPM3z7i85jsMes envqcXnnd4wdhvF9219js+mn0MIc3JHs+iewTlHpYdDekm0f/Dnk99CvE9fVm+KRpPKkwoqPjvaO Ju5W/KS37Fr7LNw5kDIOXEyFJIzli2w3wK7RzPZ3NaVU7bU4nBOj3/H0cYJvkVJJrUSnL1TlxVNi rT3q8ZHQ8MpxeqfHUxiGPS9zXjJOL7J3MzEVJnUT8Ty85H02u6HJOV5lKUp1z7FoULdu96nGPB9V je8XyOXmj5nF5q/p5rEvFRzH8gWF4qFy4TDzZv4ZYTSyqlmPuwXwNCkKgdCAgY1hB+o49XgtxrWh AFqDiaR1TkEhu8y7qsqnx1H3rJPOnYfTPh8ZHzGnuZJol9JUlj3vF7FkPnhKOXoe5xer+3VzT2ak sKuidALhZOSJtrHsebnTIzGJnyy7BpduqfataStRLRljYMFDonReQ34Ohsc2nsjGNjgsOmdtSSWk yGWM6n9GrPMzT2jCbFJMa3SzeMi5B7Rfx3vYHHwNrRIClFoGV6MDBPBBbXQhhaZ+/lqqxQKTEvhY lh0mLIYMMphuB0UJjcsKDEDAYMkFAoBk7Za+AloYS5QtRRRRcqPRGDCKibBwF71wpVohnSKvIsJa 9LLL/2VAwYNIhSVcpWfl399o6PZTkrHKzOJGqURSRCtmVm7kItuitNtPWmjzx/U9Xp544Nq1WKiK SkM9slUpF11l4lSVUjsvefNPunwO/6fqUeqpL1FSUo3PNF7mRsZYHrdGh63L7L2wJ6nbOqSZz9vw CaTWSHxdJNiiG2oTCIWw0x7zJDJE/PxayHj5aVTzJoapR9zGqqjZ1zEVUVSUxUP/wNkj2pgb5D+f QJsNInI0neFpmTt7pX6rI52QwkyKw58NcpLfj8sc23CYnZFD2ebOnmCk2YPTFDZvP61v93zLO4zP dcUjufCpSoMbBnoxCaQMHLUA0ogDNBQRtIy30cjobWhrRKo8YmzUzeSdT36Mscr/eU8r4/01J2aR vMpQ6KcSKxeTnifbKSqg5n2thzNUWeeLRPyupd4k+06YySbOLllb5zUkVjZSdl5bfisj/h8zfz6q 6JkWsWKi4q0jZJIvIjZI+fYna32lQ7Vo+gr6KspJhSKYISUEEBE+XTSQYdkYQUsKDKCoLrO0qksR vTcfn5Tij3KkMHLKpUvu0RqpKxOayrDZIcrBipTJsayHYYsPKyS/m9NodfhI1ofOs4L8sJbl3aYH JMaTh+2ma742MyibosPRHR8DU00m6dm+LRjJ6JOgunW4+ec5vcZNkXS/omC6ErmtJFcQun4CMDC6 xZ1OZ6/uMta1wrmTqYFmL2LsTBZioVXhawm530o0UbuUUHyjRWsOLopcY2jEYAQUIG2rpoUmalpM K5r9R6mXNhmbBvJt2ZsWClKKZorneszdaOxUbT3ufn2c9JQpcN+BvTBuNiU2drrDMwrun7KyJ5tT GeeVM2xtTl5Hv1hsGfRMxT+9S/LI74/Dv0HF2I7cmByD6qqqqq4xha9WkjtiOqUcgra7bDAXxXLl Ihdi1euZTkfjfqsjajU5nTI9k1yxGwZZd03X4cKl/OvydYuwwezK7HJWYmVQWmsrbuvyRLc+bCtp ac0xAIEewOIS4yxWrZVlJvaWZLvHLLEwehzx1D/gkHrmbdNJajjqOXeWMpYs3C15mXXZjelQwCyO LBIPBsHFwR9zkWdB5knDg2I5FqVybfa5ML8rOZFQnRs6RmTHhwGE6Ug+BgF+Gu5UU4YnKlSGGB+m K27i048TvdYll96at7MZddkwJSMFGFi6XlRVExiXTHAbpH5uqO1ex0N0jhKm7qZMlUUxDXActHNm SOI00kYYiahg0mHaQUMsiUnRJeoKRyJOjwOdVnlbTYp6Hr647vyPvJPmfE7fi+8539TzWRVFafmU zfTY9g7fkjqcnP3V5BqT9vkuLsGWuHZeT4i/g0iXlTZ5EaYimhsa+uvWYapOSPBi+uddlRk8z4jo 4UmVcksvcdylspF2hHJP0NzSZfnfaWZNVfOqe2mZSXtI2qeV0mhwpJ4s2y8SqGDqZl5JkMSPrI2T SYFTTXA10SUoTIUBkptsBAxVIneoWI9DrnkYIjFHFZs1k7z5iNHjPVqybih5DubN0DqnsbmQufRx 5XE/E7/AUnyf1pLHwJT/dSkof4Io/wPmY5/44gnx4dI+Dwdu34MVFpmFBZhmGZUzMCTwlhQgZKYM F3TkaowMU0f/xdyRThQkGHHFmYA=