# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110125072536-px4emoj4edj6a17i # target_branch: file:///Users/sunny/innodb/bzr/5.5/ # testament_sha1: 7dae4831777fed96d76c51c0e3f672cbd78ade3b # timestamp: 2011-01-25 18:34:11 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110124074350-\ # 67q03y5b43tqr3ui # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdb7kf4AB0J/gGA4AAh7f/// f/ff7r////pgDrwOtbdW5btiy2+loutUGu3vcgbbZl73dVeYHlpduR696N7mcJJNJqYTQ0aCYptN MmKnpPUzU9J6no0Aho09J6QZDQMSaBGQQmRNlEe1T0mjIA9QA0DQAAADTQIJRP1TyIyemg1DQ0AA aNNAAaAAGgk0okyKNNJ4ieoDTNI0NANAAaaBoAaA0HNGjQ0wgGmBNNAGQ0MQBoxGhgjIAJEmiCaG iaZNFT2qfpkynqmnp6mnpEeU9T1A0eoNMhhqep6lnMIGoMCTQgCh2CMqosfFaolBJb5CYcVolWEU BYRFimVXlOTE03BQEdzClAsFDCLRgYRa1KiIqwFn54uFaBQKMQyJZFBBgginHrOXn+zXffB4v1ya eHf4+qPEzFwjjq3E6KVMzVwsOxxWY46cYiOmZgw6dG2dLAvRqvN5+6t90RBGbieHS6ggiwV3eoIw kAy0LXjUEmu6w1QykUFKmUutO4f5p6+ZODI72uxB2iyHKPVNEjqi60d58L5emnpxV4+zNotBsVVk 8zGcZFQWKHsNRVm5l8unScJokyk52ZELNsUgCXTLZ4xU54uziRXAVtE2o5L2erCILm3L+cKbV3nJ im/mXE/FP5DgC4Ib5U/wcPo30OWO/D4JW6n/Aviu+mGK4CYPFBhl7jASkGn2C9tRkHj2yk+mbUVN 3CePq5+VkhMwgOOw6GA4kI2a9nMdEHabZzbo1vQ88+CWq3u2rCIajBXYTrGd4m6NlJSd4vBMhdAJ Eqb3vdVNr1s1QhrZagyATdmsr0cgXcNDyQ1mtlV2pShXbhXW5dN22XJwcOutF04XLWaum/Xhv0rv dzMOybbqOuOEOsncvHATBO7e2nbOgAwKOM7y/H+6xrSiyceDq3ruMS3Bmkje0KOSUAcU2v7y0EdP SbfOlc2QjADm7AJ9MJi81zZhofG1l0XAWgXnGZk5wwZ4bqZEp79XCO+YhxZLkdFtGHNkx+NZK4wp MUXCqVFsFq0UIY6QYZkQZbCC1FZb40gayTiz0c4bpQfqj5YZ5Do3C8cGiIq3kymbjuiIHDyR6nlx qK05Sy4MKIwGHW3Bx3WkIYz+bqziJrDhlDZ0eeIweVoQeYz2HoxlgqIJx8g3DpjNQWe03REM4Msh iWilyaNBOrZU0o9FZF1wS9Yvn0YmL8owykLghNKRpTpQ9b0mdWaJduQ2SLkjQOyTDBMwbAWwRm6O zkVW+9eWkHl1dcQq6zSqhxahhKTZo6sduPAe+xhjmpYaLuOl8LkDZIZCLyqSbVCszYFw2ot8+HX4 ujnyLixzbnOwbfGzdU8XPsHCl+esK9mqpLfIREvBTR5YXft8zedlZ0+DE3RB3jzDZ4JJ5oBEielh L1MESNQ+RGVGHfGKurw5YQt5Ql54T6bWwx8q9Ij3rpX61idi1jGMNQBSBUTZkvPtWuX2vt7BXPrw wx746neL0hXLNRZ5Z4sLnUBH1L5z8gkZ1oZC1+NHr6tkZZ71eGw7efz+mGuNJBkiDAOxDFLRWYFw YBwYHS5ZRPAPGVZ3tiOKgJrVMO0f4WshdSKWPI5AyqWjH4sQ9amZRzAGflthXtWCuAyYEsNjAMaQ ldhNNJ54Cmj5aK+9oOdxQIaXlNvRRVQMQ6TCpoLe2UEF8at/G8vugGMbI3KMJghhDF7NELkYvctl N2WKWieFubDrRuKfyx0HRykDyzYCSPVeEd7uMoqOnEET1kKnDBlBFTN2lHR1CQEYSMtLvOGtkfCL ocMqgZts+1BqilSNEZpW1sIwhLRpXjoKh6LCDGKE0JhVo9anXUZQzFXPC+ywxvxxLFd0HqrYHgTC xVFpDALWdmzm6i8cpKzwhIXlMzNYMRNYpim4+sZy5S3TeGq0ZOWpx6biQ3GsNfDmVxiHwF6BbOTQ N52o853V1Z77puZA0pmjs2NEGbrPwHFWxredWPWneI+y/I3PgiOVNRZZ5SpHB7xozEyvWk9aDvWj zpeNr2YSPSYWokxy27j0g20OoV5pqa4T0adppSeQzBkaOFFwMDIyYGiMkyvcxxxJoZQqxeFmxnhB 8ZPWNbJpmSwyKGNGBrWEAICrd5IIxCD4Nijjd8qjSLnN89O7vKgmIohi6FQoUgSnjx07WkAiwy4u BaVkvaMBVckWzEqCvhPHjhlpP1CFbZttIQyVORGzY4kxU7SLoNPQ1SdeLLlhb0wI0sdJ5u1x/Mzv BOXN44djYT3aOioaa4G/Zy+xV6H1VDbarXoKcoNEyGJklgKdrqcvd3kofNyeGHZWRInvHgKQcX4E nwOciIuGNRECTcP+bWy839ffSlxZJnrPT4xPge1gC71i6f+UBW+wX7/sxSuGCTJiEiPXCGc+LBKa ZHrPoTI7xfLxfIV0rkiCPmHxDcEe73XkVrz2cSL5EME4qsiMkNMMjlDR0xKAwDFDBoDSGispltVG z4CuRwRSCEWSKtEhaAXu2L8RXLZ9xqGNcFIYmAVGZ9/w51ncLPkUhIRuRhm9P1kIlAYIg6Wi4NZE G80Cp9XUI7/i/1AednvOKWsGHL1kwUoHWaSoSjwS9wj1oI9B7G2NicIzGoNajvrQ+6gQgvSLB/ou JmoR6qGH7rFfYMyZBK68MBlERFM6mxBYHTJsbc4edJ9fg4o+4UP0r6TSvT3Yfx/Myd+QSsHD72BL 3u7lOaQejKxR4Xe0U8TtyOgfd7CqMJVdEeHq5zZ+2CKhmjV1o+s+8KhTtEPdwYZ363Qyd/792mbY haVdNYGNjmlqrhdgNqQGy/bHGTY46Jl90RJGmZdy3R1+0XBYOWoNJr7eXEtc4UycSSblHGW0ZWLn ILuwrr3rQTIRSyEZHHRq+VXJmdj+vkA3NaOMZMKW7XTIuHVigFfXcIe/tRwooMYLtIZRm8huF+dx QhOkEqkIe/MiEejoLts/tv0VKSaBQypuOgHGEbdRzp8ZYvFDprsh0mc78z32uOo1GmIOlsOtQtHw r0WtVwOCWMZJO5jtQBOC1VRKOFfeUu7ZxdUEQpNpVNR3wgbohSGJRseqwJ9pxNv0Tskxxwxgzk9E 6q8R6sQYY8AAWW0VRdbaotjIWt0l2asn1TZ7RXUvIyS5deU5+L6rZHUW5BK7XL3fJBVJGdl7+K7L mNh3tKEubiUASWkMgtA7gLSLviWlxSdOtQYbnHBaeNUZi5SbuzO4uVaKnCd+QaSxpK/TUWxCRnCN SCrBGPOIgqavQwivc7OwO8E1XgdXBrKljJjxZo6lUXdonIHf7V734djs9cQNILDuNic8HZnQmMiF 0d3pqIC+rBNC8/CEOwD8SYJ8SEOHjodtzFYolkwA4njsQkSiGxZknqlEWOapLX/BHmzsd3fPL2GA 94zx0UFNHzLV0rKbkHVH6YNasBbgNd3wsvHpxGmg8B5QVPnCb0dG2u7fdCtigYlvRvTOiM/N1afC Q3hGa1JjGNpkBoSKcnzQ7v73otkLaLrDamJs27gjksieoL2DG2DiO9MMQmAS4I3d0bA4uCmP33Jx ifNs1pFBWBK8KgYhAY9zagERMYM0ZOaeN8uYJiKnkxjDbdJLixxFG6BuNNcfQxNqjFiN5JItggkA FvuG4YcMEScuJv37VJtuC7kyRgtXO1jVUsRIDVql0oFPKbPMPDGOavduXLZYPT6m/p8DfSnFllKr Klw/irCqVT1hoxhFJAwCvrQhY6xlUaHcNN2IZejBkgSWhkbdAYKs+JQDDcNVvYFkmQ0TpWtsRMDB sqCx0zZuA8/0rZ5iG5hRoXNIzgve0ORsFYamC+G1HUGcV1Fm6ioR6OyCoaGD539WaiojcqIwlm4C BpjFP2CGBvcudH0SWIi9ST5kQTDVhSxywN+ct/eA8KMsR2pFfbAdkMhzYDVU+trxOoxnOmApLmD6 53nv9lASyQdkBANuOVsFSjX4rwkFcfZYRDDwuqJI7cKhMZjUeYAPJmJHz1RtDr8qN/DTU0c1fi0Y Sa1rFRG3Vfdvd9hjAXQ02hBGF6ULo1k0ZLNGja3FgbeghoVVnCbLGnAyF5W8qSxFyCaGpAfG2MKl IG0rknLEwnQu3cYaQwTVGrb6VDy0ObbqzqBjX13k4HWcYgKwcwRso26WgYDpXqCylkMzII5iU41Y M9JX8T2DSJGldqYmcvpIsRODw9vGR70ubpnMziXDxwnEvo+RTjvJoWwL183G5ryoZ7O5lhzG1NTd jTXObpvTBYQtAM0MQwChu2k23ga3XBgLNIAxxmkrlshLSc0lqIDyNNgYuGka9mepCbQZXM55x4C0 Ry2iw3IEtQCR8pcdsHAqWNktrX3sVhtCpr9d7Hk9nHdCJd/LCsSxoVfNxGyfoWabLWr5ETqjqBk8 LeGIUtK0sq6DCWJYAPcwIqoUsvgVVmlpNoQkaU/POHdKMTm1uxgou2DSNsXgZMFrEzUmB/KI9rQo uaz3clPIw1S26UAUKqTp+ZSF3FCE7AseInDjgHKhykrH/xdyRThQkNb7kf4=