# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101118195642-7p154b6frn4yk5eo # target_branch: file:///home/cpowers/work/dev/mysql-5.5-bugteam/ # testament_sha1: 8c49aa2cd7f9045d3265efa66e310b4d7255ff29 # timestamp: 2010-11-18 13:57:14 -0600 # base_revision_id: davi.arnaut@oracle.com-20101117095019-\ # l07cze14rkfwghug # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaLcI4AAD81/gHxwgAF89/// /+f/6v////5gHH69e9u5993UxwHfWzB93qndbtvbs6N2dUegBrXVU7OvF1m6ZdXsc20Zb3W9vPR3 dzus9brB1KhL2MdaVdtt0FFK3YprK4ShEBFPaU/TEMUwoeUepvUm1BoaAAGgANAHqCSgCYgNEKPQ j1MpH6pkANNANHqeiGhoAANBoE01NKn+qaj0Yp6nomNQHqA0DIyMIBppiYJppiMJChNTJo0Io1P0 nmp6kTan6T1T0PTSnqaeUyM9UBo0DRo0wBFIjQmQjammNJU/TKep7U1PVPTI2gIaam1DamTT1D1P UDIwIpBAECYjQ0JhNJ6myNTI1TyI0G1DJoyADMpswGQQntIQfBkfb3fchM5+oq9x9R5+5z8NBPXa yfMdY7442XGG67k5Cg4FQRdrG6fa9VOWyJ3V72OF5DOxhme9/kmXpQ2Yf9MqFOvaTzdtSrSTkUp9 NoN9tyfT/v88tbH1mgf9mZlKKVrcufY6rTT/nhcuN5VkXMSdqVK9UhfjVDA5JSNb/jXyrj+DJ/f9 2Zvcw99jPKF4DMdL9vW0BVrtMZYmCptH/DyLEnS8cCx0PuEyeUI5cZG+5verp6FhGdppr5H7814k 1mkqQJ1gJ2xu4HvrVpdOyYmwMqoRsw9QknI/X6qFtjkLkKHg8aGyvAPQ7pBm1uaW5gECxHYMguZZ QLPKYQ/DS+4DCR3lOUqtDqMCNJpKJVAnJZyZBETd5m9gVUWGV1ZbrDsVieMZntBERNqCcnJOU0vN 1pk/WAFxur1P6wkwU/LxPi7wu5SbFTyPlv/HNjoq6+xTyAaFgiFiIgYgiFWGJsG9xbKedAHQdTvO XHnqcxctet+XGXqWZRGDOx0V0ggHkZ4RFcJPigQFoo0KBGDVtY2BJWswezZB3mPrWVA1MtjLss1Z qrKMs4yMjSwkjc7TIzCG1iB4dTtIWqJwhTOYii37JPJ3OiMeDRSGtNYmgZLaNWqKZQz3O8LwHsC5 uQ+5juk5FgKT4yFJn9YIaw3wGYcvwEvPn6fVgywOs/F5zfAVe985qB9a2fHEXOJgQcG/kwi0mQdj iVZZajubmsNbmeZ1PfmaqVM13ifBmNQQQBeSMgmF4bTqSQ+Fwf9cQ5q+XO9ZoNR73dMqVasJBuLF j6EJfSpYUcXWFb2DLoPzMmlgQlHhfxc9JYcD85LemQQ1DM0PMSzdlrJgC5MAygwhwLbs5Fsi8oyI NhIte8sLCb94XlENRRcyyKY6W+7QJXoKjASHeYWM1L3MkyjF/LIrMNXKQXWj1G8+2dMsmVWgXHhU 3N/iZ4c/KdDjzYap6350ORKJosPkprqRoLUnobJU85heYwcWDr+Z1E45rdCmCLI4qBZeINDxBY8R AaY772s2rDWhkG/FFWZRMULu8PctCpE7UtA2CGSm1E1CK5lTA+AuMiW4NZkUVSIvQIGa7wYYBuEi oUOJoDNO7+Gq20s6uLqL2A4OoubiHIKlSAub3sBxKSqSJ7xCpFUTEOExg5Nam18nm8MMXwy6XSxR xE0OtUZp4NYrBlJFszVvj0B7Vkjx7fD91jfib6fRXAPkfD4vmO+iD0nUWkkUfqJZjYN8a5nb6t+2 nB83ugjya86oqIE160IaQ0NjGmxsbbGxsTabTbYNg2NjfSQPJzi6x589g5uNopKGQM5HJCIj0MKf lubiUkqoMRhX+xQlCaPz5++8dOWkbdj2szeJr20z6h4ujw70bEw5BkORmTln24jQYuIOmEOV7gn9 YeEOMHg8QsSRNm4wMyTPdK32AJ8ero8CGCWuU59I2q9yHsEgEO02p4XpTNAJ4cdbB8jD+XJzdYBc +8EJk0g1F5g4vm+g5IfM+Dqa5GX4FzMuJDsA02jQMK2nMmvvHElmMsY6J1NDy9YkYrzq143ST5TU 7Os8FNSdJxC0TZhEApFsOHyLNgoRZ2fdfyEmjVo1ZVnWlbj1IIghgsez9Smj0T+8g/EPgpr9zNSR B7OkOv9Deh2eMqyvKWN6Nod53BbUGp9ZcqEW5YbPQOF2ZzFvsa9TJEGVETWoZ1FUBVezCswKtUaD FiraI7GKtIIZcIXobRFGFp45DzmQybhqI3Y0amZRZthrMy7RUsICgwIMhnNumIMhiYVoWzL2RSq1 tpaI9jviqoBk7CurFRLx0L1KERi2LaMUsmYXFpDMx2snG5srRzNLzlo4TNRiJYkJUqlTbViVqjCZ MbEwMDI8SpiRYDTb1IhcAyzQHYjaQAzz04VGxXGGbezbZ3vmPWj2FkvCzJxSTSeBGEjCPQTqhIYE Xq3E+OP81jVpnuDdkeZjPBSx6vR8SYgFiYyQCzOhhzyMzbT3lTCwqcafWX9Q5Eay8Ofd3w59Gs1m wuZFVHjvu2lUk0JPGg02SkHb7zlOTQ82tuydjqvBKSHgVk5fEhldSyChSWfsJk42upKbyjXjXXXU zNx52wEkVzTSp5NORmmmhloCMxTqETQYdjNI9HoXpIvNeaRmZlHM6mYdniBw9V+jkWq1Lss2o4a5 wzm7pFsXthpAlZS2vTjW1JQErDkq5VYhUZ6emSbYSt/9sJmb3LCYjV9NizzsgGJlTVgTfF0cC2kf GuNR4Djwz5UeiGWLLAE+cCr67D2pbZjt2DIidR0ylD0mUDDnY9ffSXEBA07zg2M1uYkx5uNLmB3/ kRI+NHXMzOTMdr6M6m95E0bxxjWwG2VWVJ1nrnlV5lIpu0QSoxjmIfRYGDRVKlNxtqZttZ7ZDqKR GYYw2ECmSJz2EX2Wn0wsGKF5id75Blm/cf9AMcYcs5V0zJSM2amZMFEiwbNiEDirXDAWiY+nfaBY 5FTInM9R3GZIkOHkBxNH0l7CS9KOdw71e6WZTPjKM3CpNROMJF05JccRITIJrGEoINLAxSKF6Fhk WvAbUIIxdBPFHUWiSPHijLTTRjWYkwCzTI2J4nRo4qtxOGDreIFEKi5tqRkCPoYQzMTqTRtTCjJj zHoPRYok9bi9YI4UtTgu1GNck5a1bF7pwdaWe3rQ7dO7lbBcjhGJpBjfRbCvOC1OmeF7iimjPkUh QgXQhsoG47ANRhgCNTarLQFErKJtEcKQIeNO9M4hoxU0wmY11AIIottzITrStECesTc1P0ouYPHj WDUZeoEYuOamjr7Fosuehg43acasMjZ74Sax94ya2HF6TfB8E4cMME6Fj30Te4bKcYUHkT1kBcEi piDXgh52i1ReRmyhD6b6BVUpU00ISq/Eadh+RSp1MhJp4J+WJMoQ1LGeEKDBnomdRoIcjnTS+19g VPJx6cy3fnpoaInrjrm1XlXUTcSRwKYMk5bD237sHliRM8zHD0IykYFjTR2hEm8H4jDLljmKTDYp g5iQwjDpB5KuKyFmYTDSgQUmIkOHfbN3NJpLYyNdR5765rYmTuXUx5c8PYoA0ETXrE1tAPcXV4DH p6j23srLauetHe9aSrL4UciEX3KsSAhMeLZMb1JKJhPiJgCMipubuGwYxOLNsaZwx0s29KKh0lac 9eLN18HjeyuMNpdQ3DWhoAYZ7Q0GDibVqMYPLFCLe4YOMh5sOMcYlDMuVLB0U8HiUNDVJc27KG5j ZmsMxWhqwXskUJRcNGXGECb07MZhAoQoSzMCjly5VHjmSRAEMFszMhe05Ck3gYtchtR76lVCh5mj 3FaUKmR2azRmVsMT3eC89Q5WHQG/UYGohghPspjUNs7I3VhcZYDAqFGQ4IOBuJKhfHAskWQmXvqm rnxoYJKqCFBxCdnFDEAviM3+v4v3ee3OxfIma2Mie+N250g5rDCMj3JCRI1r9/1V2nGgii/8b+lr 3jBGjTBsY1ismA4woJsaAa9gesdZ9Knf4iEdF4R6cxPxQ8BQn+3cbYS2FfsFD4EALUDxAfv5bPv/ M/ovu+ZTAfeobRLmamdD6yFwHDIO8pCEQRER7T2MCKZqw7TWcyEU1jYNH78m6MRcA9iyyWIRQ+qN g1PCJAXBUkEom5BrwF3hbtJPKbT+UE13AxHAaaguYKFAYwZVt3C4UCsFYRyUUmlj72uim7YiYHGJ cN6OlisNVdYBhEgYBCOUG33Eyi0U5cYioAmDDZISTqHk/+nEfsJonSFdi8NpO0Hh0zPyBopkE1d4 ewCQNwJfrxyIbEPdVoHmMrYiQ3Jg+7BiREShE6BkARAIdFUrXAvDDt/3WFKlIUOCBMLyA7Ea2I/u OwPzCmDA+cOFoagMQeKcZKaAYCBoFEsJiaIY529JSpRS0kvQjcEJCkhd8QIcMDp+MCsG3RmFjpGq Q0AhwrnIlFdLzQmgSthCBA6F5xbdg7DEML5N8jZAqtFExMGKoRGpHMFtAVEI1IJkGjB+nOEhgLO5 5Exq0HAHAZE0wNwG0LZkCg1UFLIS8IAw4AxMYbBgQYQDZAwEaCtfEqEEh+I+ymCggg54o0sYoFWk Jny7WukkNMS8OtMTXOqzuCsDMG4AsBwvOkYGEs8vp+8A2Fw7ecMO3PoHYNLRd6QJJSa/MwNVRkX6 AD9qQfF/X6n0/EPVXIhKKQKdySSj90kbRIVhPaToF25VoweMIWSezO+kn/D7TwgFL1byFID+J7So zHSPPd8tZIqfKYhsWTHkTyXxp5+oiVPk925QbofPc1lpLTtkg8QhSDpJk2p+7jxFSzU2JERibt50 pQsIRgA5Bt2B0aytqLxTb8v87r0sKMYg3FDgEJH2MJDC/6BYUF7AlRguShqgz2hRt4yCkTNbvBfm HvQmIQsacGQRHBdw3IEHaDtMQNShNIVC/dmhabGqysIL3tRyBrw+NhmDBKB+08jxOQ0sQv2NzopR 9hMgcg8idTw7AhxgSILsZFmGg89I0VnvIGyJjTMoRwDUYFlodpkYE+ZqG4/u5NCKfUwn7w6BvcGh 21N75gDtbNRsZBKh5gQJNRwS/wTGiKWuKoKhSAcpiw0WimUjMpkJBpSsiMEdh5vNSIG66m1hy8wJ mJe+0DvJ+8tLtWA5eHz5EcgdCrEQo9RhsO8h1S0kAD2E4Kk6IoyAoDbjalRRYmBJJipeYL+ULu3S 2qpgSVPwhLzVIhWnXSqQZtWY/Abl1CqiqaYMGHligMAnUCwuYUTOiDISpEwBEdM11mswSEDtBqMG gUIJnIVLSoYi+Bf6p7SppDVBEaldBdMvMiR4EJco3SEOtg5nanCR/n8ExOIXgG0gfMvXxDTocHQw I5Ito4Qk12nBdPWqFDFT+AwfUfelxN9E44mFB+KY4HSX9kcp2YyO0mUm1vgoJcQs0+BdsLZVSSFU tvKIV7WJEWKSZRYkTCVPsSZQLrkp7Gg5lhlDMMGDBibfWje2WAY6M1VJRNQ1jlk0eYZHBoSKoaRR CZiMu0Z5sMvEk7FJrYM6FpGUar098Xh3nS3mlxSwCHmVKnY3KOGmREdnUpmGq9F0jmkfZSNWEmsI DYXAmwAgNRUwPAz2F7x0Kkm9GQGRsNmzMpXuAC9JNwdihhoY12csyZSVeuStYW4YYckQQaGwgRiD mOD0/gmNDSSMaDXb0c2m9wXZCEolFInHNsYvok5EwTpqqHJovSp0YzTUw0+Eobl0bDrOn2hdSgTR JRHUbYS3EsF0u9M3h3UVvGFfa84Jz1s3uZQMzhg6uaPDYTZiLYvkl4VO1M08k4wlG6OvaenyZKTI UmE5BESfhgUIVDi0F4XjvNfISTebozQTJ9P2GKPptFJFZQC24j2YHQFqb7EtAlkn4G6gDMSI1pIM hajbZHyETUGKRh5vKIPeKUXunl6zImPOQFBwEw4XqHCKc9IkJiMuClOgKb5GXzZYZJLeY44iP8Hk CIO4YM7juhCMjHQ5gyzPmGT0i9PAl63hmfepI0GpSQSQhTKHNhPIeD4+oaV/2H4q2gYEmqT+fOCS D2J3udxT5O3BD4MCMEJo943tADzeAfJvZD5pWQxJJIksrAwMjzcwsyZPq4WtX2pV4HAA/P79jzt4 BezfQlzJ57NbyrwGQkEJmweiQVdv1DSxR5T6ycyxA/Y1yUTuYUMqJScggyYOBYSPc+9qEyixYAHl gN9IV6nYnFLRQ0lNQ0DbwRWKjqLgpMDt8TTx3bdQSJzcXJ7g7adBTwPAgVk6GZXwqiSSKiSf31Ie oyO/DpALF3u5PNx8kzQNbACbtLQhMSyE7nqtfrAKnezOaY+I5SR6CNwmKZ2A4ibjpPvo1ImGvUGA 42BL1PcajwqO2EIIIIhSCDoTdjrcGCIYdgobShstQPWpQkWaoPOsDwF8XdVO48XhzJsU0yDqS56H V61LB0vB8eLhY1zAjBkUagmt10SnIaU1njg3vgAV2bgD4J9ad20eU1OhnIgJEWaVdTQC58mHEAQL abUoGuDgZlakyrCtwr3E9AppHy7YQkpAEMAkBDJFJKZkAMw97QTQE3mhO/0cCByerCxy81FN8rkH WF4CmHtficwgJy3Ph6rzyUKpnssXMAXFChJMAOMA7kyT5Mk25lzloThFJs9iQzJhzLWBe2uOqOaV tyl3HTkadhapWYJB3rthxmQ6R0EKdBc6VbS9GjfxnoI1PWnedj5Ol3YoR9AjlQzQxM5aCUiQaTgw zZhIikzezmFAmFCgHPAlJ0gDcQPk3glgTAP2Bab1PKwLR+5yKJBYHWmBwmuWVALGBgAoDUGuxIHU dkwDAYgKNFjvsUAOBmIEulstUIaa2HU8wBkybuodxi2t+QWBfDIhhHSswks4VqkFzJLUJwsLQK2h J1JhQ+AAe7rEIhoEDzEMBCfcFiFDVBDICRsOpozDW6j7vanvPeXmq3HTeh5f1Gvi2vfc748gDSGk CgQqnLCbhzsAcCDbysg+1gQs9xnIBqAdzimOIkjAzbc9VnCC1hgIg4E5zFf3IpcIWmUgo7sZAV3k G0KDoR7WrUNAqhNG9jdbfNrT2mKXUXRD72xJj0l8xrVDv52XexBad4Jkp1QIfYlnT6EKQA+aWo63 bSGhCHY2kijWMQdT1WM9nmFCx27B3L3ViiOSYLYcQRbo0GkAPxWMrDft/lC6M0bfqTUm+99nBV5W EO9NZalo6wOQyIg1EiBg0xiTCRCYSIXcidaqyBuFyWAW8P8ZqrY+D1HdyX1QA6BtMAiaQwES7fof aax1DA/UBGwxwJ5m/R2jQNDCPSWhdpRlCv9NTvBYE507zYTRtEwvfUJ5mr0mk0/UHG85irAdQCem lsz73C7fQDuJ4FATcKGsNJTFvhsDnDXMtVDTIwcMsOpookwgJkAJJ4yLU1BQRDNhvXRiVbeBdFLn JVN8qyhYitxPdIzaNbQijemLIq1k9L46ZxFRQy+gb3BZihQqXyNPgr3bU3lp7bNcQxDs0m9pPst4 p2EHj+mwDotiAc1LDXEhPwq9VN1iBYpqSm5MoU2taNtUsjbFmkZvZJJJCEJJY8aRBh6qFBqUEuV0 a0kGwgUwmyqM29rYTMACGkyUEJcaguBfkW3PK1S0ebLm7DD2b62Bt00aXWaaLDCnUr8b2OhQIjOo MzBlQhrqJRNIp0JhBBg4EXQBMyqrUmJ+08Q3BAEtTJD08bXEoGgeKqkVRkZCQ0JIHAwsAHqh6tZW lcQUDrTGaZxM8MmdGDXgSC16mwLoRDc0hkKSGOw1JpgntNp1Lvi9ClqISPqc0bkKIG34SlB//Aq7 SLI+svS4rV2mtt6wsd5XYHGiwxdKUEM+1vbwDAhAkg1Dg+ur0VmCRSqRenSZ61ZlHmb2q1kfE7zy vxdmdLg/SnyP4MD+CYAGty3s3r24j1AGy2CYL4pobR6QPNqWWm4hbA5W5LM05gsHaPe8XwanQCKL sMAaQNVpiMYLqzxdOSfr5SRR6ImzDXOpEQMnR+gdwB9H9CYBX0vPhodExTLs4O6iahITHWzTDa3y fBAQEKV6kklEE3slzhCsM+ZmaY0NTa7EuS9N7pOuTwDnSp43yDrCaodJycZBGUF0yabS/ronMn4q WfJzVP8t6WO/be2cQ4YbEG4fqesNna9O53g+ds48nQbANXdAfayfiLuSKcKEhRbhHAA=