# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101019225645-ur9ptdah15cb0r3z # target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/ # testament_sha1: 60dd5b54820ea39474c67f8556af471d4a1299c6 # timestamp: 2010-10-19 15:56:52 -0700 # base_revision_id: martin.zaun@oracle.com-20101019225339-\ # aozm9ulyrr5g47fw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcCLOV8ADrZ/gER0QAR97/// f3/ePr////5gE0317ZvrB7z29LzevW1IAAAAABXmV060sHXOsstbZlrTVKDppSlA4SSIyNImm1Tw Ap7U2kaap+p6aahN6k9RkaAAADR6hxkwTQyGRkZNDQBoMjCAaDRpkMQ0AGmgRpSjR5ENqA9qQADQ AAAABpoACTVEgU2U8FPUZPUeo9QAGg9QA2oAbUANAARSIAmQE01PTKYE0ypvVPGTSY1RkeFPUaaZ PUaBsoJEgICYQQgVP1T9U81Mp+lP1T0DSaeiAAAAHlKEkkWQLib9cp42tbpOrdcnCBGyhzUa2mpn bZbPtApTBTXIH93VD51DeWAzAh/WwbXlQqwyJuZ98efrZwVg2+vmPwOpwbYa2eDfhuOdj+6IUqWY Sauyb1dHIbEh5zMlGroU4uGRIeEkK+7wtbNAnY5yUxHxjfjc5geDJYXLtaQLgqCYUul0TC6Zt4S4 6KtGtKY0JBv19VHOKk493X1+deqSJNBizN3aMXi16mBMo5ACwoQJdERxfNDqRVlLXcTCPANS28Wl xOC1GVwTGKoozWYQ1PtKNjhsECADUURERANm0EIsCGUYSFQMx+OpqN0mpVthnLD5l9+sSOCQ330G 83BaEg3ep5eU10q/NXkVgSIWLAWKsYwWCigiCxZpLeMn2gAMtB45KrnpoBXI6pUlzyFUOZDMWfKm GRZZbavVPaVEkXdSRYIJqHwRWCcM5ogm1lYG+JwlPFFLFKLLhacQTTshthlpUwDaVYuQxQEpNpai DcKFIxKyRUXwropGBi16hnuzlSLWWxwUqVSxbF5dJlbbNhsje8oaQNI0Oo4DLpJgFBbllEakKpjb ncAwv9XquOTU9Eh9tuivofIhVcdAbOlj8Jh+LCmZljYIgZrH0XzIGhmgmDGGYiDHDoYLAnWY2Ngx ma1/8zyMiQR8DMZg2JeyiiRfZORer0NWlzNna55uug69VytNXhp8plDyX9GO/7fbdAHkY4imvNol L6cMVTcEk/UBgnbBdf/KcsiojEYmLuBby3gRFkN2a14AznlLB8fD38d/c7ud3v4udNx75XrpwEVT yuVVd9UJ1NGbPmStBzEKRmZDMyn9aS0SK6HyjH+rr6IcK6yosx+7MymIBBaGWkCZEksspCiQGICy QdjaakO+SoaNYdO0HGsQTqxtkDQyoj9gCAOM4jiFiwZdvgoHmIBIKgsFyDV50vP5m6AsJGuWSVAE TkvQLnmtpoFxZmRdGIFTzjaPecCUIiisRxaV97p/8Z0oYHTRjLOhSjMpRbvCJDGNbD/QcDGJf0Jt 7n6ywOBYXDXx2xnvJ39LEQ5i3oPMc/HfuGe9kDy3AB5lymwoWgMQgoA/UEc1gcY3IXQj2m9F9dQH oXnNdmzF140ksGQQHHGyMy4HDlijtNMkITMWltPb1zSo26wJjCAmC+RWQxlIshD3inxE9UPwIln+ Eic1dJxscieNhvgL9mCs34a9u/oev2+b2QC+5pe9h+4zBoUThKGKbQVnA10yIgIhoqtt4qS0YnKF Q6eO2aLyQwoEKMCrAKV2skQ4Qrrm0KBgQYWYmBJqzcFEgMyQWQDoflKmBYnSelkD6ADJDKTBlRFm lZdBSLnOZU+CD96mATKlTHHfehgWOsjYzORAdDHjWgTACH0aUUg1jgnKHnzveMeMghNhU9MzmhCx BJMGNoExoQMXMIQfOaIHSnzO/x14LnRAyEGlbanB1Mg5GtHtlpjXr2jp2p2vF86Wvvq9O/aEbbng t/JQx0aQGxigMMQB7lvp7dOdLV6n5BAQuoPqeC0r7PoWGTOyByNpek5cQqDufRGLxQgsyDyMTJJT CC5gZngdR0OBnpseBn4C6C1M9JP1zMHk0X85zSURF5SvUpEifqcsut545bytoZJJYWQAs+Dng8E5 mxjIyzljokBShI1s8qeW6EETseiSXE0XZvQwlybFCUtjM9buUoNc+DHVbDEBfc6nE7Yaj5d3Teho TIvFing3KmhobeVhBdUMTU7kzQJBkVNSY0kvRBoZ6c7BV5F7TnakTnR99ek7Oc8aWo1hKUDxzMca CyO4zYyNi+WeNy8nNwKE9ZN6ljLgmrMsBhVSmSguOZ2qSxKrZA5nWmhODaOTPU2Ox2zMKjZwRHKz NpmgEzA6dNyqqDNR45HDOhibmByfrGWOShU1OhQ4I6lTqIDM7bG16xLjd514kRpjKjcp0wwMb2MT rQSFqYGZTEpiYGZSaSbsklToYGhXY+RCWfQUaAYjMsiebmaJJasJqazEBXcZJZWxJbJJZH1KLTzF IMhmxaV8jQmdkg6gEakGZl0xOEkupI1ywyt0zrGtbXedp2lWJXdYESEBFyIAGXtPeulsilcmdTPv BuYlMxqoyZ7RBvjwe2CogNNJd0sTb9hNa4ljUmTWNj0NDqWMDImbm5gZiAwPBz67nsQZFyR5rfef nnPdwU7cUdubutKwSna6udDOyoyVAmcmVzyIozIQH7/sJ6885mh6qwZHQvsWGeZB5C8gJ4Mth6vC A6nmZkipoZQttrmRznCfV6q52dqW0c50vNKcuF3NAwnReDkeBSRgaFTA0IJROSDrLQcmZmqSVjNT HmUKjOC5oXIJnPJPF2GXvfb2AdrIDM0N9Ay0NzIuVODQ0BmRuZlTcqZlFUD85KJXOE9dbkavOxhg 7WtfjD7QiwGRqMoIgwkWrJQVDE6UqGYo6mpFpmQhjFvrORQvoOx40oajmMzOTA/E88SxMwNcO8iR pme0D2kzY4O5ydSRBgQeRBByZmKCRvaHiaSjpTfu5VK8Wo1ZlYMczmXolsYkrCQWyMjgkTMiu6nQ xyrWRZ9yMdTbx6tw6GOB4H2MDg2ZyUNSDnE1ynjED0MwNBO96zNI+La8OaSVhsyzOA2yAo0xMsCN ZAHlWSAd3QAxEF8H7/kl5NsW7bWXWDSUKIVV3GAVnWNZA4iIdhCIvkAKSG/vBSUo0mOYNoCiRipI m2USBSGAgMVYCYn5NScvoVkb96WIj+h9cif7ZvOlT+ZSVQ4GgCIWEYgig/wPfJwt+fbZ6XsMcsu5 cxshdxLSFJetTEfc2DL8351TLuRmC8om8t/KEMBjif9YvHW5Kg13n1Pe7Ry4e31d/G0WndmwPm61 PcY1/bJc9BBZsKzr3r61eLPAa+uxdCczMdYOUIq8Y/v7irR0stnohkGuZoj3zzlDzOv6OR4W8rAh hYXNDVv0zEMzj77EA9ywwLHs8KEDynOSV/geB95B8D9Bc2Ogtz7zIdz+M/aWOhU0P2mpSPp7Ymxp kfGw0moTvDEv2ojykBD5Y2we0DqRuNTnNipi+46UFKKhBMICtOA95gDaBYUmrk9vkwHDXeVCE7C/ VEpanUfHxUjeIEc3sZ6NCIyVeotNx/QhMpUa3rI8cEToMJuhPrxIj9qJhouU7QoEA/aONgx1EBQK zaUFoFJpKDsYeRHmCXxMyAmWJkj4nJFxk63Hge4JmpU0EeVMj9Mwoia+8QI+g3PYklv1OTg5Oq2G SOTA2OSx1mdT+DrmamM5zKHB9f0crQQFDgODUmdjE6GC+nk2P6kj2nJct0+v0UNCFz8WH87yH3c4 gm/uX6vPsTshCnMtPLzCGxHuLCNRUDEve0ASwhqgMwSGcgWui1qAIkNEDoEqBksb9IqIYDG2KGQI 9ns4ognVC9RBQ9D38XnhQkec4y05S43EGCrjWWlZSUoHYbwyoGYvp5RtLBvVdBSk4leWaeoQNjra 1NBUaj71zlIertHFqImQ7CRc1RFyxmMoMKnkehMjYeQ7NwBAQqVYEoDnxvOIgnOIkeS8py6Q9OTI rN6OI7ZmTobVCB+4MGQSRRoQoU4SXtqdSCPt9PB9Jme8Pl7BttN2ggKnxPgWNcDMqe7IkekpGp7q lRWXFxh5leBXSJlNMCcMBwNrRU7aNM2xWQgvFpSZfcyL5zKBGfJkkYjWaTAJOSV3iIrmFhYRczki sqN+ZQGyKkz67yeYdTUuiXzZzFYU6oX46P0kcp6/t5NFO7axGUQ4xLIAIYQJqscClcw8DKQrSSTY oR0nJDCYYh65omqdR/zKiCu46LfwEkl4Z8WZ7yVuuA4ZqEwDQp2ERB4MPrEBCmSFZuRrDqH6DkeY tJDyciTDizOYF/kM+r6sD3jsQZk7n5D4jPVqfh0NTwiZ7h6lCCwxAMuEqiCkznAAZ+Ak/JWZhAd6 skDtj8fEhu9fgU2QZtRGpwLO8hggiFg1smSF6pb5V3zhsKoCA3oHPQBrvXgvTuBicXIz9c/AVKR+ BoMoCU4oVwP+4I+B6sTsGMEeHxpJRHcKFq1ERsiJGV8oBkTncUD6EKBvb28WyPbCI0V/0iDvC/LS EhhQt7h+przGNVhoUfGmFxI4yAIAITlHaQITZLZz0yAChXnb9RRgiNut452ldxab0GUDsoBtbxRE G4Daag6RgKSqAInM6Q0CE5BMKTI9b6FWAHIiMK5RIVuJgSag0vilLWjSTLzwOg2P6nH0wFrgcQso l/u02ZTXQEL7k4lCfr9bfvEEEAEKy5t7WPS4GtgAgGqD1ac/NjXWAY+RD8HB7Yn7qwNH0ZGELJi7 oacMgGpsgpJCFADJUaYSU2sxhWilr8ozrrlRTIDkVaBCQyXLDq4IiIoGpQgTpQL26FoEi1E7IQmg JAyoNMyYTqwHAJpKalJNCkm0ClpmxkNOQPEdBxp/VNIEFGuYEyB6wTZmCpBcAB9nj4yiBaEh6PfE ZNPFXvmURRI2ag+iI6QSX3hD3TdQGzcEFourEA+wg7jMkREFLZAG58e4LY9k8RlOiJiR0cir2KWo WHu2dhV0zVhAjwVblW4AySIyXEjAj+aZSnSHAIIJW5tTUSYM3J9RaFFRS/gQ1kAySGPmyDiPkPId BvbEuagkEo0caRJk0EhXwEDlN7kEChKyIYbERsCBD1gXzoKYKjhSAhWXnn28d/kSYzFAFYX2R6fn mAZ/No+2+zaRYL1fJDtGCAghICtzrW122IHKp40N7YFcI4HWQTFG7zDfm76vVwymU7BOZIQKC5Us V29rNT7IchkmeAIhiMT7JeQ+6o6wFpk+zZPf9Y6I6s1yZsyZSThNr32oV2BsKFfRG9Wj0jSIXNCu ZA1Wm9jFCOYscQMghSfBPO9IXXtK7L5nsMMTzR4YGBQPAfN/j3rPdsHICqJxaDvlfQJWWkkCwVoT CLBI2wQWiBZOqwW0AqZ7VWWyFvbxXLHMwBddTI4DLNySBjORiQqZBNELoEDTSbGoRFULD6g0BJsA z/EGciZbNAz6gsKBlVnvxIwA8N3wG3avrdplfPn7nTgPBdCIwInyDYAQ29La4jpECom0OriAoF4V Ck7TqAwRPy4uLFkAF6cSHR2wFQh5ikQwGY4sCR3fZTteSSUgSvAj+PcXAfmpeJM9x+0mBvVYRCnn 1Ubb8pMziWe4qdzYfIQ5wIV4uxDrRHcrRDwt8TIhH9rx4eUPWcn2DnJ5M/tX/i7kinChIYEWcr4=