# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622104239-0lpbu70us50jaqfs # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 8b0211bdc0b74a0679b5f6b4c602dc83b74e5b25 # timestamp: 2010-06-22 13:42:45 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: inaam.rana@oracle.com-20100621155209-\ # 1pu7nwq05x7tbfoo # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd+2RCEAAn7flCAwc3f//3M/ AyC////8BAAIAFAFDJ46VHUxwJ3d22vCSJBMJNMnk0aGRNNJ5TIZNGgPUPUDQCSSZMRplMk9J6oy AAAAaNGgAAJFAp6qfqm8mSniT1HqaaZqB6QA0aYQwE/VBzAEYJiAYBME0ZDQwCYIxMJJIyaTBNMp PNNJqep6JhMnoygNAA0PUMCdUDlBBHPEYyGR7SOGrob7M8vlx5Hh79WmlaLtWm7CksIV8G/OyWey kpz+5+G5fA3jAyjbG0frlDVLIy6F81h6YxcJOhFwYUbx3dPr7/JtOsjo58eepJVP5k8ZWdmY9RS5 ZFHBWnocIyGyPediv0X9TNNLozkcnMBBhVKUlHWKjyaluNV2Onui24TgTED7mUXADoZfhC5CcV9g o0dGHlmfbpkhasgl+HLq2iLFrN5QchVXQVSgmYualyFm60LYKSBLmkf2jkHSPS8VBC0biMVFyY2I ZTyj6SL/aLADETgIAZaGUKHFjSWN0UIXhunMDkz7vXM3xiRoUZyyjKgnwlz1rfwhv43S14Bgdgbx rriHgLuqO2UyDC0GUdfn03MsyeQ3yoWD4KFgF6GYCWvECebTIPYiMTiyyIw6WGbwEVajNeUNMrVp CD+k7VjhCF0xQeUQS0VBXYk9I5Xy/DG9lUInB05iOKxrSvUxDM8lWfQLIWkSEkabS/l5gK/nBcXV XLQ2tZQmtb7qlhbZ8lSOHEUFWadZ+Q+xhpe8KsgicMliKG7MKikWTZLD9AXXZ5sK/YpIUL671KY5 FmL06tQutEqv4o5jZsLHE2Fgb9CRkJC1aXllfnMLcALlIUIuzxDljSQs9tKssNwy83cJ7YhubVtj SjtFGo96vcDSaCmiU2mLE+RzrRAbuy3g7Rm0jr2Hv13ix1oV1jbY2+mHbQRy9+ZdsQj/Qrw0iMJB ycVazvx3Voa0whe3FohD88TiEi5yeBtgJxiJjcbCaKZAy6siOuzh3CV/vSpIdmaCIiOBsVRS8Phv AfWlxnBWtHvrFu3Md/n5SUWkddOq0c9gGv1dQhiesTdszq5d4slRsFq23coni7qycnPC6m9mYSdf PpMvxHDKJV4Elt66ijWwpLC3VcVldMDIEgNWRInKzFadwrFKVS4hfxFzDWGZVXrDDE+Va+9zTve5 MgJOaN9PHWYDcPE1DPMSI8TaUnn26+e3rN2SbI19GLZufpbs/LnyEaG6FnyJwy0224dU8xgRgrlR FTIE4vMG/gPbusE1l6mXfyOw6g0ypzdw4gPHQJ3s6VtWgWWSkC2GdYCbMku3mQ1UnDGeUqjAecX1 r0rmRlon0aJn3UMHMi3Z2SjfbWBDLhETYiPHQjBI1UGIVIc4PQMI722LzDFIk4KRi+FoshgMIrBL BkKaY3ZCNeg9CYdtopFX7jjxc9Kc1yUm1RHucAopK0hACTht3q2CnqebMlBg1wW3ZeMIsS2TQq51 Qkh2nF2zqI7es5CWFGKRRwTLJyFU5ZwkzvwYYHgSKaWPW45OMZoYKPBYgOGtUEg31s4ZpWbLlkrS iRFZ9ErVScxNTG0xl4EN3ukjpDZOaUMYC9iWdpRR4aHLkxncUpGzogN9wtOwaL9qjCmAapbsuuwl gUIoCUT3BDOB5FdQnrxwSwCn3gWYi5lhViM0J8cWiRP4pkY7uZTFdQC6PwH/MfLkLuSKcKEhv2yI Qg==