# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622103450-aagt2th0j4v3hi9n # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 05f543a66fa3375f5b98be34a5a52be0023e8bdc # timestamp: 2010-06-22 13:35:01 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100622075822-\ # 33le940p3ek8rp46 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX4zl4oAAcxflAAwUnf//1uC CAC//9/wBAAIAFAD+SatGe4CzqcJKENCMSfog01M1GaCjaIep6TT1P1IDJNEwI0DSm0kyeiAaZAB iMCRTQSaNCaPUameomTI8pkyHpBkAcwAAAAAAAAAAJKU00YQ9QD1NGgAAAAANDbTaVsDm1a5Ec8g fDgb+a1iWt9GCRtrolFqlIlHTxX7W2jR5Bb8UuZl1V0To+l1KVpE/76+QY/T02e3VXt89dEndrr5 hxGw69NWs7WXXTg1gVKM8MchA4enMcEB4OI8IiZbO4jBfpearFQoUcPjNsfEzFRJG3huET8jzVhB xXilp1zEb9cCMlOTSpNakjIrLpsrbpKGEoaalInHitqxFRYGhobr2XCNN4t+PX+j3xPUTLXRNpM1 s2GA6j+RX/Td+ikvx0rigkhtou7hQ8ygmMKYc7OOBRJNBF8Dngcmy5aaVDb5vzRq5j2GQ6wcY00s kQkHDU5A8XRV5gBYJxP0B2K0oLJFoF7qDS2UTJ1E0rMyYV4ihbdtcK4oqkIbUwztrWpO0zAbrFLj iLhLSLzBnPJSRomCUN+BxmWMEEWdBC+qFqnA47nd8AgjO+80QNaZ7F7FMQpmgQvfG6o0Hu5G7Jxr nPDyTgpqtdiyuzDenDMV5A/J1KsMFuXfKsrYBEFJJ3OhcFrntV5qTOBznizs5CphuinV3d+pd3WI wzgz8/P1nZGfJ21nbrcrRLvhG6gRwdCgSkQfB4I5co5YITEI0CzRt1JE6e8DWTQYDhSCLeDEZ7Hy PRjKI/LC9nOxU6DisB+SvZSsUb3Rfw9zpuSYVKrWdA9kQMF4LX2ZsZY1iRbQkQwoM19pmw15aqVJ KoDvWQO2Cnae1d2pbiOVmn4LuTh0Bj4gTbLhmmkfIpR/LB8xxa+QHMCYuhlp0czbfpkZr4VS7Uxv 3ZP3adUiuVeiYq7LdTW6d5dsuJkVSp3ipkxc+G2w8iMVq4mY0VGPHB69V4uKRu8Sbnc4W/OLUNYi h94soronmAshk40q9smssXy4g/zCmGSeeTl9dNk2cN4eTYWippJllSCPbQckaXwiCKYJSwpDJUwi G3o4LifQ1mxSNAjjXmdo5cvEs0aTHNOZ4FGTbJPLRVzDlpWF0X7AiuycYvMNptNbMkiydfhYFUN0 z0SOQEpGCmvZTdLdJmbBDcmQGzUNw8JNpr9Xp4h3NvoBmSWnCpMojPf1ULq2skQnPjnd4JhYtRNb 5e6efHI1UT4gJAe9IBxFYZPAlQFzgu3kHjBlzp5jfsBdnLASAiAwqw5RickIvAPO86ycZ8Br9wVs 1Am9TIEdN/4iChZ5LKyP/FXv/xdyRThQkH4zl4o=