# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20110414105657-7cpa16h9ahahbcn1 # target_branch: file:///home/rl136806/mysql/repo/mysql-work5/ # testament_sha1: 6d71732cd296bf16d951899d11e9a9088c32a0a9 # timestamp: 2011-04-14 12:57:18 +0200 # base_revision_id: olav.sandstaa@oracle.com-20110411093534-\ # 4odxrt9fhcl6rj8c # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYoilQsAD19/gH/4H6V///// //f/6r////9gIJ3c4V2b7i1wDNtSbM2ZRbMbszp1hF0OjpSm7A43z6+9Wto1rZAUsDb4277mrtoE Jt27qKzGtgaW7cgSa7vKu9jbudAJ093bhiIIACZApsqn4ST2pMjaPRPUjJk/VNGmgNGjQDIYmg9I GmgEQJNGpqZlMTRGh6mTTTRo00A0AANAAAGgBqGhUMJ6mENNBpoxMTIZMQDCMhp6QA09QBoxGnoB JpRCBGk0yFT9PQlP09T0p6p6I/KJ6ZEbKNGnqHqBoyAaaAANBFIQCnkIniSej0Seo9T0g9RoAGhj SaGhoxDQPUGQNAEiQTQIAhppE8BAmp4p6p7JT2ppP0p5pT1PSAMamjJiANPU9N/aAAM4igrfD1sX vT3F/+/PTEHNKd/2MBHBICdmfZUFgSPK4LjClhZ0pSGA8UDkAp2tSQFHMJKMCoZSRX9rMulmVsxD iEChyigmy8OyanSoh0FvbOFVlUcf0/3+zmOZnGPl/Q25PzQ1QFku49tM6Yt8yGAj3uKPRucN9G59 abX274Q9hp1cc3wohVSVegtGAZ2DL77MKz3oP7MGkyobvQ1ooI4whK75c3nlTsdXL3nJvQrf0MNE eXQRxFnXpmej3W3j0NYGG7wjNXeKrbsr3LFDoo8bmCSWbfD/fPdGPJUoXKnd2MHwj1ocMffsoxbh 47XlHbsvR7HVcpjVtH8OV27W8N6WeS3xzvw7CMRNYJ9Ghg02+evnRZECFhYz55scsfTduFEdMTpM sZ6MGRIghIc2SH4mQ0fQhslYeDDDJMsnTTt5HTS51wNJlTOsrrkOS9saaHmHdmYhVUByHhmIZXQt S4kudaoU9NKqVpxmsU7GayQpsiYMGeDibibxlNowZ2c1fUu2thATz+hsVBctsCSCBzD88cWf09PZ XNpIQZtJIREMXSwA9DQQMJ7E7xNBDigmtk191gb0DVA76bb8vtsCeRIcgn9LR2N/LEhlSMEgjJIo BvSGWQJlR1elgaskjq+RgbHrP+ZS/DZblfccnqgdYMH4uBBtz4y8rzdGczPvUWJY36zEIB6fid0v lGrL7YrEXA+IJxJzGusUaLBZQucg8B8I19Y5xoQNoQNgAfi6Zh/2IQeM8nmi3k8kTgnT1n6vjsHq MBPMGr1N/wb3nWzlDtG5K7EyxCAkDdvXp03Ipnholnu7SCjmrxdWbu6MsqBSmJOFOWaTAgpVLYtc gJVvZCtWWyMxVgfhh6zLXmJUmQ1hBnNvF4c6YWhkZAXDLm3WWznEwC6AXctayIdDCoHGAzOMUwGD m2YKQmKtsycREOXl7c5TGMYlCQIBbOKy0BBk4ypK2oosSWKQ6pBEmZpnFRl010GYxmUCsr6aZeTF PLhBlltVOlW6MCsqBRwRFUblsyaZnXt8HljxWPj64X0aqYo6aiSe4ryf020CAB21d0IsI8fXkenG 2+ru9Xvqu9JC2xYhU+ZmOweYyTCA+PEU2jCes++WTjUXsMbmN8YOSHAd0enZOvL4tcOpHJEYubGU q6VlNcGNjttPV08E2OTtlfPv0MbTiybLjU1imbdWGAN8u09yqQHMNFW4rsr4qt0yqQqmi4YNlFhC XGkZ0Z3wBn2g9mm2mvGsJHMEc96ga6K42+CBxou/JdnxoNvZ1YHrjqY+WP0xxnm0RaFQxEAQqdtk 5Zvff3yomM9OFkRZbdavqGnRbaMgsI3HEXTlwsFrq+51If1auE33kVu9WmoNijKUaFTbPDLsPKG2 sUCgtyccTAPdK7dBzoPgqo6+pdQXgd+yiYZzvO931Ftfg8cQOZkclG4+UBCdkIoZ9yeSDWI0YYbp kE07EQ4iRk4NhK61Lq3bo99GwjsfFnqd5brMena9AQkMUBGFb5HaMkuXZZ9cogSDFBIWY1KC4HHW hruyeOBF1KqFoh/K3WXTdCTTt0giKomIClhwrua8hr2xQeEsiSgxhHZByaNSFXNeh13sI0thzQj0 93FdYhhbd8sGKqQ4DepI0D9WBWocpOrdTNhdbYoAotbzKcbo11zjcaiqqaYjTPaRbFQvZdctUMZM WkDOnFm52CId5x7egENJKOFYvgFUJWbK3ehsHuuGdqFJiiO0c8hvx3anOkDiVfZu0y8r9XLoNDlB isdgyeTcMHLeCn6cy50vQdT+ds43rm1y6LAe30o779qDOBsNMhQm7AdbJqiFDphiM8oaKrndAY3w nTbxthoBACv22wfmKenqYQvtM01YhDYhnXCRUFeqAwB7A7mXXCdmFvfK9m1iXe9GZ22fKXnGj9FW FtvVB8HHWGojBsFCxUReNUFeLkyYBIVV3vAyHfCqyoKAIQMRQ3Yqy1YoiE+pPi8+a5byWUTztDEc N4QR8H8F3+Xd7+3d5h3SHCjfPjBryJXEMQUzSNLBsDWwu2x9vmnjan+6H/lbRd67ROzlKi4QOe54 HcsGfc4UTce/tPv6CR4xCFDRAsVoCW6aL5AhRONC/AD+9zGG1mtXTmCM9JEXHeD7GBIk/++HrpnC DyThiQYIXMIBZUrq2eyKroeM4T4m69C2VsmwR6leg6FHL6ZkCqj3ZZde3WiJR9VEQEejKAGllVmw ewJR0ap2lTjYL6sttGiyULIP544OMR5aEwEWkoQJqwYXIxU0ab6ztBo5OEntvv4bUvYOIB7BGP10 PfFQHFUfY0HPakFgHpPtHPQy+XHaN5mM53ZZjOcouMXDvg8HZnhi7Jk0bMNRDnQ1PdTmK0OBDyFl 1lIie6+AhAzhB2uaEUvI5hCljOAbr6ZULmReWx5iVrZ6yrGqXcXnYhfXmelfSBYNoxLUMT2kCJLd KIe1JqhQ0DAZSJ1RAFZEHN9RBdXWg02Km+85QceHN50BTp2zLO7NGsK+ju+kU7sVinaIxgYkb46o 2d9AwKiWuQZZ5mKCR+C4eBI7EQLrTB/qj8/n9v90pqLgUGWWo3HAaPt9HVwvRTmI+1oRVpK5lzmu 18+lgethhFANEUPhZDCcEIsDKkFmL8RKI+nwytbPOAalnmZzyeYZhVCcFe2++Kp5t4Aw8EENgoEi ARAu6iBIAlUYpkqal3ea9NUbIBiQwUB01G5Grl/+uiK/YIcIEDlASAE1O5AYgaFNmVFVUe1QDQu2 +IV7iGbEq9xjaHxb1mnto0Rfxn1/SQbd7yCgbfPG3skD3upQPShUAiFzHj78hY45XPBCwVNnG1pZ Xzb/Y8vRotNcmi/NmFHonGZONVYchJNoDhcQF99KzD4BqxAkvWNtVaDYwifm1TLsLWJ3PUSv42lK gZZAQ0KkFgRFUN+HnTEeHI1GlxNh/sAQmw7hPj5j2J8XfADgKwDs0YT2syDMxJQau9MsYPlk1InC kTeieqkRiPW6J5POo3G+/agRrBGNmDDThq4ZgYjdhZDwrQavLRNuws0t2HLIs8PmBiegZsvtqg7/ AN0sIMlANwZW3IZmMHZVh1lVadgPMLc7KSBcTTgODiAXYQZrCgNriW2bhG5EWZyqkgKueWSYZBZN sWBgYoLOPZqU8RkTgcTDOR1DBQm4a2RyjBo1MrJaNNYJkrtLm5q3pW1mXuyjvgcjgHYoKxOLgAUj yoAYchIWNjUqNYEETjZllRBQKQhIBssAINbPpnOLm0TBs4pApXzKxObCHZFbnrWJkZfgdhrWCNOW OjK9teOAeGVwot2JWrW6cLhd2l0Cgg5pgHKAkAnJTDYy4DFAYUZQ89w7XXAsN8l87b7CaBkB8SNh bTqtaYFozjwEorhSZGnKsrwixfp3kHVnt9A03Qcyppp1jfk/KIaZZ+JYKeU4xSxLnqEq9bO8SFZc LeIwYSRrm9IeVUqIaS73YA83Ielni7GcYpkRSUocsc4M057tWkaaxv3EioFCq3FgzzxFqt7DTeNx WJpWqN2ZVWihareABdzl4oDKUxKvnMRSqTF58r6cur2g9mNRhS9Ft95rZtmUSQLsysDoSdx7zhnT QUnU8WGUPC6YUrOngzo2Z7AH8QAp28rhtEhZde9gVrslFrk0cw7Swi2ekNavcNN5VXV2XGo0wQPA N1SCANdMFX2jgU7abC2rZV1pkRiFqqeCgEEAkqqKQm+rsSCXKKSSawyPDLsWDh8TGRCizGC+xop6 HhEXcYJXPWezIUe6hDi7ZSd8Y3LcneuNJ2y8Clw7NWFalAesEXLx2NBrRktCM4y70UMvmlcrIDmd IqvQypwBd6jOC4dNLtmJPA7QBIl6UDzJt5+no7+hZ+Uu3YZh4BLZLnRva3OeuCKMxaq1NWmDnsiq wRa95HraODM3q7xwoN+36rozqnUUCY1y66SbFPH2yC5zZgzmmS+axRL2ziXHzQ9GGhr4g4+oTQ85 XV49vhXfULGoj7jvs7RgYKmf5oUsGjH4HCKEbWcCHKz6PDEULEmYt/nc4mY+eCckCIYW1HtwF5yP VQmI09qGXWV5f+8X8VB2o+kDpZRBEESHuqNLZ+bUS7POOk5B0AgwHGcmiQDFjAgSGv/YDbLwmcow bGaYFTWiZWzdeVIj+oxUf9vDx65f4rAl7iJK8u8Mt7E9AnXSxjs/XvA+o7kNp1Aah9fXeZViL2oQ yHStkd1wNlCqCOh6mH3pKYHMy8/SI5Gp+R8Yz7KKKKLz5l5dH++DYZz8lDaHm6YQwQjnic9Nrjt/ /rLnoIjo3LLHpKGxhZb6AaxzT1JJnO4Ss7+KJxaPv8V4V6pft4ZDnaZ+BR0AS07qEcllsnrnY9Qr yPUL2D6LmjGE+qJIRnOwHif790n3/QlsfnhPwgX7oRPo0x/O2DCucKZ/dhCZ1zsKdafZCclmFpKW Ei47Kd8e8UCwtZTGdZ+eWkMnRI0/aFZwSskQSJwClYKS90WMRVzLzJrMaVJJ0QTAYnLfTRk6E4pt WmeE36aQ2oqqI6wwCbr0gM6cl7HRaxUWbTGoAgFmW1KgTtRjYm0MDk6kwAosWaEk3c48nOIaubhc VA60lUQny1jjZbYMD0lduEdoMgIOcdw0He5XB5oIBwTuetJWBJFgsgH1iB0B74PacedoTEpOcGpB CYP5Bh5fqibz32R/gBvAgDQuwiFSMvWto0KtDOIiJhg60oJBtEQnak/qTIJJZEiZ4NnORmajmcUS ppjwN5CzkSSIGKois0g00LblttXQgAYRCW3joykhG1Ai4FCTkYe2YsEUB4c5mIJjEsKZMDUoakFp UyyIZWb6ZsgFOMZ6yqC6woslRV8BNtrbEUDGtUPIaa2YCsfBnfn6LbxDYqMTPR9x2Gg7ScjuPusC sJTOZdzNRsAmSQqADF0N3RIBo7vfS8mdo+tJ9qtVS+uMDtFWBpgQNCQhlJM9oNfwaKUjH4yLCaaX hsCQF6X3tkT5CD7uM8HROecfoFLt4MlNcL1ziWXTisrCXMGtDlSpFSOshBEyU57BL9dfE7vLJSG2 JVYkRLBeB9DJsgZkO7MvHkc1pCcoa7FdxYgkJW9fj2AdADEWWVqc3j+Ob8ycfQJkyEkkCeGLkjjG yWWTxhHCikgn+AHtCnq8sPvm3kYRfJJKtFO2HRz3nyfexiY5lh4lfzO3+uuJwnIRfsJzBHpzQVwX p0xPXoUikVTQZTNAtaqigI+lFyQtYB7y+rs79tNvx/JkPmNwXznPkLjdBJOkDohRWBoT5w5X8QZr FCXYnebeL2OrhOyV9UjEIpynBDekCpIlpUr6gg4d0KevLUs0l7DyXDXlg/MeIj5P/DbmzXCvGvcE orNyA3XfN+W7HHQwqklDkfRL7qiyuGyuVMD3GIDJ7oocarqdDjCpd6sHcKgfVkax3oHQOGmLWGiF QDQyyKi60HG3b6WV4xgWBDAaFCSCKIxqoxnhbqtymXgKp1xj2aARZ0ABKEkkoTK6zGzGSmmk5nzO v46AE8L/l/2jGZ5D5dRpy0aSxG3VvsqnML75nTWE1E0wK1Ft0kqCybnQgmRYIQ1SdkDtDFmT50kC mCdBTrPKHUL6SYgGZJvCofvw40tpfgmTOI51bEI2S2UxfIWsYipWmBbRjOu4ZGKwzmQrNLjXaAY1 YEl5fNoDUB/LsfLgLGhqGvg837uyUhXJnpOk2GihdtDXt+Jvy0ydsk9V9PnnMCfL7jl/RxKKqDgW SoagYBg0lvvNtcc2mDTOspjON9b93Ua5CJJVWhthFmYhv/ThQ3kImtJpbwe0y5xyzcg7OqywJi8E FU5CwyKksrGnSvkZQhlw1LNS7IWoJGWjTGF6RpBZO7o6+qZKLSvaLMNLQazZASaob2Q0MY+m8teA HYks5qnSyQoQzZJNBzYDH8zekwRmNGrIDHkKCphJ31RQkvgmqyXr5ORlDSDTiSWGSWrzG5Ac/5pC khwxuENAQ0S6w0dHWEzmp5iS6Dz8hrmNG4TDYErjvMl6x1pCT1p4pdJpUz9h8ZYLmshrvGKJCyPC caAf5tC1l1y2TPZcoMAbExFDd0okVYZsF1Gq8SW1oQry9LpyJ3PRfcX3sCljeVMmWi/d4/uHE5fB 9xPiAVBVVW0qsYokQFpS+s9AFMQgkTsJ4wLyJmB9ssyB1TJAPqSLEYIgsATPUm0mffJilZQxcSIG gwURirMQHfkp0APlhJJsQNdyDdI1zNpJDEdpgKRyMIcduqS70XPhxmi9JHn8KMQIyfphfkYfwYe/ UaeXVnY+iztA2pNSgTbbC63eA1KdQ04jxb2afBakufQHBYVHTvnm2ONPFLVsGEFFhilBwn773YyA foEkAwREkAAL3uIxAjFuUT3c1qhgG1z0sjMRZTnrppxpSsbJAzBNY6s6pruzbEjCqCRvgwQihEEx cvm7N9Ay15sQm02xDQGuMZ5aEBwNyRjAWM9lqwTw9uGbQ3ceInp1O4Xo7pOdBxaOaa4MR/IXNl3P oM0Zm0VFQZZpjbFAslhaycCazJKCAxhP0j0Uhz/UZ4VYiNbYSifh1rPZ6Y4bQ77LbfmLZ4W/7afB nX82s2fybXgMNj6bKqYFgdMYX4nW1TQVyNMLtNh3jN7S7jk+chUOYcUt/Roj97Pacs0XXBsL38CX 0FUxbEwsolUKwcV8IfTCh6kpazSwKgJSaDggWlYhtDxwt7SGhJ4jt3JVxBlCkELXCNgsyQMHqSQQ 0axzAGkCaEg0mjYjWWgy8pcXKaVrZaQTaNJEJeBoIbaWBOCpftLB2sw01WAPAi8AwcT2ElTGefiX GWhBtuVsYgG0MahkGTQsnIW8Rmc0CPqdZ5vFAOmaNhBSdpEWE5GNdpPU5gwvBBmDzYVhNG3QqYq4 On2wbaeHpwMgTFJLSFR6ZkewZYFsQZmcJe1lt5hYbDbqLw3btc8EUrDGAuIYo/s8CZwaQXSkYOEs IzFwgUZKIYzi4lzjApK5xjCNZCtiEgooCFtK0yXiBiVESICGYMIsNzHCaYcrAVvEAwAKFhimAi0H drmOIaE1DHMmNuw0FYr7WjBAQ7BhYrPlHyJp6R3Bwd7ABgIkEZR3vMaSMRZA1FRirTBTGGbSG6bT xF0iowiPGTwKEk3YyWNQBYFhKowYTAOAmCkuJ+PAbu40mEPMcnyyHxoVYm/ysCRpgm0PRxKKh6hR 1q4Ki9y0CR0uIDMlx1FThUO7ABEII4Q8XcILSt1K7Vw06zn72sjQiB2EnwkPkc0kAfMgLUTmUQBD L3OGF2WZYA2XggPOkrv1nuHAQkywb4jtOcMl3nuoH6z6fgqP2fmoe8YcN56OQZaLA+Jn6MrRQyjM l/jJLDtgbtZ9FoMIskxNfOnebezEXWuM00HDgIIEF97OtnUhUDxx1gbL8hK5Apal8p9AfQpCOvQH Vkyx9jQd550gKtjA1sjeKBL0NEkaQMjiJHVAwYdbOhD/0vVlgY8/fdL3HAkhYDLFw3CtETXeONn3 +KXyA6KPbJG8NWRIF5WYs3M3YQrbBbUCaQfqSQwDDzxURIeL7jwc4YJeyR0XnMhfYcDV05CINZcj FhDcYCCxjFFFAqVYoIoiCyI1B6IVgn0CSZPJINhYw69+STgw2ApZCKSOMkCKAhNUTIiBf3yiUZEZ B7+WJn5B7yRDJuCn4cfX4aYfOBZEjYKIbVyiEJwMY4G8oEoB+aShPY/jIV4+xyczOwVFgRatVDcw t8GaOdUoJpNHgKAf4kqqzHiz40GvIKbRHl6vhq8R+bBp7efTCBnFxglJAmbnksFJpVPQKdUmAwmE qL4H2jyPx5l46zGjNmie9l2hZk9BIWCl4eQ7sQiiAooMrg0yKBEdHWHb2incWNAKVKYChRJGPuO2 BKMk8oeFOJCnUoXfEqzNxvD+a4kObyXz0DqcfBWylThjUufWyODttsWKKo1DLrleo6nYhzsgNIHw /HKPnpxfcgM0DnB4nvswRd9uSpJsG0IjOtoih7GQF1cXe5qjYHijxDS7mgmHKI8N2ZRGCPdQzFGk SLdhdIZUz36ARJUVYQZSC/dsYJziknRKhFPazDOIebHE8tU3P3E7zvVpz7Ty+011yW007IDGAhOu FE5OCzzNzSouKUx2oJZNMtCGDEwwlQrAo4GSjMoMgaYMkkGlTyA1gsiGNQbZpXb0U+ETyK6N5CJm FEgRcns3iVzV/BNxBIbU05VvBFGrFzAVFTYqHgMCCUDI+ZiEQyBVM5R2DZIDgGMMphmGGvCyShr3 4+OlO/YvLWb8TIbtLMJk1umbhu+0EZwTZ0A4hTReilzuxqkO8VIStEXDO8rAEzJF5KyiAsyhYZFz Vk3BYiCyQwz6usOtY+lUUqSMDto1Yllno+8f14uZVmR/Kynrav+WhhJIYFYbkKsO5JVQEwyIkP4k rFh1w8QaHUHUACZfIhUnagHjdB2b5RDaTBoB8mdtg+Ozz4NoCThBLxJnzcUFylQsVCUmYHh1+Z8S ZiiGUxiATq1oMGSZ0pufeX0bQsl7nxQy8o9hPhMSQmxkdhiouEsVHli0xWmEsEDEydUxCnGED7YV UkOi2lhExFZg0aQBxtuudUr2ZzCoTqBi8JNlC7QBMgXYDZuMENgDfjBR7EB8VEOQ6P05f+2MgnQL BD1kJjkRrggK3On2Rt8DPzqQBcJYbknAhMzpiJb+B1Ac00l9LMfLTWvS02zI7HtJkYHHUCxYpMNh uLlctQjqxPiRRWIobJ03FquZBQ90qG+qpOAmmwIFoFBsgiHEl8dkO9n5RyzoI5EpPdk3HROp4JQl idDAIL0hvEC4IHQLoUwhNZDZN3W1jS4mzTsUZ6gVUpJvQi66+e7RYwHsG2WfFehXMLzDQuBAq2aK fKfp5zcVOD/6NsMTFL54DsaP4i7kinChIRRFKhY=