# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kostja@sun.com-20100215164330-7efayi19n4qcemu0 # target_branch: file:///opt/local/work/6.0-codebase-4284/ # testament_sha1: f7dbad4cafbb30a23ef399a1f0df7dcf9f2a0ebb # timestamp: 2010-02-15 19:44:00 +0300 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # next-4284/ # base_revision_id: alik@sun.com-20100215141829-2by6iruheth72ha3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfeQ8rEACbjfgFAQWff//3/v 3+C////wYBQ9RvsUAU6GRFVVQEiQkQAVSQFFVsGUpIkKKUUSUoKAGiKeFJ4mmp5NTaJvSTQMjCaP QmEyDIANBqU0aPU09NTR+qBpkAAAyNAAAAAOMmTQxGJowCMBMIAwE00aZGgGEiIgAgmJlMJphKPa p6nkmmTJ6o2FGah6mnqY4yZNDEYmjAIwEwgDATTRpkaAYKkkCaAJiAjE0ATIU9MjT1TyamTwo0w1 JWoxLZ0XVS3acuNvHl19oW4l8WyqBSD+/QyP/v1H+BAGPB1lE/HP5bAlfiEpZDGEtlfX/GHQmSPr 4kbxKaYY0yi666+9mQrOsUANLEar0pPCuzr29mpkBc1deR8hluZADH3ZS5sbJNaAaMzaXc1iw7p2 bMQKvYMIbSHk8evw/rNKjJZcuS21Iex04Yk7Zrqwd8qjkyhlYkWG/VI6pHJQpyZaWFFjACamLCgA wAhmABKSzxu/u9Uk/0+Wtxc/6RXK4p2rOtXN1vOnScLn3IP0F2iaG2wY0Ntiu/6Ed7xvsILA4VoZ 1ilszpT3RI6wVHm/BzWLLYbo5d6avZ7ZKmEzb+JbfdcwrMF4/DvsnLKJbeMYTqSDPwDz8y04+o+C 9OgxLzqWPgmLAv1Dsj2U/ZtamvwpnYUPoH/IfQ/smM/MaIIMDL8jy27EfxYivmevr1epbwk+NuNn gcWcFcmrrhku1DZ+xpQ+v5nweed+TzNDLZXGsCsZIoB8RserB/VXaUbHazYf7Y62XeBG6sVzIxwP oDIld9dpIsnRhWo/1+YSUzPIIP8lqOJu3mflt7zfcvoaaGAFTfsOZNgtmmyDo6mUTac51x3YwcCp QYbjPeW+YyywjO+3HBlbTHBbBaY4LVel4EMDOp0mP81l5RreOHiKaU1ugwltyrpJpQbvJm22yxzS RnAvFmmFxQw0mFbEnIvKIWeJJaRlVUO0g8Qhbh2wFBjPAgggqPCsqHY7LNxv6LaXe3MX6uROjwyY c9OrtpzUG6bxwrI0Yz7VkGZwPVDL0zkL0DAv0OO7a6zTy6jCwqWLGDebnTGwmhdxnoWkZ32+mJGJ mFp9jjHTC+6qEdnbiofTjeooChkHIIhdBgMHC1CDRTZGcCSMz/9rY3Wv22cfJCPgWWL3+91Pi0gb BjEvvCENsbbbbbbYx/p5i/LtGgovqO08RSQyTyZH9mkH/h2BCzBn2dhbxc/zCAoM4H5osp0qikom KfiXiJM42buzq3Hvr7H8TZsb1PIrdYoVTLgg6JHlHpJvSHsndcqvbHoRfGycjsak4B63saHjIa+T Ywi7Z1rLkaz5MPPNbOMG12rao08Xt5QREfZ9dlw8noy7Zqtd3Z74KgaAIuNITAPcdne0FlbrFEQt bvuJaUM9uLbc1tCTb+x1+zdu1SUshgu15MKjV7VK3IoQI+ZXnFVVYjL0T/Cnxi5GRDzLy4pBUXRS MUa3k17duLKgVJk8Gd7DfLlsMbmbm1YsWLKfU2tmpta7F0XrGIy+lubm4NZg/L/U1uez229tszZI iZUqa52X4WYl50C/e0YaRtpGFaTeBaFylFSmarhSxSye+L10y6EGlUW52j9svM42mbpchlCwg2ll LAdC4QylS4g2bcLiwrp63Q5NtM7GmXtzO7CdYqbV00VrBt/DmxcBGRfewC9iNx2TsHTZvI1sqVm5 Qsi6vc8zXWY2qe+KeZGXUYdaVtFji1uD8E5L3WugPae43V589CJ7HZY0VBrHdvBchiQRuLuU+weT uwa4oGmxNLF7rmK4zrkqX1nSqyUuZbAxKUNw+nTC8yEaQizsWpCRoX35lDatDMocw7zqRkcyw5L4 I5I1tAGfs9xxMFdPM02zSZ1zL7LQ6gDiOXckY2cUc7MjoRWzNUNDr67UKvS8gMsEdNxlIBVaQhk7 DNSS+ZSt+ml5QsNpibC8vMi4qegzU6kPdW1YO7qHUcBOJBsJRbYbYSNbw+6JVDUzNh2IqewvtmGX JFCJMfYFSbLGmMkwVRWacyOd9lz0FeLAnebEePuOgHE3mbN0vuxZsmpqjg9qO2MMJvy47MOjs8xT rzdzo82OCVSJg4qWaA4XcmncuYm62W4La2xuv8S4R/RDMHQt6cTA20Rapw2jMz5FJGu8fAfM3nuS tPBHesDa8W7eO+qJNf7uqM6VJOZcanyxLadTlGQA0dLiaVgR1HUVEzlrdQzNKamZjgYm1ks0Njpa 8l+DLS4Y4SKH6NbS63NZ2PVHrndHTGTudkdkbejV1bbcMKtzjBk44uExx+l3vYx62UM8TAqLI7MY scZt2da28+6RFoVGbjYdYjgZEIuRQR3o6Hddy371htrZZJFM3YdqdbTURcOwqbCCwa3jUFq2lqKG PVU6FIORpMHd7dSuXlzL97INpbiziXmZuOoZaeRgPHdZviMYMHRao4UtNM2rG4vuMGTawjJpWllY xsWkzaGTBlOLm2tjNH7/B4zuDQ8+o00mis+OuxddNq8lpQa6SIsVjAsrU3JE3d7+vYRP8jjNXr/u fafI/wULrVKwJC4VVCTI9sDnCRJh3z8Q47yAD1GL7rm6nzMRSEijI7ySWo+SY0yAYl+JJofq6DBi 4PmPreS5esupfmwuYPlLqKoesfilImuOVO1DYWn+47R/h+TBOg7307p3VUqioqq/NDHVPmr915+i MUxR2sV79jJiYsE4J/Y3RakqRmXn6plgjoJeYzI3mJhDA/eMo2MWtczY6KqkbZTNqRqP3Nhc5GbJ cYmcXSqiamDJ/Z4J+rNGj/Nakae9/j3PwkdSKkyjZHGTpRTNOCx0ma5e77ljFOt0mstJkuSM1NvO HWj/Lvc0Ytalk/cppcFjBtNh3LDdJ0ptcS4pY6Ua0bTUajKDNSNo1uaYG2G4wcWTe3pqilKZFzQG hkNCNkszaFyCwtDIwKH55FU4e9GJQlDLg9syi8GkZX2v1tbk5Njvc2Cne4tzgyc1MWT3n5/GvTPf FIoSBkNpfvGNg1BJ7wIUpDKKP+J82lUL7IdMJ9TAf0ULPvWn1Pmp82p978H6RwjJ/Zpfmg1Cz+v8 +b8jmki50q3Oh+TmXfRNEQVSaF8A1R+himhtHmc+Iy8+r4DZ+EnqyxNLvQaJGJNEz5GqgDrHU/I/ Ll2h1iF0Ctf6aabDi2bNUkdcdOi+iqsXPKShTFW9Fa5aedqZHYjZ9+B5nGcnB+bbHoMHg2Roel6G 04v1lLnJmydOhSU1O/AP/FJJ1Mf2ryeMW3xUNU9AL5uwd6o3Pe/7DIZn9UNbU2nFc2Ox3NTY3MWS 9yYtr4Ocfy3ppXI/WTWuWpvdS/zovzcNDGrK1NJPymUk41g7iUwYtgiw9NdSO/QjUippZ2JsD5Ra r9HA37IESmAyYYxtNibIDhHW/QOYsMGLZpdq/POzxbXmanpeTQ4TZDTtrajSvej4YMojsZrnpkeD c/nqMjp7Gm/I9a0zGSZTBkbxvPzmLRHZ2uOUu9k2b+GGF57ltEUsq1Kl4otD9/eoPWkurFZJdSiL pijxkkRorBFsljFGFvUwwUvZWn5al92TlY46Asld729Piv73iQUrChMg4G8uPE8DOu4/gLrQQYBm qs2sb3yL4npdXKOcUj0NjHuN6zZ7JJnqh46Z+xDtHK6GuYuCQlBZBS2BcSgkikaZiwJgqUcEn7Mo r4IZ4I5l5uAoIkyEakrERxShj4NQNR7bH5NF+YFjGlfwFbIl2sOCfYUGZXzEkNDu7oOdQeIj5tIN 5fs7Q27aFBFRBg+3zNnayV3u4dAaApuM0uM4JIkcCKFpwZuVhUSV5ektRGzYGYZCUWgFx3muAz8X DeigJkodyHa8Wl9Cjveh5nUvel2x4ybGz1PoetojijU3t7BQybm5qJ/dNPx7k+MuGUVNmb1PMvSH raQi5hiu48bUkxPuOjQeh3I8kQiUsmklHftXLoPZMUzVKbHlG1GmL4/hPcv9bg56P9kxOIfFfPXK Ue+0+6PJaYRhgHhO9rj/upvuXBgfewbbEDO6tD5jGyhUgNV2wvuMkmLGM3SsvklN3F2p4yHmYaUW ef6adU3x6Yvl/e2s+8Tf6y4yXfdW2nxbEmOpHR6T0R5C3ZCWaBQFwUIMTKhBKkZCiF4pHCrCndOj qQ98ZHLkVwxPYxEBCI+39xmSG8zSbGMpNiiW1LNvb8pkclSlVOUb5GhIv+TmxXGn63W8SnyudMa5 uZJpP4tbZHBB4R2PbG/yL0+2eaXDzMJ4OqOuPKRifTHwf5e9Pg+hGoQyENdvWarb3kZcwGczai0R 5llfBr/A1w/SEKgZJtfewPEGJgm0Ng0B2C8GSkmiRgaRYrumgWilTue+aPJSMnFapjGuVoH1q5GC 2Hod7Lexe3CdlrtrfDspVJDFE3J3Ue7OLGGqFuCKk+yV2NDlHnstFu+U+Dk7lHvbGyRqTZFmY4sZ H8HOOJMkecoZCNLzUNFvHm0XhqSwJUuSSJGL15SsFYFlr6inaIxmCfaioMMJFLSuMPfHhPa0zSio xqV9zUkzUzqnksF1UxYxuX6GDnH0RnO+iZ+LPi0aVGpaFSlBRZhFhECY0laBAHNHxL/BJZpUH72H 4NV5L4x4yTQ9Z6E4Pe3HKjti/606nVLoZyI5E/IpE+LbNK75trLRGGy0joKKuUtVltk4gXgeFiLl WomcxAcxL0eHb6nI68jF7jXI2reLV7EnW2O+nfJGTh2tGJ8rJ8vc+D3ovqdT1n7UqprH2bomyPaz TfOXN0tP3RjHoopR76Oh0RU0TJm5ypi/mvjzYva9zp9L4o9Dinscvsm3+PJcmTCg3fAxRAdBDTT5 uCICBjfiM5NeZUswQ9M6dD7Y8WMdlaFpu9kaEdsw1SVp2zJ5kVPaMEi4u56l3Tf9oqLjweK5OapL pmHRI6IG5t3Qy5r5hUbTBr+iGjgXSOhNNpwX2GCxA0YQxdSglhIgzNEOG6/sWQnNJ93gQFCs/GZ6 KpOYxQ2mucI2qTAGkD4HzeiTGRWLRNJSmMWn8Xc5vva8Pjwc2LBpwHaL9m1VEfs8cE7XFHPgPBTV ZZayy2qdZaAaPNkQMUA2PbMKUmEQEJMW087UF3QgtEzJ9C0mhktxyR+4jK+YNMeqLnV2M5OkxsWm l7u9ux1WwyLOebub5hPxyy1r2YuAiBq7BSsSFbBZS+sFhiXFxCIR/FewixDJ2U4JOnY85dJ+6g2+ ufwfPfr5o9M4KhtcToxS6q9qouJTZCfbytSGJek3Or46ZPFFSL2lY2ZWRdonwp6l+sfGSnpZl1xL Psj7tbwponhMo8zl33HhRGhUaGS7qjfgU5VTU6UVzQZLpiiXE4xZ5UVRVLhNCYPJElFmNMqQPfpA ZsRB6I1CguwRoe0x/oesf8utC/2/1T1BqnXGPPXHAeDShKRykW7HjHTdHaepmymSjo1Ivp4RZvdT jHwPdg4JuND1L9Am+PNGT7n1MZ3x3utx9FbajpZSz5yomFF0ko2qbY5h3t8p1mMk1Pavxj/gMCbY puURxjROvz+TxXzvlYMKTCWuYTIOQYzKf9JgRe3os1SP5R1uUvj4scU7o7Y6mDxxsF0mb8XcvdDO OhxY83/4u5IpwoSHvIeViA==