# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@sun.com-20091028124831-l34xkirry2fu5gtd # target_branch: file:///export/home/didrik/mysqldev-6.0-codebase/6.0-\ # codebase-bf-valgrind/ # testament_sha1: 9a99e2f0b6ff080084607963e5f56d04bc56810e # timestamp: 2009-10-28 13:49:23 +0100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # next-mr-bugfixing/ # base_revision_id: alik@sun.com-20091028075205-tl99oyiel07p8irw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSW4NKgAC5R/gHRQIAd99/// /+ffIL////5gEu768+2D575XY+vo+9jQAGjVALbT7wY+t7ctGihQqSejAIRQLyNFCURENTAynpqN DTTNA1DahiBoGgAAAAJSTE00xMiZFPU8p6Q0DTIANA9RpoAAANA00ApqoPTImJ6aQAAAAAAAAAAJ NVNJkynpGk0aGymQABoDRoAaAPUZBoGgikiGEaBomCaniQ2kPU2pNqGmQA0ABpppoCSICAE0ARom BNNCp7KnpDQ9TQ0NqAAD0mhWKCIJ/aMbrPTSslp23G4T75dk/qJVcsijFqLNGK+qCygqigdPgns0 HYPeb++uLVOLYnJcEihgiduo3bfpv2EDWa3buMEcMOioLIYkAyVRlTEyhyOes6seFWlbf9KFScaq QyJc3sL2TOkwQ0mSjAtUqFpoOmi65olES3KUKAXLJXOaZh3tRlbTh4FTUO8KMBmijChxgM1hgdcB APvn0ITsh0ACXxZ4ED2ue5EREvYfx/X+HsMFUtx8/t8yPsQ0pRAVEVViKhEQgpBZnycMgGwmXFYE AUSRtbr6Vs6S0HUqhhNkVDU+EoLqMFipi8juyMps4bCG8QGpWmpdYXBknCw2TKSIWGUSReUxQgCB cYezCvWREOUosXLEuoJqJoHJqmzg2UUyDk6yZMmTarZgkragOQxsiSHIUh6KxlVux+CayeZNnnnO QBuauMIZvxzuKYHBGng21JBylUhCAQtOJfNwoclZA67mvT4zSat1hWtxvLReMRaIcjOhpBjXZR8t qNgWiUGSeKVAhiYWqiydlK0qIqRlK2QidvKzfZ+CoI4JglXT2pENnTlUEY2cibTV0IW8jHYSdNfi Coj1IbE8LhlHFyF20V7l1sl9+8YKCUCeapaISuPmM2JSwqMVkog69bWOBVFUVH4IqjK/Xc9atHt8 /ggX9KlPsPfe0phzGQwyB2EJxkkkMg4ZTBMrikC22ztYVjSwqBBfvPMehdelFzHGjqeszioQ2GZY PN1l2jLAlACDuHbnfsnR0IqewMRpIm+Cwrd7DwwGy/CdO/0R6oZHqhkSKAha8xHkLLxx7CisYdfi OQhHT1f1csvuEMTiI+YluUxIyLdCaOzf2CICMF8d+BHJIurHN72tlZljsmzsSYaEhIWIvCjQKGeZ dsXujMBoRsmPWRCFubMzDDQL7pod3RibeBrsj7R44pIwaUh0LgyLkLWa6StJRhKNaLCtChXYbVdX ivJCmOtXVJQI2lqQpxGAUAQpE4oFFArVEdTaDCgwhEyVCCBOTk47klqf+ExjUriXFbKQYjaJEXFW 3INVAgQHLYEo0BCtdkCrJMLJAlv8aWBsHkDMWkBwwrOtUbvb0cN93Z0TUIBozZqdHKB8662heAYL EBy5gimNhEl5rYFhEGECckyAToFwILhZGy/cTJERysLSlv+E7yAk20jdeYvLhj4PjhHSx5GRjleY Ba8zCcrBreAJyJp4kR4KqYUyRZjYSOmBS4YoXllpAphDlUWw5+YlPK68ZQjaKzmlASwhQMQSsrOj MuMt8QVM1LzQkkJxzpWpsXEOLbYXM0meMx30ZoRthnBrKxHaJY74StiaiQq2wUVgMnIjD0KNoXlZ Dzhde7ywLCZgNIc+yIlMHiJUo9bSxh4ERmlWdCdxgSrGZoakAuP0RkTsYTDAgqO844nAmkt95iRG HGJEi8wOqJkwxICWKN27NYdyJfjYI9EfFF+q4aPBpvDI2xgO+rFN2X4EFbISJcBj9kVeQQLoQwEm oNVNgmbnAgvGLYE4OcyUDzErPJTLdqJ0C+8hUvJFNhGWBq5LvpZSpoVK2UU8KFUpDHRHJF5E3EhF 6GOWZVHUvN5uEiRUkI7BGqJCRpdVnYfTTWL5wYzI4xehIrCmEFqhUbYTh1IwN0yy622wiQrS0nX4 NkI4mRC5ixgbkZRxvJkjL9wxiNiJNmsy2UHiMI/LzZiHEFQyOJEc0CpgUC4gVP0RzBfJHVdiKCXa hn2NnGbYjUjB5mNS0yltc2oOL2wLlNWjAO9sYpSH9cCDbSLz7VKNlg8JmStIqpEoNScEQvL3PE3e PLHXqchHcZ43Zv2Vi7EUrNps2Vnq1oxvd0WkUUbdFMMOzNeMA9WshUkIW4sHJ4FSQd7lDDDRIcZi iGAiXEOBDhihvUhqxXLFqjJlWTn1YuqybapsJ76fstLxjsoe8MWrWhio8zIgRxPAziEyg41SAwnd VYtMhjYGt8dWp5TGThhrSj6SFjCpBKRi5xaXjkzuwkdx0EiW4r4e0BFUS5XbDZjhdV5QevHbZGbX G9ArpNYPMmRe2LlkS0nwwwZoG4lYSIGBiWnuIljjkXiR7F/DhpkczXZZgVoQTa4EyK0ckci0sIT6 IrC68aTalUS2NYUHYc8rL2tN5gRTo8PPhx+chK7Ee0uMyQ6MUYIkvl6dxejyRw3GtzLfHpjCI2Pa 70lQlSbVSg0qOjYnS4sTIWQEiLCTSIF5JRRU0ISYSirGbYM5dzlOK2kFsIFJPeMMbTM0iOTyICge uclFmvNgWQb4yIyHsNSRgUOZswLyRMsMIiyoSI06SVtheptH5Y11tsR0auYeLMPnGi0DlESCgywM hIeIEhUQBC5GdsyhDeVJalOCzzLTIsuzqYv3QsLxCcYjqYkUCXjbHwMGCz/LQ3EuM5AuLDHQ0mYF B4CZyZnNDvwUazpqg+/tnO9xeQvE+LbFx5XVit8eiC1GaKmsaxRAF9XEooi07E6FUo9jFH5pK2aV LNBQLWysEaoY2uKsDtVgS4lBzPpNBCUUTJMnYSyU7hpAYA0BUc5kKqCDJUSCDtwRgmfKaAOcmyaZ UVmMoVpXjMVCywSFGKFpDEbfVLej3aXIFgQOInBB+xLw+egHTzXmYVYgkQWPlIbVeP0ERJi+83ax TQHSmpKH8n9Vx+smIN4K6Q/UtN4bCN2oThJrkw/yCwwmESawq3FqxZQYf9Fcj/1Wk57tERFIWQOX i+pd/8v0UwZbBaoqiNSi2o1yWeAszLiGv7yoqCgXo2KbJuhU/aIqdwtpojLRumJkZE1ktw+9wdM7 unPkPqIg57w5fUpzi72l2DyFBQnYXRJAySeVUySj+UbmKBIoEIFv1/deBeXAi+iQ7MyGQqQvEULz vmnhIV3AbpqHoSw3BPMaoTAUCVjjyG02nnGm0YeYWNOIqJE1nHkVCkaXkNAH0Rv2fzkCZAa+05Oc UDpL7+FWZwK/Dp+YZflzRmSXFO2CIPv+LKWUnuMZWmTqR6Z9ZvqmKuU5mfoTNr2DnIFevV5azHWD 66KpoDUVJhDxKHQcdlhGT80WsfjgascfbpH2PU2k5zYycw+DnoMIY9C/VFxE2BvkzM8UdUaa8Bxe ZcZUaUL0NySdPWQQ1e1CkruI/1RDgjZ5CSBkI9BgOJsPqbi7skdpxLCw6HMw6lOw4g5kfKy2wtGL CvE85HiG780ImB1HB0Yht21NA0N53Bz1DowMltN2Y2LETVOXCkrmIUZB7oNoYzjX2pCBWBBBZIIl 7znsmjh9Cde/rqQIp3jJHxY+biN8EWHj8CVDkXDGJyMOoMiJihSMCgZMXiUbzsKGHgNEpG5CT2Xn gYHcVMSR4I9cSJQh2hDCJ3sWHeJB6gujuBpINSWJpS0BMKZVxa0px604z2kpaZTTRUR7R0aMvmfR oUl6dt0bPGe2sqms4CPiWW93OBn3Dj7Ds9hnITCjGrVuf/GDngZDHM52FvkTB0YmY+JmJFpu1N13 3PEYDihWh07ibBYyZlxDggLaJJzmcthW2MgfXU7c9TxRIogs6Plk/I9veWLFduZqOOXHO2iYiShj TLy77kSAcqHDCuogAI+/8ykbWEgodcBHmKo4gmyup8I59+A2Ey3EReQvhgGHccpIGQxCaCLDgg3G ePor0RMkkVsLg5rz1+CQmf0PA9CJMR2nkVHKm0+RsPsiKS8zxO8gk5gUOEvz45FcS9xi49PS4ifE dGwFeZwdolunxYoTu/USztEwpdRvU4BPAbi5WRXAmuolaQ+sx1qjitnyLg9DyPNiA7bOgChxDyQw JcMk/epuB6YWAII5+VNonfTRYb80lC2P2M4uE6xMwTHZYt8kni7UrmBnnAZSL+aIYGY6oYK9dj+3 fL7I90c8po8xJE0j5omjXdqzdTwL1l4iA/tPcSDRdy/omBcZBw/UxUFGpikOAmFPDSKFI0BYNkEy hmVont67jP8Ztp7ORQTE5eIAYGoWwObc8fT77gjlcyhYdWE/0qJHqNohQxMGIMjQSmUUIilWrrEI NmRhfXduWH4NMYshx69Ipz1PdMlT2KWJd8cYxO5N9itIu5KQE11pJPR4yvsSGRLoEmhLruFsFNop sR8UWJVxdpXFYBTMnQ40kmKzVAEhM3TJTvQgOdbP2tRBgfyIw5dAx33YwSJXtCHQa5hyNekbkXuT X2ID9/3zOKKHzMDqnGKoi4ITOJEWEOi9HVTiSZJkMMADcd25G2VorRKZGhwyR6n1IBwRO8hzEZCR feMfcRiEDqYAsxFDci/oNpYYUY/swHjfID+uTwkKkWEhMe6HcFQSBhEVYhRP1jUGikDA8xoICZh8 qnDOaChMpPTU2COua7BIYRRHuhi5jLNMAQYEfBYr0R4IkKWFpiMPajmIge9mmRG7RHBewFopN0Ua FgsBewlJIDgnSPfvI8jSnVioCa236SxmRAmQxTTPUQZ4DI57JVuy6z+l2JUiGTk3Qx9KbGQlp4Tc oYi8DxK8YkvIJZjTZyx5Uzl0rErTFr5y7splSGWNCNqSCpNUu7zcE8KcRHE52/ZEfXVJLcInPZaW evui/IKsDu6UYJuBBJBEsjlEURuKfrBJVJ0L4LBEgziROcDuVUgiCVE0P1UGE3M5DiOYyUFMxGGp 5j8QEr13zAKcMSSEnE4usTclzbfcDUpF9KXeJURiDODixsFuRFSM5uzHESYcnmRtp1lGI0/OkaSg ThJFsyhIGVpsj1JVkIuQb2z9kf3GxsHo+kZgfT7AI69xdsMIH1X97wo4KwFjmITiNBLej9dRNeHs C+Axa447jjuOO44/8HBDCHRAdEXHQ+aRvYLTBOO6EUSTmF8rIDMkg0YP3iQpU7vVHaF7cy/rHHYR lMQ8HOg5iN5ETgcEufLMcCkrChalLlIJ1AZT3QYCokzQvLSvJduGVYCIAgWnIhDUK7oISh5EKapC 7WCuGXCQMEbUVvzSzr96oxEOE2TZAhNiwSWEnWtWCvQPOJykJE8BhgXwJaTBrBgbsap06hO8LpDP fOygfO/aYNGkxFZlKuEBPAKbjllmFGmgPhh2tBkiOF4yDMJoaThgIqjahkfad6NMO23kQVRaVRQN pqafwomHQR1pzSZnSnzt0yWQaTYYF+RKrEjnoElZ8HNLE0OfoT0bUhNyZSa3JpwJRe3Cl3ImuqYt FOCYhaknVcF9Istm0JuY3281pnLZkkLrvNgTFoHBEET3o4LNHcixeBXMzR9kskNIylvBYHDY3TVa b0zkJ2pqTyJuD/iB/8XckU4UJAluDSoA