# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090903145951-sx4eonq1epise012 # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: 7f318f30ea0ade524fa7f705a71235a3d8e3e188 # timestamp: 2009-09-03 23:01:09 +0800 # base_revision_id: dao-gang.qu@sun.com-20090831022601-\ # h2ikk473x5njqq29 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRQ/X0wAFnTfgFfwWf///3/v /+q////0YBufDbzgpPh64FPTQAm8cADdWCSgEsra2rN7e8kPR0pQQ1oRmyURUNGICikiR2aqiiND hIopkyaaaZGmmhJPyp/pU08akPU8kwI09I00GgMmIaCVPUTRtUmmgADQ0aAAA0NAAAAaADjJgmhk MjIyaGgDQZGEA0GjTIYhoAM9VCgjRT1NDRp6TRoNGjQyYI0NAAAADQEUggEyAUwAmCGkepT9U2mR 6hHonijaGgRtHqgVEkIEE00AaJTZSenqn4mVMjENNDRp6IBo9Taho+U9/aRPgj0fI+bhp9G7du3b uRpNNOH1ch9jm+xsxG7dyc1Tg5t3TV5uRw2cOHRyc2zTo0pU6Kc05jhzbtbOVWc3Jo4OHR0bOZs2 dNc8yVnRsOR0Klc00AFJznFYcPRj2r8ggSEme/3iTZkUV6+RC0+LIPhCWIggwXsrPTUXXOc4TAsv sg22Ofx0ZPNoNXq24mzdxhYXm6EzjZ2Ils5tc58fnaxwc7E27s5aY6OryeQ4mwBlxplhvNmLLtcJ iWcslzZL4Dooqjh9XR1bmNGxoVKVW6VSpuYpppVVVVpVVOxWxWyqrZjFTRThU4Vu3TY0mFbGzGlK rYrZ8puU6XjPle/wHcSOlkk5UeNtt4pXhFHSu17VtuExIcV3QRMyXEUpSYUswswlwpMJafK2pNkp MPiVh8bDo7us9V9nr8O3G2+l9XQk8euJ/zslslsLYvhiMt8MTnW22OfWszSaS4WQzEmEzsxG/fMz k8zqDQwAABqeNMZjM5ZnYNABjXIvlxIGbJMd0lpFAV1W/x5uUUupfxigmUyUU/pWswvl+M8ULYFF 1Inr19IITVoMEB+HKSDsFNsCORmRfB3AL0faUFNA+YP5a4iBb/5r0wXy7cbcO7oI0BoW4fUnQB9J JNWHC0lQTvlfWM605JEzA4Z7slT0mlNO96UVOmRdUPL0CIDqYJAcTyBf2H2wQQQyBexE+wGESvZJ eDgf6yfZqaLKbdR/TP2ipP6mKqqqskfIc08EnSdCyngk/UTtNpsWUwyYsUsp+wkzdOCTl/hY/Qe/ 8neTwInV4WlVZbbaqq1k8UzDJmKkwrDFVMYlk8U0lUpSunrB/GQ/p+3Xik8p6yynQR+J+6n2PR6P w5CP0cSQ+lBguBfaLdOGCUKhZHzzrZQ2nceBeZH0HQf5Hd4+OO3jPZnn5Qj21rCXVIeVScN8wj6k TNv3H4kcEdiT6z7baqlUquQlEF86IGDcokjTp0kIQLTYciBAgY7Zjr6jeE7ikKUe7hr+WL7VOWdO hDi3W8tnzJ8GI+MXxB6yopYLYLZbeaSLnANI1RL/3CaMpy+7DUC0O1lcKvTCA2xocm7tPmd3jzEn Kvm/iKV6KYppIYxKVpUxo8CpSr9Haum3ctlnXO6Z9CTmOOAm85V+BHJu+b86qlj9DRPWJ5CKT9/Z 3k13k1Xh7fVu2d6dX3mNNPg+9XDZumymNmlbNJsmymNmlbKabDZTGmlbNNjZhgrZpWNGimIorTSs aNNnBps2bmjTGlbtNjZUxjY3NMaUqt2k3TZTGzStlNNhspjTStmmybKmNmlY0adxpInfzx60zqXw 33kh3Xz6k1hAy0ruxJg/tqnjWm0Etp2JIEz1VZkHtC/xBTyEQMNcWH9fEF6l6lr2Z5nv5gggYCAi BsbEwYRslrzGMCkO5xfT4OVchdQW4d/f803Qt/dqjy9eS4z1OxqWT3r6IhClIQhCEJCEKQhCkISP NxgCAAAAiAACFlTr9bybma+59Pl88ZmMuVlW4uZiSfxUslgtlFWpCxVio5OXo+b81YrzafJ71VrY ux7fhbbb7jdtvtxmW5mbNuJ7+WTM4bN1q8HI6GxTpztt6HNqtY4Y6NNJTTTRjGGjTTuC5b0zbk4V ybuNNNTjjf4knd0Cu/663/rGjYKqqlI8EdxKSkoUUlJSR/A/x4ScBrIbC+CO7rzy754rNZkrjV22 KpePFvLxrGpdTeazJXDhVXarZjMY2w3U4Vs2aXTTG+tZhupptkxVf6fCCOpD8OedvAg5kuxJ0NHR RU7FKaKaJHkrZs2d7vebycnm6MdHR0dGmmmnR0TmsQLNyGP41VuD/BMRdtenhnXVNYtGHpECktmQ 1dfWfPnK9qJbmcrq0MPCHs5ufDpqd8J3K7gSWv3SIURdmALt5d8TG33QxAwozzC/JGpwXMbLiFZE G/eFAgM8V6oTmhiGoE/DxuuGokBBZr9d1xN6wjibTad6NczGp9HzmTA4+Dhjbm7mcH8LGBuRxPsb TgvTnn43MxhXfivy+82VJ0YmI0SdDy/xKwT+xIxHPHs1skXx880R72HY97sSbkTv7m7d4Kxaq24b pJHBJ+KMfkVFRZUtLwZgzBSwtLT9PB3iabgLBJUc2H9+TyvfaPAvHcTB9LsIuaFpaYFxCUAhuscp 6+HRW0eidWB5d2O9um7Q/yG+4cNk4VDO/f8dn1cGDud2Jo8MR47r8Wmm7fST217nnhqHGyYFd0Xu FCjRutqYcU4RUGw2l5QWsbxgjo/SfZ/8Rh6k6OrB71MVFdfg6lQN9evt7NuCTxc3VomRh45mZmMY xjRI+UT5lKWUpNN27+uangaI90R7mJ8/6MHp5PhpzUmp8GJjT16HslQ0qO7zYmlTxnDBe/Znxm6v C9m7Phe1305uy2TrbeK6NNC6t0ark+6fSfSfq/X3nRK5sYh6EH8PbH09fL6ObxW2rb41jYxiqqsf MT0WrDZps985u02/U2ng9XEuzYKFa2EzHeSKUi4iLNpiUteWpbUkZEE5mF5tOrphm/k9rV0C46SQ yIGAgH1CE+JqLdJBbpFxjCvaT3FJjZs9vl7GN4+jxTE3btTveEkEUnHWY+pXw4YTEqxlVJENEZG5 2VkSLi3tzleo3FB/whqQws4KFJuCfKQAgwNwlVaVyQlPJvlysuVcxmZI9rGnRMYqqqqxsBRIETRU tPARc8mPAgKlm4+EPBTuOJkJ1KX8SO7Ppu0tvNhocMyyVKWWMxJG1tlBabyAmUbjWWPHf0l+D4m6 q6MTz2JL04932vDmdPC2qysJcokiZtoxdZMqTPCUUr41N5iVOBvfG5MsciUoAyBAcG96oLjr6O5z YXk5eQIDFNZVIEmaymS49XFspVVVVek9jWp/Ly/D6MrrO33PQ+x8Z8ZRscEMpI4is1TlZjPivXOn tDEVF5rGK/fohfsNfTfMN/YmIqyttdWepxz225amTLPYr6t8WQVOSZkDeS3cX1YmZDBBBQ9Gw6Tl Pk2hQ4HAN++YVrQ27dtZW8C3QqQEDR1FgIV0rKO/v40uEOs0k6pJwgO0oquMhMqjGMlJxmoymyWh vQUyELYYYkVBFQoGaUpUSUpISGe6Z0oPcgaaaXJZCXlwzuIlS6kpU3fXPC2uquMEEEEdWgMpLvu6 bpwnCce28S5XG3W3fJdSVwnjgAVbbbXd/J7rbbdne/nMYw9bq6u53PB5Ob1vJ26urq6urq6tmzZs 2dXV1ch5RxXNZLCLU4YAAABJeWEIQhISEhCEJ9kSFpmSJehd2aTvdHcrod7Z3tKdxyPWsVYrpiYz GLJVFVVSsxMZjFV4+HJ2bebfz5HNy7tG3KfQtP2ejy/0YP7LNwnjv9t76vRWdf0lZVWLspE+z5n2 +mts1eXZm278/z+yxOCAfWIAaEe8EvN6Pb2gfYCUPxEsYLpMy1jHa1EUX9qBz+Wv95KibjCJm2Ds SaSbEH9WeI8IipKSf3gYSYN//v6RGwo8kmw/9SI2iLIL/xEfvFhgWFPyBcBeGKBkBM/Af8AbUT5c EXBE75NhZJJukGDj08CcDrJByG5PLZ6lVVUE4Inc9Y/wJ480RzAAyFg0OOsFqDr0nXYDmi0qFmDJ glBay6GoJom5E6jNhSRP3+JHeSVE6J44T0RHoTkROZBwSf3RGoFj++/QECugLHv1otAWBQNskByB vyUqjwSD036QfMg6Qjpz8NCT2ik6Chgjkk9SO0+TkIwD9rrJHO22qqrbbaqq5jyiM5k8SJsnIkpO pMSDqOIMJOdR/asSqkihLSd9x7RHYiYSeEHCJgLgIkAzBd2rADT1eHj01LvvH9oB3j5ecm5gkwfa qkfOJIEktqNLbMaVKnvgPzowW0T0tEoJgKykpgJVnCBKSfo3rzQSyA/6PqIPj93xLMviVJV2Ek4Q CO/OQOsE+qcj4l2BQziaPGKpHb5V9v1LL5/VZQw9AkJGexFmIzSiEcOxHmp6daOq1UMxNn2uUgXq wHcOYIQXdtiBvFtnaOKJ5CFjw8+0k0jvnuJyjiL9QwCwpCq5AORCCwQjycz9eGZgcGZsOjnOJQEf XnonQfuP3adpYcxDECmJa3T88hF5YXJhfJ5dh9mN+MfT5MnMA7kB6Q3O9n5HE9pQoAULm6FQ3Rzk B9aet+zVmWi8QTuy16+u3YJ8LyvGuRnDukm5uTXeExiTIknDCFXy0Iakkbwks53IkliomYIy22ip 5S7e563Z9v1ZzjlteUa4aNxD1+c+4ghraCRn5DBCwI9hEvW4lNMXaCzgMGAW4rcga5eLxhaiynn7 wC5+jmWnYQI55SOKlkKh2G79k+qgISBg87pAujICk5h63NmRrvztxtyGtXuM62J38DgqKVKKkpUl SJw/tbkLm+tiObK42IeP4zWpjGu9JWlYYaN7UTvIQ5/VJ5yUnoIYIbqVlWj97A3kMEOKvJmbo3pI EbjYGllskxWVSaGpNRPkRrzvrEPve56BN2HMSb9yK7LgdcEYhs5IqRUtGciQcm2z30kUtByFO9MQ FmC6i0wR2yECUKRH5qa1Q2dYFt+8EdYBgAkKBgwptaSmvMJ2iXWhIdqZCVKl8PjiJoqQ928SaR3d ywkP1KRT6x/4uiiPW9nVNIg1MNMdHi631Rf5BJOSNXSE6RDkTPKVGYJtSLF9SLbdkB0d0gQlwDtP +wXzMgE/YJSSpJGBSRxjTRUpUpTAQFAgBPwBSuD9J6eh4BvPgloPce0PYG0OvNJfi+ng/Q1TLw6S YoGoWPKDSAAMxukhl1WXd8JECwEHTNHi0vU8r+8VLsBUvNQEwRoat838m/GfJ6n2HZtUT3LEKPdB LewiIRAfrV575BWnYQ6WgQwTGxAm9k339aSFIBYrEhaSntZgDgLQgF8gF86Z+/5hacernR5xxNqZ QKHMFwA9va2i7Uu7UsBZGYB1gYB8vWgPvZr9etVPQbQR2dfGn+/q1w988funX9xE7B3qKqKqFVJ/ coqoxUVRipkGySWRInp+O2uZ2sgWH4d+wLfT8kfwfej48xG/mcv0iWkHpOhvYghJgE1VgWUf+R1+ nZi5ByuPxdr4Bl0uze4tc70XlG7wffrdAQv/oHJEHF3FGOXfVSxINVQH74RAt/H4Jm+tRYpDUhZr QBYEgG6AC6yxjIFtGSS7tup1usOhsRX4RsKcQwFFPYZJBPDQmqhXQLAWFV7fSQOkCMAwDyJaFqbb 1V9G7vxOLzqrIAgXHLtyRQ3HwqGRnqDSf5tXPU9xoBkkXcwZU0yhJaQ6VE1md0kvT85hxRZkk0B7 4fBG+So3oSESwCY2p+8iQI8iK0vPcAQa6gXCxWUAjINNHvCbgKsIjdgiMIu+gnbb6jHS9FEsASMg pJUkUSklEWSaxJJMlsLwWjN4Yfd4gD4g+MCHlLXMAA6wYtzF0mqngq921tlQW5EbCuurVAe4tKgA SBN/VbFSSWCUSksRY6WGR/HdoknmiiN5xzqLud6SLLEfFclaGBciySW+yrGaLbwzbzEUzonm1Xs/ 5c7r9UPj494GfQCmu4Mx9nATaAWWY/NMupRF9satTBjyuoTUx4bwcP6vwRxTo2omLARAMCpCRZVI qyx9MwiyqqPxvh6JiSpKJNk+Wteyckhu0SZiMpqPgIe/Yl81UxtE4EtIAHM/txrR0hnhhBmKl4Lz IZ6aoThOb52NvWABh6woOoUzD9HVKUolEFhq0VQMoFJQL9EsqAtEmR7DI7py6wkpZmSkXq40sk3y Dfnm1tAISWyTe81aVVqrI4yxy29V+sZ7OLxmTI4RUh7xJ28+kSI4NnMjmpL9/Tkes7OeyLwEo5N4 AHuhWaMzY89Ab4y1PEOMZ49rLWpts4j3Xz9VxAc706xP818tuQjkAvG9ozDCUbC0Qf9K0sdQlyPw 19gC5bgcCn6YIbR4vLcjgJuQ3+1JJOInlaT38tBbgWAEqgWgDSVlswaFtL76XCA4Wy8vW3epIf0K KpFUVUiqKqSqFUlVFVCqSqSqSqkqoqpKolUVmJGKKoV5YSRAsGIDSAGOdxzKHuxZyGw1iUUtnePO kTviv735fr24g7p3J5CqqqIYpFnfkYNu30J7d8vq3ySUDglEfcmGAb7I8H19i45sxM+nMkcSyGyE 2wIPLD1y4nGhq5VQPKaOwGFqKrEhUagTZqpwBJEwi0SCFITEXoeNirUIG75eaPduDzhmkKCn3aRg 5T/O8+tOZ2AvT6Ul1LJeEW3Nk8q9J1lmJPAMALOjbfvtOZvT3asi4hL9ZzzEV162oopNRvhUDCUp UaFOfeJ77BSQJq7Hk2n+sNb9i/IiCGQzJAwikoN5AKWKHQ8FWe5jshqNgnO7/ndnSEBysIXyjpgF lkckphZYCyPRsJYPMsqFVci6EZ9ctGhVZFEOM80nuVqTaP/F3JFOFCQFD9fTAA==