# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110210091650-x24hfx4xu4gue7vz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: b3e9e50d8269b01678d19027ec031d18f46fc6aa # timestamp: 2011-02-10 11:59:21 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110210090338-\ # fpxg315lr2xe68bg # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaS2GVQAAk7flHAwW3f//3+n niC//9/6BAAIAFAFndox3cytm7uXT3tt62HsEokBNqPSYU9qU/FTyj08lPRPSHpDIMgA9CPUCSRA xE9FT9Kfkp7UnqADRpoPUGhmoAAAShNAgFPTQI1Majyk9RkNA0HpHqAaHpqAkUIp7U0p6ehlNT0y R5TygeoGnqMj1AB6gPKASRFJ6nqe1BPUNGmRp6gNAeoAAAAARBJSSQ2NJtNmfiYcX2e7dCm2eInL +SplwjGjTmlB5vz9EKQf+PL8V6HO0XzYVBH5s3OStDlTwNaeCyZNu/y7unXVtVVCY4fgr743RsKl 5FJD0Sss9WSGPjhWOW/oniZBCx27Yw9u7rWnCQZY28aR/p2arVVCDg64VlutanT7+yHW7f3UY1re 0SDKXOwViYXP/i21ux45Xzkf6PDMOniO3Plogyp7DNJDJ67Nr5ET0Ky3ZwID082IYyppnNfSs/Ci h1psvaq6ONavX9DwdS51mEcFSrFJhht2ZFo04ha8dkT1/eKqBd1KoMYtvoG3d3M+LknFK56s8DlE 4YLSAjxpGdQqaRPyxC0llT4EaokBGYwRaa9kyl8cVxK8sZmDwukI5cYCOF64+My8t4hz3KDSywh0 0aVGybCwNAnamber0TB89hOqPYZSiyTJGtcU8E9NohTEQhKX2iOzo+GSh0+pe9DemcyygafMGey+ hMO3ahYGvLYGxLW4UHwaRiqO89LuEhsEaazNyZHkJvF1BTmKMJcQW7sVQp42alXAKItlzmnZNlYp XaLILcMFWGE9uB0jdHUpX64KKuuW0zcWxHSFl+8NHqoNEgjO+TIa1KrfiDX4yU1Za0ecRBpJsWll L323FSkl5Kn0Jmhqddc1MgnOgqcmsaogFkGgoyZcxhvZlNlJY5dsERbhvzpgGpE7+DSdRT7e3Lr/ TFF38MnhNj3eFCFn32+ufdDLFjxj4wMRXz0weC/Cnv8ZR/Lqq9X4nLwOIyU3+cWSs7BBPb4MTHHo veQ/Z5HumkYsRCB3J7D6fqRcIiHXyuSNWxlJlc7fYTrCyMUuanEoxK9nALLTkuhfRJbGlZRBsvOD NcVzLb6S9sN0uYrlV1rDLrDCI5vru6RFHITI5o73JAkRaoOuv96ctKUduqaCSmaldUWYkoyIakQ0 k/5qiSQOwanEe5wZyxhYg8IJwu1PRIJmb4YRStbBUmaT08/uSUd2oOT09KfBDvkZ7DYGbmRLQYLi zTB8IPvywMhIw8i0KhxNemONFRBi12zGPjGHwDdEXJhura51qgDDapGu9XzekPB7kvEPjrY7RRjz Zl0ZX10yrHwYORLxJQuwh0DwrHoqb2Sure9dTmlXIGZDMg3CJqSSoRIvObi96XbNJIc/y3XZz+7Y NKw1PMy3MIPYg98WsW8dtcHC8asWGQ0065XrFgxDDGkHKLaRg41eqkKKhWogW4NLs0IL3YauaeYU 8lqRkhDEinEIU2grmvkbffZI14TZ/MF3Q7GGSxoWeJTJk5Sl9SCAFWK+FAUOkQujlYwVKZlJIhAb Mlv9KVNvlyau8sK6Q5Cy2FiE7/Sk+hbzaPL28pJeTZ2qd0J7jrkwYZ0kR2zCc1eTM0EYShrciEmy U4kgsgUr3wxzJ1G+Koaan0atbKnBJ78oq7pDaSQ1TlNkLA0IcL5ExZPhIgEUoBVdirnEQ8DUy3cu plTq6JFendBr1nQwCdq4NKqbAVnaKInOTIjvcYAotgyidc0J3c4lpWk0Qmll4+EoxSbE1PUjLuiu +0p0DFcOxS+gLVLJ1SQRWFo89qfJwZI3Sd0YiaqBZozE8rCiUgxhMyvoaOCVz6o9BOURb2tCpZ5v fYoOUJi1/PQXObSxUkczaOv5bccZrNEt4omYo4BWxcYWgijgFPRnuSg94G2wrRG47T2kYaV/Eu3/ F3JFOFCQpLYZVA==