# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110610080400-yo3gawj9c42sq8wm # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 141f031b7abef59e2ddc2f062fcf4a3eeea04592 # timestamp: 2011-06-10 11:04:07 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110608201808-\ # h9279ue551ngalo9 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRuCCO4ACdTfgHdyff///3/n /5r////+YBbmvuvN7rLWDXvu1e98fPm7VOlW1UBPLjt7rpupdJcvvfRz630tSqGEBLLMwyUrPd3t 5a6NtVXXwxIKaaJ6htBqJ5Mp+Qp6gZqPUZGRoA9QBoNqAeUEoQE0yAmmqeFT0wqfpHop+qep6mNQ GgA9QAABoDQCE0hkKbKPUeo0eoaHpNMgAAaAANA0AEhJJoTFPTU8iDap+jU0NMRqPUZMnpGmQA0a AAAIpBAjTTSaMp5CelPETak8CmgeUyaNNNA0D1AyPU0EiQICGpgIEaNNJg0oeoAbUAHqAAAHqekW BpQACwbNN/HmDIByCVxQc2oQ53ZevmlsZe3qlpmsbFEo30mLCO2w6fuOiebU225Z+EV86FCjebYp Ldl7ozwY7+E8ue6m3a5136pVrBGl0LgYm8rDgyODOOyqiRpBl1mqxa8Lxv3JbLxgtQcyA2juidBY gxfUlHeqxV6FdV/oaUdNUumRCEYNH1LTLOfSNN8y+JjSHWXcfc5MMtna6GMr+C+DUg0YUnG61FSq 5LepHwpq/NdFOYsKNzLsKzVWgq+pqTQxw8ujnlcCJ/0z7LiiEjAWplNXSIO1IncoqZGFSr3g85PO /X1oB3CG061arXa+uN3LPcdRh5a/g3jQHlA7AuITbbTbaGoiqGvxyq5P7IHdm2l2mOZf2z7/C+d8 KEYqyd99vpxuEay2Yt5aqKxw0zuKWYcCNU3O1w5hmqfNMnuShwdDkylYS2P37+1ZBwBjCXbp3FCh 1EEDGMZtXFNmctjM93FUabvHiLe0Y5YJmMfBZis1nfIzyUba1ZBCqHhBhXinw90M7zaJdSlvZFmU LHiQvyr/ooF+YLSevuwGke9Ul7Kk3ThWE9LEnKQIszMny4vMZxZqvxKsq3JI6uKNv8M1lZiULbSf zdhaNwA9FO1pu1YE9h4+IbHfaMKcqDfURsJR1F8pcrvQ1Wpa+xqNsFipD5a5JzyG9El15yYzBkCl ECVY2wDAkGZbtrYGhsqiFY4NcB0U2xckDapHWHBI9KWB21zO9Wt6mw/TP7AFbUN6Z2cmfhF5mtqY 9xqclKmDDZ4437mDy2GkHOKYtNz5x5x5SovABcYcbZY46jseRlZ22skwjDVVdcYXccLZZoHHje9a e5uRa/LylmmapNkT0zNtB/chNJBupeTN3DhTQUOZt0GHSVVTmu4Bg/B6nLKoK+DaepnSM3Ra1cpc 9DLPBvSuOeHU5O7OHEx3l7HVXSd1uN900PKC2NJ3vFG6WVrpo7mjsYeZ2j65YR09D7+GLpXFajJu Rs7hXIOtpGjPKmWhQtw2nM7LMXhks4rBWkO5kAFUNHCuXZXr4o380kQ/IPKGITdArEJ4SCsKweAz d28tnfYiXpJkVDk2caysUYQ0En1sUj48O1YQ/D+qJXg7tLNUgkDTS3ssRkuCIEF3uwKEJya+N8/Z rS5ZGeI/Xd7UsjyA2Hs0GdgvnIfrUlkoXoQbUMAjiMa3gIyETT/28NaKQZCflNJ4TdNJcAKc2/dv gbZO1hIV+dwUGV4tghAXGAQoG7fTVd3AnQyce89p0nuvH+cWj9mln3+3B5UxhhwHGZSPNkZGBWRE SzkERjzQGm6w3ZeveVUwvaNx2K1DGMYMYxltEFQ2MpF3jXz/L4EGHdxCMTSwmOiOOUwYUMoaXLx7 MSQeRojCMTa1OzuNcPb7mAEUW90Alw2krn1jQrMB8DyVLKyG8YsGEAguZAUo4XWCRpIneCVeJNk3 My1AJuDK+qmPEi4CkAigE4uqTkmiGxWETqsird5eXli2rMtfbPvMQvaL7RqZoMlfdK0egKl5Rbo6 MJ0NaARaCPLaCstxAF3DqNcrAgDeWBcdpTWqTnok02PMfe5Xu4Ya2N00r5LeILZP3CMqp5aV5LPg 7ZfLHHz6HExMdXTL01A4Z1sYHf2lO2iKrET5tTlc7TougFxEiSZ5uBpifE4EuSSTA6JUwyxJCrrO quw2zDS4uYmMBF4FVLx6JY5EZtVJqzUICQgjkZTsfgh0yodqTOPVK5pYZJ7liW5O7BkJFsAKlSLj Mn6RTDloTRDiZHHA/6noKDypmmAXO5zT43JmlgJ63/z5L2iaNsot1VI5yJ9+1zpJhHWR4hG5iJy3 KJ1KXWKHOtCZvillJEChzxhXm6k5UJPW989yFj0DIWMyAxVxkd4IaIcU5IeN4ub43DXE9kGPXrd6 Jv8Um0ShEVvJtehNmZzAhAS+TeNG3RWTWxZ9ZpxdmlUY+U8AW85oD5mRqLiw4Wuggyx1F5sIL6Hr TccmbvtygyOg6tvQ2GY7SW5X3ml5uAncM0KQfAvVF4betEiug2HAxKAfc8viUCGHMbU7NLhZPMyR rbgQluI0HIGSs/SNSKaBXzL0K496cYr2rLhi482ebvy66K64c9AHKgqoiENpmi2IJI6RqWPnTW16 UCVUvnjjiXCha4zXO7iactB98zmsuxrUasyprjWZErJm8dCYYXyzVAkS0impwOhl4npq9DTBNMrx h9nPRGhsJIgOeZo2UE6oOyIlyOmZv48aYG1hgmNi2BY9aX7bFJjlyA4oi8oths7eIhKFxQlwMipe ROA7tT/z0yTqmSZHRCcV2tXN2Ec3o5BEYDYvodYAQuN6kzvuIzFsKVRktZGdqcaDupMiRJ7zhvEY wTIz5Bf4ghS+C2hJ86SEdHr1q9BYjIRVyHUCYxDI4Ggw4wyukojuG4w8SJVm4GZw1WDj5AQxOxFo PdukF4YhvAw9mN4+W1ErzS9T0QXxi08UqWd7kA0FML4mIolGV8pubQYVtW6k7SokXxWxYS3CY5Cb xkr5WGEG/SkbmLXnqCOfGkhIJNDvmWQV4GETkKTCAxeK20Dmk4VO+HZqxyRrICHjZCXORM2DIBjC y8SzrO0AZIuAuhSgaGxo/XfMOPygTw9IskT+iJ+DQizF9/9z3PtD/X1d3Q64YQiIb384p8/3ifdQ nAW2SMZ/D4X4aZYup+3B1MaYNTFp6W+bPKX/X7rBT4NXGxcMzSJ8GxrUlVNU+kyI2Mk/hg8Rc1Dg o5EMrMH5RUt+xu1c9GCrVmj5jRs2Ljr4phJOk0pQWbbe/Z+0+Vd5Ysv7ZOlcojhXIIglstSURQLv DnUu62hrmFL/qmVXywEgICpCv0/OWGhfoIGCtoYELoZIKQj60WQpktdkAcSV+An1XqJFADH0tzPe TRBgb8JAKk0JjyBFGHgXBjMzIEozRD4tQozqw9XwDuMx6jBoENgbx6PQZi8f0FLyrIXnpPOUerOX kMPR0+kwAtBl18AktYBv3CfzDlBqJp/KYFinb7+wDe8pehs7T9vJE7845jI5iVyoyPlrAvEqAtmI EWQeVXSLwrxA/Gc0DAj/FzW0Q33bfJ26z4toIWBlJE3eLYv6Nraa4DViw1qDm2DTaSabaKUG4UM1 rJmyVwYznKJARFEp0kcpYgWv1mWIMA6ATShobCGJZUNgJe56bF+jgah7TyHQdlTlrDy/UXkrl8pY +UmMSJkwcetBCBAmMUJEfjPkPgWgSJnED2hDyRh5xy2Hkd9WyCgMHFwyayKd3yO74jnanINXXKsL mowZVrzNjCG8xMziSNwJiV6DDjZPIfXkl9CR5GQhiLU5y0NNfRMgYmZqWPYiJYPBBL/XuYnm1oHa gamB0vh4s2ofX7AEoD6KKdXMBOJCMxWy1E4p6OYVp4gx0E7xWj7YWZb/NlgtwdbCswNIzQFHcQsW gRzvy5jYURqK0z0OFNy2sC5FO4xYu9t3zabio2kY1lYdJgJopCaBMaeMyyCLKTG9AkJNYRzOJxXp LesdolkRcFkCWUZFCQMfgZw7jkxkERHPgFp02JNl7MkDv8Eq65nmOAEqk0QJLmMSU5zMe/2013z5 +ncQpliiVNhBIBzDRpVqABCaGN2UQyUIFB30VWVMBuPfqjF5JwLIIFjL97uOhmNcuu+lS2cE1Lfr FAkuW6QgkBuRUYB4Wx9sWPFfRLxOBHAssu6IZmsSp0AeB4eEz0HijaQcduOcJuMSR6QKgbw2bG2B lctqsBpUgUqFqSQpozPMch6ashqdOadRTp4tyj81owJDBAHe8yhrQzdrEs+riHc/uV65Lqs1wVZD HgiXk3mvtasG8+iOg1OSdXVvo1X1iQjtFdMmsjRwx9Edv75aFS7jifFj2oSjjzeV0AOyLsOaxbdV dT2P3HVx7rigZs2JMINRRikAdUoxUI3F+syK+7ZQb+5ipSdGQn5RqxKFNiNPPCR7WHTjbuwQqK3z emoFlYLPwRdBs5bpb+w8ShKHDGxVEdaZQmuAESoxJFIJDN8cCsCRjANxMB1fvOAWE/fePEiEgdxR SH9UAaClWAJzQLbsl1qtgdHIC9wJzrgPEcxtR4jsFxeXFGJVz3HgDCMtPVhhhaVJnsDuKCbImVHN DRHJIA9wHo8AIXxI8nFMngFAOIwkWdzSjgaWHUNlJ9JxtY1ztAnFMcnd4QpKPDYDnOkEcy0IvLsy QWyhwpfkFQ+xEplvS4ugIhbD2OKYM30dR5o01pAqktqtxgUFtggiyUOLRF8JKA5mJkMQMcLFHQbw rBDxZYJ814DW+LgiveydzyFLZp0qyRYSJEkt647m+uyHms43G7dI3hseLhCJ7QJee9cMsZARw/r8 Ns/vpK8SwDYkub2Pva4gWQA9GxoCXnRF0d/qkG8KIsy5xXxompWWjG22222NarkhpIyMApx4PXSz 8nV+Ryw1QEqrMJuZ0Ghp/MNNjbR1gMGgGH1vd30mbQ7ELJBm0hpjEMRt9x6+oP4DvAODbPcjeXJG Jvp2a+EhsYSSyKjXSjmp+bncOyuw75G2/0c4Fep0uIJ5W8Dzul/C+dzBqkannMJ2pKqPg4ivSpRs EbzJhqFGGINXsAmiQnrOYKWoaW3VXbB5rnCbgTQdU1lBCQDueJbp+aEVqvDDs59AEcRlIjaKwBcT aTVlTSZ2MmSpqLUma+lTN8E3oPfdBjl/DYiyJkEQXwA1g2QJ4ImoqYnGIMvBhiXzyfZWlcGvq25w eVrzs9yJrF7U6uepGrrlx7XsOjearJ6aRVCSKgIQdagnOA3Yb0QzgNBDaYdYupyyRlfS+AggBoyr RB1OfaA0FaQ7xvuS+C5oksU3hRLCUNwFC9C8tSlhXk9XBIbz0iQZyEY/QWscCyrjMKyGEyvLWaVT gFioaZZUA5BNWiI98OzcFCGhJoGZQGIbQjvhUbSES6TK5liyJqUhUpWn6Zos1WhBAdiRTlhRkkwP ezXYMGVvhAQ0m/UBIuCRxVo0HT1XhK8EwwMwfpfb84OSTWiPpWaM8RgGT2LKFNFt0I0hpjA1wDAU QBpJkgRNoDGjBS4JsDo4g7hG2su/Ajpi1HhgnugK3HWCeZwT4wPjK2mQ0RLkMZKTxgHELy0tvN2a peAfE+kPkBdVzuFckj7IAvsyElCEEAVIQJToK6Xjpa0UsMqXrhwg1kcpaknJwmS2EEh9orJS1cH2 m9SxdWdrC3LA/B8YxiEGq71sgS28ELQkMque8m6n2e48j3vVEDcDhzfcnLIEfYWsrwKK417O9JHM YiXiwIEsJSXStE3VQ3NhRG/sTaCFhZn+ZBucNmjQU7Kt6TqQhjQNtSPTLpjofE1OCYgnU7e+SSuT XNa0a9uSdzBoaG02MYmmsXDRBAZSJOyDDIkKRFBhhBK2AhwKiHhZhOxG1bSIgigZnBO+dO8Vk4xw 0RVQn156pnwOcBahH1c8QJVuhBzWRTntAkhajyo3HSj4Lkm5H1GMH2/Rr+2utW1dT1OxNWs/ElXc hzbXDiU8WvWB62jAvdG15m+BnXq1eNVIpG7pG3Y3cenPTQvItqUDSk3dkrkKsmVpN6/P7Jcd9hPD eSm4zQsxuqMYFgQLmd1UVRyWr4jrqSLDE1sZjhHdXlWYZCeD0PYteBrdGUBwQEDGRYRg0KAe+YSB vBMANnkjzg9ntbjRtLN6R4uHGZQdIR8YYBdCHOwBdBBPfKYnYqXgRDzwqOSqMcVMkiwEluS4OyJ4 psYQlvRCQbhQBFDbR8i7arI0ZBhjelLeAzvRJJJJNXGCL0cqshosIO3sgOJhq3patsIEijKTXZQx GU1Go1ih1VDGEgNkipmkXyCRconA9FMwMPAuJeq6aiD72AHOde874w+GjRVJhosWfmDxlhQZ4WMb qWqFyrbyVRW8tjC40IENhiVcXvzyIpQkOiI2FDMe9hCH5W0LcZDISxz1rNXSAYlqq1ZLAXkaKIRe 19popJ7WBJXHvTMZwvohZxZ2OjOKgdyhKY5wpyLShIoxLMrWF5l2nBQSDEYBLsM7JMJguxgEpLSW HIj0IrTNp03GRNHymKeAp6VSz0Zsi/XFS5zGwDKgYK0ZKeDvuMFTUEAaSDQXrClG/uNFi2gQ2bQL QREO9lIHLhNSq/feC3NIoIuC9GvOH6mhj7npdafI7fN0iMEP0gQfLAbjQdOqu9J8t/UU4cEca2sd h0xIisCJAXKEaNCvI5jzKonTi4smTJRtTwd7tTgb2rLBcmAtdIgmzn12g5pgZ3d64q19UjdWXDLy /DG4Yxc1wW1TmHpSxxfndeDJeZhnHOFgJ2931qcIQ/XYpwLkvveGT7kaXkXCqXv0tiuDhTEHaWc2 7nCbTOF2+7mTidItQiGJGeLvDcCa/SnUBShz8mZsvMMzmdaG4vNbgIoL+7V0nC8ve3/F3JFOFCQG 4II7gA==