# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110609103115-rhfwxtmyedcp5il6 # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.1/ # testament_sha1: 8c306e23c10bfbc5efa38d299519079ca0ddb040 # timestamp: 2011-06-09 14:06:27 +0300 # base_revision_id: ramil@mysql.com-20110607153043-6nmfeoz6fgtr91g4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaPt3L8AD1h/lHAwIAB7f/// f+ff+r////4EAAgAYBS/elzUzXzu23WDnbXaUAOg6ABQA2XZRaDNdAO1qSUkU7MKlIK60hRzTEZG TTJoBkNGQyZAAADI0yNAwhkCUEAjIJkmRGlHqbU2o9IaeoaBoAAAADQc0xGRk0yaAZDRkMmQAAAy NMjQMIZAlPUSKfqKaejU9SGMNU8p6aaT9TCmjAENPUBoYTRpptTCKhMgRoJkxMmqemVPwENR5Tai fqZNGp6ah6Q00BjUBUkRNAASYEwmRoTTJTbUTyBPUA0B6jT1NPSeUXTMpRRKUBjEfRRLcCiz+Lgt dQIiCDn3kkPptvNCRifwSXLEoWgVlVKUpSUKUVGDQf3P5tbodj+DMy3GTJoXXl1Kfk+/L3aZM8pT JkmeZ1lpaqccyR07++vV+jgqy8FuHNqTeTXGJ6RFRSgtglglBv5SP1/u/eyMqd1ZSGhZDy4HOduS CCXUPcSDcUUUb4p/Uzl1MkPMKOT4ZBmZDQ7UWKVzdnFll3m6eDO6dL8OJeJJXkeV0PHu1N6la1m9 V78cNjGuzRZo2UScarPkjCBGjtYi62tGFnmrf2v58fwjyMd955cbVzOt9Z7RPcnvaY1tL75dN7pu vv9SeEkW7l1WZxdmSPOSeSTqJVKlVVFSVSQKKKALAujOcJEddI6eObTu07kw4uE6bFsKqnFvNtNp zkXigM5CZLuNXm7VnbuFgoRRfVJ3mo+coqiFY1nVyUWjIM4wZazg8nrWFVhlmm+XWxsWHFMjlcrk YLzhWDTrM5caLuBlOhMp83CPWnjm/wBu4T1H67y6fPILAL8h0jeMrf3xt5BT5Cl2/zYCkxT0mKgY RHRKMrh3yGfJQvurukLWqZrC/HhtSNqRo1fFX6m78r6NJybYOpt3DhX/HVwovuIiilz8oQB6tex8 oCxPtRx7vUOcD6zJIvPOrLUGn/Ibwhk22plB47YmTg4zLgrZbnKot4uw52uWNxbHU5aQ+OzdwZdm fJJOV9PoHMui3jl8jB1znJnbmeL55zRKHUEQ1A+RD3/ZUGIjZODVzcnLauTB1Y83NOjcOlCBypLA yzFdjRqmbp8EgzLndETPOBjtLRYfPYyp8AiCWUORRAOoaiiR+L4pxNayFCicBScS7waXclTeH8ud geVWqz157XmSbFlpndt9KijJYZMylWMJi/TWlFTN6j6Ffa72eD20yhWDJ8tTPIWYsmxSetY+0T9t KpJcfvcKVELFyyNzc3nvb3Wvuxbx3eNU9nVk8U5/Dn20VPo1kRMhA7fIxqN+HSKdmVR39ny8FUl/ 0Uxeh84pD0KMCpRiTFNn7uzhyGQQM22tN2a/i3Dh2aFN1hSLS5cUybWo1idsSiiipqqqqqarn0wq VIL3VKKr85UneiMc/sRHx93mkfvIgdRUBoOVXHWrl035VdAwM56bDRfyc2rzVYCm6iWoeFJF6hll h6dvqy3YSJrVoo1VqyWt4jSsLARy6sgCREQzHC2VVztcWR5ikj4K0mEpghWQmY8LJKOHrUaVS8Pp kVuU7isvLMgoPI2HL5xEQJbsTMhiWmyKT2JyoQJzg6llwZREA9UplchAonAo5wSInA0zY2PFE6Ea FRmtKr6ihp06TGZxSBqXpF2LkSC5Z4Q4ESJjduXWAz7u3hzjmaJz0miCNTJg4UeScOj6CAQ+Sbdi LIIC6GM4ezcl3NfEjDCqgCU2p4xpbIQDU1eF8hEOKG2rLaPItdkQRjL7hB8Lyur6xaCqPTbKEYns xIfrMrG/QY9lkQTUfRAJBuqJz0N0cPl+x4WMCAR31vtZJuoqMLMyZZeo/OUFEDS3X0Igill7GW0G zN2Dz1LFTbg3OSgkjte9lVKIiWOCcRELDHlMh63PEmenLIidA0ywnBXn1NRTfRTrWGww8YiKWV5t ODPWDPCPT2nw1J9sCOJ9FhBB/Arp6yZ6RTBs2H9Plu/SxO8mLC59D4ZeBGyIJgwOM4p5Fx0hA7jP LuNgvCRJtOgCXou+fptEQMNlhVhVFFgVVWFUXnIIDG51EQTI4NypufMsTbuOp6JNp0B+l5omZKRB XVEnZqKsqYxYGIRk6dTIhDsPKwgEKwHrM8DvCmVZnGY5GEaxIpYuKVIkJEyijmjkCY1O1jcRDPIt IyOAgbF9gwKIGKC0NjLtbIwD0LEUERj2m7FTIwZogkSw0SW8dRCPpG5Lx2HUVVS1pUicd1tCyOup MGpldduyiSlabLOaxYRI4FsTFKxAdMuLEMi5YcYESvroZQPQiCVNyNMECxn4eF0QSmZnLIe6cXHo LznAK2NiWMOVNih7EFsAWONhTc7iIQHNBjk2IBsWLEegvvUWgvfYuHt5Do7YXkeFoWjxB4tCHzaC AP87hsic5WVanQZ/Svk/zY8fAlTLIdI2idTyOxxY1RBLsWxM7ljUoRTwJInjcsGODAUOjzMJ6JtH JEQk84DcVjJYCksD6ECRuamDIDkkCmg4ZkxQgbj5ExEJGC57RAJFOhfBi71yVWM+sKAEybIiSDNX TZRAKLkWNBdTMsDE4UUpSEx5GCoxsZXNpimSaLFetzDbNmXsMIheHRdOBpGC+9EAYQTQgZm4CWNw v4xLKe9Pb4p8WuZnnTwhBm8N4xjhEEntI2oTRBOwpxy2XiUfCMnUsxbFJFlmxTbZd0MGTWwjpUl9 9qqurMO+pEubm4CLn3I0SpQ0gxANBShkQGJjtIudtUAilSApxxM4LkIUSBrcvlS+2e3EsMrRlBRE HWEHOoiEUyuULkN5yrg11ne8ZqxDjIqTmzDZmpRSDJuLSwWrYuppPpn0HJe6RyV6i4zNSXrOv0/O nHYXAcdxs+m8IyHWMo9BEKEyRM3FsIByUrItHRLDRJIglCQiDqyrOCQ2F8NyIpkVLlC47FidHyYc 0L3Veh0RBKpMVIEDB1+uuxminU4RBKjGg5oRFDYUiKTz1SVCQpWnw9cvjQ958YHUxnsorp9DNWwo SUhqcqPRNWQhssI7gdqRAKUggCqkGmAVEBawRqzg1BRQVYREQVURFVWNjMIbQxHQgLDUp/Adj5BX 7in+D7G90d0ndV7EllqlUoqqlRtkl7yKzj6jz+Ek1Ph1upD1UJ4yeNDkYIDQX/s/cmIH2RBnjCCF EIUbHGgfcKkNRAPkfaCpYKkowJn9jRaMj54Aq+6Fz8/wKTcSRu/lD8IcYaIZmzoXhuhYQ/EkjJJH +SSOENyEyNoJ+MDK3/fRDEhWKlYXoeSC5nXbgEwAYBY/zlOUNUJP+1l06WuGyG7D0QpJhCn+78ob 4f+JIw5VckjlCxJGg3gmtrh/NeHYu2f+pI/J+bhEi9VEjjDZCxtFTehtQ4s/pBOdRxx9H86j0nv8 bY/h5wfh+REWBlLnORfXUREVUEERbT16IDXCjII0QCIX0iHdhcll9dBWxMeKwlWRPi/yD8jlX26B D2nkSPdDKgSIK+4tKFSpn75v1FpUWnurIlDYePhE+8sDERNnGokz47C86CfwrEGs0l4aD8DVPhPY cJ8ChAoN5x4hDkEn1fj9yiaOR6b5RtllqVk3fiRGYHVyvCo37Lact8UzoB8qxF7MJbTW7rKS29s7 ObzSOyRPL0q0nrex4vB3smUid1LNC/SzvJg0Mnqdu1tffotika3Zv7WLqnA1y4fJ6t04SOMi6HEf lMi+LYyBjpYDREoLgEktZSpKoqpjJ9yUXpekUqI6HOkbg6GhudCSckzgc5GO4iDSRBN+aHcwTKlj tudiR5yJocdBI5dqRg3JFNTQ5l2oprczt2uZ9/LtEpvfLLPd0u/DlUY2pCWSO1zvJ3TpCY66XZld 36FFJVoXrYiupB3dcmPR5MeBqLtCSKLlpZdw4LlMLKhgnS79/evvr6e53pSng7sW2nW7nJs2cGnd BZtg36HhWNONMznbZJPexTPhtZmhxMs6ulwYNvJlEnaka0Gnm8EjY0qdDq/L+LtiRo53Wkam9S6R yCmavS6HP1fP37mX0Vkmr5uZkwkmozGEA5JznYRgMpWEy0dO3pkDWJdcosiosKG0L+iNonkiCUIe Yx5jFTuTKHqr585yfjzOhUzrnc3ESRp5yRXrLjOEImB3q1q727CKMeFlrAIodDoanW5vs/v3sCRw UkjWpHpJH129HNvb5jE5594gUUYeG02z6q95PbCnGcZmJGUeAVIcc+jNyro/1s/4kR7CNPmvqSeD l1DHB7llIV0rh1MnXMfhjBfxmXOwwmeNnlbwzttyGCVFBSSQ64oXZLCOasaJUy8RplnDorwu6Brf rCSIVCbiChmNFir26UWVDFkUftgK9m+4V0Pg8na+h4u2RM9LPPz+lk+lmexsYKeD2tbYu1rMz2sV 2Sl2Bgs9zBIztallOCHolhwFDQAXDIUDge48DYPERPiSJH+1eNWTJtTYkizO7bWVJkws66jMkFW9 qDJsoU9i3KVw4S0pDUmOET2fJrnznpqFeRXsAfBl3wA3540TpEDypzTcaN+wVNRuJERnsgfntOTH VDtGFhKCQjxVePEqxI6gSdLU5xT6ANqiULB68ybPqT2oLTvNUk8qIdXjhtd9ejaeNSN79aFp80K5 9baUSOzpHL021SM/UPZHXUdvn46uUcySVVfX8zedeyYIZnFd18N5IaiTkKK5s/mnV9ebu7umgic0 YlqifruENyo2EfZGPRuPq3pPlAoytgVLIlpEf0/GyMFGVlk2pYN1iRaSZqkl+d3vzfBm5JkuRsRx AKB+xFTFO+xBElOAzWy5iINqE8aiuuYAxF765b+4RPV8y+w+oAgrHr3t5kMav5mMrzGlr2VtoTMh XlJWtZeWUAKGiZZ2CDHj/VNbYzbNKrrWwsWKsgutD3xTAXWDyVj/jhZrkmbawUlkjfX7bFxcjBIz sLrFFUSK35dLAmR8rDNozz41Ejzl8LufSeNZ8XGqssGVttFKKQuilpHAsEYCFBLKhG2bT6ZmCj3a /ogd3ZHhCoRKYWYMcrY7XPugWKPOcrp/ylFL3Lv9p7kfB6m+AIz03wQCRkCqlUoNSjRxR+wdCe8t YhDoGLygpoEKxJRg4Rdxj4phhvvMhdBBNuyZmmYoLM3e9dpJUHcZg1+qMejFiujhfccRrnbdWYSA +zs5+VJsxYMFvjHWMQxrFGL4kWqFUbPiMRV0435x4L5iQCEMyZw5QgD7VHMnwmcoizAxWZsbSM9y zh+s+TxsWWu1wMc3i0z7nWcNmQdqDTj0aa7U6dkiOEyLqiVFQXoY+OWdpriT0SXWOTlYstuYKaZE 7ykbdaSLJUktVPTZPKkqjDH31gve/lXHBgzRJmoutmXpdKkoet+7HlImJAKQLq7eQ1RLNOusCsc1 qIVC2QKK0vQyQoKqmhhJP1bG+pJt6o2v0x1y3Dm1DWXsvQYgXDQQN4kM1gOqChPUqhwJDLJ4gZKG LWzVM3XquZuLMUrQyojTeSZJTJ+xJLItApmJkWI1+RXGrLZXAsSUgoKyhBJjmVcUiw6a3faxzccN TdycbZmKzWg0nHPIbJ5SHnK4XYNZI7kz0dzu5ZdKbk9EQ078YPji49mOxeRLe2esU8ji95wjzheG QDmgiwv9HPwGJ6uQN+020BTF/C+gS3ku0CEVtqMmBjKnrMwhHPtZ9abW7AryjickqG1aFfdGENIS jdG2tQzp2YF6gdXXEbDmhtED1XZxeWMYY4Cr7BA3S1T1dkY1h2W5t2Eifbig0/ocvud8a0zRsHt+ PRsnLpDsayBzHaevTse3gsQ4z9gUiCnOsiB/44/4//F3JFOFCQo+3cvw