# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101220171655-kmzchwdrju4p4pu5 # target_branch: file:///export/home/x/mysql-5.5-bugteam-bug42230/ # testament_sha1: a580da4a0b2a45ffbf4515b8acd018edfcb093f4 # timestamp: 2010-12-20 18:17:08 +0100 # source_branch: file:///export/home/x/mysql-5.1-bugteam/ # base_revision_id: bjorn.munch@oracle.com-20101220141501-\ # ceqdtki1wgsuj0c7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV2EvPwACdzfgH/we3f//3// /+C////1YBXmx8Jvec9sC3Y+9560koQFAWdvrr6p9HU+WO7Dq7d7feYKHvYC+wBX0A+5biKA3XuE oQJqYIT0ozJianqaD1HqaNDQABp6QAANAJQQAQmmo0AjTRCNAaMgNADTQDQAAShqaTQlNMamh6QP SHqGmjTQ0MgAAAAAAk0pI1GmFPTUmmQ8p6gzUaAA0DQ000DINAABFIkFP0ap6E0wIzQahow0ATJg QeobUGhoaMCRQECaZATE0GowjRU/FHpRspsRDIDPVPU0NqbJKTcFEESpBWxs7jsQ1ob2/u4pbn2h BVT9qktFmi12qhZXlVzfP3VWlcQJKe1t9V0PKUPpfOkfn3V267sOu68F9CzW1KMlsoyqsxlkQj+7 SDq4y1NSKW0ts983gGctk/Pq9kvGXm4SXzOYhOlFpRkmkvizcBu+VzTydqd+pcxmP96aSPXwyGFT C7TEjzh9Ff85GmgiFNeHQN6392nmLHw+fDd2+nydlXkpZVtKa6SaEz0d4EoNOFLUi66+Es2wgan+ G/fuJ7MeuvnS3QJJVdzEkleCKJgMYDbaBs5jINjEL1diOK7xdJWxB4dqDVAyQ1bpsQczTjgSr1SP 9zSYXL6heYu4TbGwbbQJsbD6/TPYeJ/JIOXq6P193do2aLnEdZRfeQHCFz9awwILP0iQxl3eYMMx XN611pdSF6zVlwt1Sz+2comKo0os0WMqgyzWa2V1CVmJXZLqNVoKUW7BVpV7PD41xFRecG2M5q5r BxTY15V3DF+KFcDpGgDwnQJ0EO+aDcceznPXx/eC4srLaKW0UUXgYc5hVXlkVHGEyBUQ6+rnu+xT ikdVS6TDHUMIxP5CF8URqBcpEtL+7rpbsL+8zJJkU4eCXN3oFEaXJTh/sc4v81u7BFRVjjFkcWJF N8PdRVMkLOUOxWKFVimGLUF+3kxXMbCnM3txOQ7FkP+MdLifQfGMKxFMctuJpUp3qhr9E46xhQ2U vkZva0tzq6diNKFwI8qOW1XG6rqMmN8rE5JTheQlK4fgGBXYcWZY6LEqcRhpljH3qJCRwdtIvqPj a/+PG/KC0TqQdbfCew6R3WObRE7Gt2vgqyz5crqlIM9Rhu/ox3r3Takw6VIP0bTCNWuwlqJiQyiq q2hySnM5kELzksuFK7eZlEpKaUmxSr77NK0yaTX+Zz9XLqH40rEdrWiS12BNCakmNZSe8BtOFYxM o6ttXQtBt4xgmIVo8EpvCGt7l4XTVo9NsvAXu3Xo8byGeZr+6Ppau0DyppbZZSzWShg2mlMgzkhz HT51yG2J7eLi7rdnv3ivVVXE8j4i7y5Vn+pen2Cthi6U0XM0cfZHYhfDk04sejcvuaVBtOG+Kg4J YDhRVURVX0ChOB6M5D1DTIsNtBa9jAX8rGzZyRebNlvq5HwK7hhdxUMw711w9/EkRYmTI/ViNxBs /phx6envt6tVarSg+ocLONOcey4uuqtEVrTrTmYvWlwexYmmgjPp9AOjmrse7hhejLyjp1YKvHbv oPrd+/EbRAeEMRB0Dfexi6Tc+ubcZdm9jNFlxVLxz5B7jveoBonYe44kiJY74pYmeBbSUikG8vBp M0IxcB65Hh9kJBvzOCjexgwF9XYaVJIL5GmK61wAYfuXq9DReKqw0yI3SFFcDk6pI6/Gbihs1zoL zJPSSaUhoxN6YquZxgmAQzzlMwaSJJZpiRYRXIaA3DkH1EzQcyRWV5UuIz7VTJGoxE1mPk0GFMVp IpS7hIGMBeIFFpLS8P6K8mZDJmELu1M2lxI8NNCQL5NLeMNTRPLVC3Vj2hZeViFLT0L8lmB5zpI2 jCDSR86hYeJp8Bx1h65EZU5LAuNbclG15JMp+J0EKiZanZVzr7vHVpi20UUv4ALVIQXgVPl5b2yE 6ECpxB6wB/RV0qoBYZsjQ/xsCS8bzCOQ+YPCW8cxcm+cHtFzBTXA0lDob0cC0fXEVhBHv7+rMR0x PzeGnPvZuIG5GSwOpERHRAraa+PnYchEZhWSBxB2d5ypbNg9ji7XaGMAdh3UsmEGmuBGhdR+cCl2 WBXBvS7Vzggr8X9EWC8DeS8I4GR3HvPkfkaVwprINQa4Z4yv9UqKQeMhyNtQn1ktZfKnHQGzrLj0 LrObzK8s+l9Iu45mhRJlpAJl7GeIzI6kUkkysjYkZOwdGOE+nTUm1sqi75d9p2NoO21BUCU2R/Uw 1/mTN4xUiV6DkDwyc1hJzc01SCl2YFFKk4aoy8ImY7jjnNG7ieTgx3p+QA98A+kfOOcpTKuaaF1l w261RJ/DzAN7xEqMilRbtT6pBkjEuTSODJxVPNgC79c62JkC5GczRkdRe0rGHIKT9kDoYLFxsGjJ 4kjUocpHX3nQzU6zXwOmiljqXdzTVaT4lGcnecDnXmSiQkwrAwDB0gkFg1OcEusmRAIHSGiwobih 3e6hyRxK6tHLIBlRzKN7PcaHBY2KMYyf9JodXUuy9XXfZoPFiEA2JkVLEhSRQUAgHWusk+NKA6YO Kc+eOexU5mzpyqehTV+oqLAzUCydQxqYHT3Hpa8cbrssE40m6MHPmvgm9CKSPSwQIHYwRwXxWCjw IEYzjOQRN4y4lTg6uUBXode1rmtNFlnUyrLGZ1JGobFKQCkxgeJDUsyQGyi6HYxQSLCg8WhyHJHo TLlzPia+R8RZjWeUPW2rsjNvftfpr1jUKEIQAnAByc0rkFLXkuAfOvzUGDH1Rgl70NInN5E89s6B hkLinFn+ATmCe1I9/xfIQ8suaooqrIeMmjLwQ3ck5jZRijKr6xLAusTduDPi86ZjZ2H1NKhY4wHp AGQdoLmqPaHYEkHEaPzP5/Q+Qrf+hXBUdBAoFkluIA2MHd3+IDKoNtVMjMSAN6LAipI1wON2m79g AcRFBIWJYGgSLAVrALEhakakwWbn4iYUCktjFVSE8ckl0yG+mNAnIaQCI/zJBESqi/EggF+Rp8xD YBoYkWiT38pMJnOM6DXLAJAlex6CByKifBZKJAMBSjgaAWwYApkSTDISlxJAhbwspwzziHJn5QDo glhMHACZxAhlLS4iIHNxn4NsxTmcofgkTEJXCVShvSGwESBCqNEVZ2G8oMQvxDSSGCFTbcFUBIAU iERItErgBgdEE1DZSgbp7QQTBuIJUmXGTJiAbDMjSMRQMbApUikVpNYlRGRaZDIg1UVBBaIIA0Ab AByLzgRC8KpjofmJbgVhiJUJ3HGwtjAKAhYIEsRmCQ0gVmQbjeZdV84uMGK3FuKtXGKYMYoo24XF pGN4ArOsR/JiRJoCROI2mNpjfG1IV9kMshERFWZMREEURFkQFVUVPZ7UhPF0+md4aoqoqIqq+/Pb s2JJJoaxKD4MxGaMMPCtNDXvi2hKJTBwLHyk0tZEPAAeQ6YsDBdgkc1IvOe7WcRtYD3zNJymR4Nw Ok4jUTBTw5nA272R2XDA6zhlpczVsEIpsAVN2ZmJWitAtZX7WppazhPA0FEMwaggihAfw/2MJmjK 0gwbD61819wKOmoiz+EiwHmljACPAQNRpYRTN1Ng0e/ektBr/AiHYYTKQROecnHyHKaILUCyTb94 zUTDY3eNFjKRCvMZc9KhbTDTNLRcDeqanxnMSAy+PCTA8xnaZUyNRmf8Fq6FSJcgkefrN5RdqDn5 EyIu9mBpNlR+0nF7FJCixB7R8SYqlP3EfJgccEJHlAPPHEiEkmtxLYZmG6RyPabz0GQJklZQtVVJ bzWbtW9hsaUA61/FBoXBZGPKKSkUgIXHiobtJf2UV64XbDtyE2wNXqgF1csKQc7CpGAxVkAvcQNQ hPi1saVFzOwzksWtTUmToCvz6mgQ26Ipa2nSYxYyNs8iNQURmLelm8kFAj2GMeWYl3MnYXA9XgeK ZwBcl6iuBfIroAColNRQlosJC1ntqzkogDQUvNyxLAxygktUWIYtyqJKNKfYH4tabcVLLUZBMKFt RGGvKdWo8VODJiKKzgNBt1II8z2AXUZjIawC2huRW4hy9Fsoj0L/B78ei2SCB3DZoBQqfQl6qWiH d1YujZo9S+JHHUNZhGFBovHiYIt0IteDEbEnk2JQlORAeyoMRZIDlbkqVKUVd8cYZRVFqaCUpgyM jYYnR3b32EA974b9xRM+9Jecoe+N5E9Rqw7RbRZHtKM2NQ2ZArEp4AoIiJZm8oJb2Kt8PtGCvMip getB43JC+zkZknk0oHvliaoZdz6ud23WW8al7rc7CUJQjK2U/bOAhakkuTv6HX5dpsADh2s4ozWC AgE1w+/HzO3LBy/KBnZuwX79xtm0Qo1GvUw9vdQLu4t8Upc00ExihamQAqdxh/UikiqwYyw/m0Ed U29sHUSJLzU9B/dqoNIJ3EZrpQOurGzH4q2b8FmVnFt2xIGUsQzDXf+ywIytRAV9o1JI0bVrIoIz AJHrglAtQuiLcjSbfZAR+1hAbSINQLV5C7joPYdD593E+R5Ez1K8iaS44G0vqiZ5r4QSyGatBgak Hen9BYefIUFqBiRshIIEgTuSAd1NxKBcgLoVgmlBocY4aeEf0usRUuMNBmVAiogrGM57cRAIIijX TGAKN4y0vJnoSStBDh1r38gkXJIXiexQErNJmqnaePsBi3m9Q+R8zWRVBJ0EvrPI1HIIqMT9EiiG qpF6QQXMiCP7BgPlRIUZsJbWQMogQCKYTQe3FRDScZx5mBEA8AESWHEgZnUq8buao9B8H2ewIhLt xlq8TH1oUUglGFVe3meL5QghtKqDZTYdNJkkxoWs94dDRyIkDAWthi0u0dvBBsUQTY17IBEkC+G1 ZtihdSc3UQu2sbY3JgvtnYHQNoXIVJ8DuWiqX7CREQTLr08M9oTewWRAXlOjmOzpOcVUYqKmwnYK oP0E+w4B1CC9hXQrddXJYnWxQ0r9J59R1JMW3czzwWSzAPULrTSF4mogGpdYdMpm1SQbz1+IBdpN xgWm/2nqJCmrWNnUjWFUEbIhIR6hCOSSAslj/f7uaJbzhJg2mJptMdrg0rAE4CbExTgQwwgUDOKR FxovkZeYIleFS4JsbP2EIeMEbNMN/5a0uCuFUqakZWkRMDcS3kQW0kcbJf9nC7Wndtj27CMLaQY4 IFa80ZqQd2ZwKVSqylgdzsv31bbhQqy2zSrjmrC+zVglC8KzUL1oPAu4HNYX5pSPQAv8sYYI0YyY wYhuXOyghkOnSSzAdxIUOoMgZRgdw7GswBaXpQsjpE1+kCdyoiEmlCiBjvaBRjIghJmZA7NrjFs2 5DN9/0nhzcHp+9uFNYIdaDHFjgYwSCI0GhEkoLPYZrrPZYgNaqCtWBrSU5ESKZgyI8wgIXRYKpY/ 9NOLSkwbQqsRwIBy8jp0+SCME2jNo8F8pOMaTZ4qCkhBkdyAiC9heS2pG5onQldkXzMp3CFi1l/W +CFKCgg/FIGE0MUmQA9+FGfHE4klk6r+In7Lr8MQqMGfVqgQZAoaSC/+AW4Sir98x7iAr1KZRNcN 6Dm/2w+Uio2wmXtG5fvGdlmNNiR94ByjRbPixMB9Sa71NL/C3WYKjNSqHeajA80lrELPQJfH3Bwf KZMEEdE2eG4B5nrlMwnHbojHLVALHa3TQagMzPZLztiCrwSqkfJaROsWWIIE1Aknb22cNBTilGla GMe4a8tRJZwTop4CGhq4nsSwoVREdNysL3EP6dsZolTUsNmkAjpR5htAJV6DRAOCokRVT7lmbXZ+ rC+SZazX4trYpQ0YAghMJAofkmbS5FQWEXuyB1ulM6acMWuKtMRMQ8wSzy1Ahi56TSBRR65ooKYE WvuVQdn3X7eS9BJXFMMFsA5/L1UWL3NGU/5iciIdffI7Jq9ozvJCo+Apqit3VQOBMXVrDqYbDaXZ j1YP3I+1tt6iuaYEYECJyWuFRvOUQuWoaNaDFS9CUrfv2JVEq5htpobJQUHq0HQdpJaa9aCRaaSg NOqUNZQ5N5g5N1EZLLGiPADI6z5X6KCr8wTiBUvaX9v84KKbTwE6Zu2wDHEvjreTDN3u87L/HMnz gKpUtJswJkgTiIIL600eDElFpDB/Yq5XT1aORSAz145kRogQRVNOq6K7x0AdjF1IQYCXUsJQeKd5 EvYEMNCRM5kluO89xvO0A2JKqe4kQDb2xQaf1/ACPaf6r46wQyZvXJGriUCTyPQiNaFXclIpxhmj mkRSmlkVMWNdERLeR5HXUZ8bTvE1rOy0b/PSlk3Rih9Yz9p2qRQIHrKTpUSX6Db2nwZAytwB904y p3pTgZ1QyEOIkQ64hrCatZQvVF95xOpRJnAyCdCczfsZiDvMVmgk3gzxgwQFVS4M88LzIboDy8KU GVEKjZwkXgDy+iKRkuS/HtReIybbGM3C//F3JFOFCQXYS8/A