# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110615071659-7c8a9apcw0693nw8 # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.1/ # testament_sha1: 57df958d71d8b278b51268eae58589aa7aa8a550 # timestamp: 2011-06-15 10:37:46 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: marko.makela@oracle.com-20110614054032-\ # ys8b6h6s77wurhuf # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVpscbAADCRflBAwe3f/91en jwC////wBAAIAGANHPVBl87a2S9JcSjTtgDknCzQChJAUl20hpBTBogANGRiGgNAAAAAJSCNPUaE w1QaAAAAAAAAOYExNBhMmTJkYTBNNMjEwBDAJT1EIFDAkyTaj1D1PSAADQaAD1ARSECGRT9SfpNM KemgjJoQDJphNGm1NAVKIaBNNAIJPTU0TaJ6U8U9TIA0yGh6hAk8CQ+o4weZOfYvbPfn2KqqKqqq qqqqqsxEzMD6/V9Yp6lYO86PZ1BGCAi6SSlJOLTpq6cJzJyN8unJED9IQJtcCe7OZnMs0XU65lgb WbdEl7XstbsPVjNrqw1ntbOLq81UtdYV60vhWPcCbxeRIyFsFiIIgiBRRVFFBQUUFAhfX2xARRv3 G3DjVv3xjicKMOaX5Tz1kKvIS6pdlMOSpnsGsjQuqXzknQxixM1bFr1ac6mrEl2WUw3Zmp1otdsr LmznNnDFspL5TZq82bOHDmxqmlr0SNnJrTFZNv958uJ+fd57nWR+QwoGCPEGAJNKPuHzNplSNIdC Q0FHjCWUAif5/NJlwpKzDDkAIjudgvOHhYEUZiImUA4BE4psyqZ5Ha9iGBENpISaKK4OQgeIszBM yHl5buuSZaSnp0Ijv6vh6d1X3dfG3Dpy/jITKkg+h70SHsnYoh0FCdRROxcfafodvjXh8/h+SRek afb79oj4RHrEf1gH6onq3IjxRJomlE9h5NHLOWdKnZxbZUpn7+HcTPcUJJRVVVTVeggI4WojyISP GAI+UiPR+qiHdJRJ35apOifu68+tMgVzqK0laQelPQgLEBmwsQUkE5REGdTcxgrcZQAwiSCChYVn SVPnhSJvAmbCSJB+yJMvlGURpKwTG96vQF/suZwP3/4brXt9FbpyiX9Wzm1cYMZc3WVc2F2DNc9k yaO7QytwvPKiUPOPIHWD457LtioxA6bvLf5KsYicESispOOeaJMr59ZNtUtMc9CEBu8JvIqvKV1X QS36+i9jdOciueMRztZLa6KrecR+l7VfhhCOGhNXVfTfjOuVtDGUkrCxL4IIZCkcD0rAL0RO1+8/ Tv17axNAYo34c1K3btQUf5xH1RHNvbR/Cs2U8KJh8eHilGbfTizZYtFnJ3SUiPMU1CoxaMKDkJiw kZTRxuM0ukCq4cGSNTXwfRe173PXFyQEcMzEASVwooyKsCuI9qpIqUpdS9w9WpxeGjJjks1Z2upE azyaWmyvFjj2ZOjW9yx0kl9R1OwrjEQcerKAJ+NBVWFUUUFVYVRfvIgDM3wQcYE1JTWxJwLibGI3 ziCJMqxbE7dKUJirVRu4+eteZjklsRGuDLK/ExvWXzLlaZ4MGl69Q3cVb7qr8HGUXcesRgabtDi7 ObddwZNOMRmvYtVVm6xpY0ggq0EGRWYAOVqyJ2va+dsa2vLThMUcYiy8tKSqiO1E4XsrSRjm751a KWzo4Lco5uiyTpk0u0bRF13N1iMdl9GThjEVcLVVLmzFdOi/Noy9rOLizbyTe9djj5RHTgiWQwLB VnHESslQWmF81zzFrFay2CqiFzxRXgYMbud1TVpqsqu1mMzdYj6s7KJUNMmbSzXFpJFTE1ysyBlk Y5UNOzKDdk0JGONDQqWlpqxOCkzIv1WXEp3XQSwic5TpXEYTzYLMZERLbZ56oWqUIgFxZAsKJphz iL2kY2JS52DdXduvcWbLissgwbeM93RwiMGrVeuczBv1U3BgU9e+AdYjgwcojTNexkVnRZsc59J1 uvosp3X8kjZtEc27FhzmgPNgziL1zkquZLlx3oVYtbKXnZziLlqUphhOqyo+kqs3WcrZ5qS9mtVy duQWc8lOTm9AVWc2LF1d2rFVc4P/HWfa6uamlK17XpNaX4RFUlG17eI6tWLdaWz6N2Dhq3YObVhr TPJZk1WbmCzNfNJbmyZOixqoyaXXbsnFa/ri4gxUd5kuaqss1FnXdwPTu8y21jcPNu1U01u6bABt BBbjpscjBYWIMk0DBkbUwQXNi+RiiINgAp1KlrmJzLU18sWnRndgxVyblzquwa3+IirZ4/KnRyBr EauLJVq1dGSjZlgwdWyq7ldWGlL6GSb8nGkAa1ERjFADk4iI0gDPDpmqioiKqqwiiIio3+mIjnp8 3OA7QiGClggfSLOYPHrF79IieznQH+rBL2IUhIiL/FRPmolSiROaifNRK5lwoH2USX1UTumonUCn 9qJOqiiXKJQFNFK1EsUSSifBRPFRK1EqUTn7uyWEMQiKrDCIvawB7/hj4sBEdHtb+490TwPbL5kk +C/V83yiKPne0XP3PuZMLgdoJi9n7eHB4bPy2/NCeV7Dso/e75LYwbPnBP7dknr5W9Y27AA2UNCr V9s6Ay7qpxBl5oRNiJzG08CG0R1LPZjPJaeT0er1WaPio1WcsFzFlEcF7VbB8XFso1VUeFvn/2j+ xovfrHvSlH4RBRVSSlClJrghzcoiruv59NdsFa2dd3d1XL01UZssu8RcvyiKaVyUY45g0Ud4jZR+ kRnp5PJ16RGazaI5tVVH7fZxYr1/98R0Znd6s9vPVWiEuQ/q9EJ4u7cpHrjs2T5AtGN/h8L3jTfn 92XfzYrnvvup24rPNyDk9G4ZsW74MfbFrEnt5bNnJ0E3e0RweJGvLgIbzaGhA9xJx2a0TUQZIm5X frt0y+J+5+GU9fu+jxRJW766+SF4HR22iKuj4rMHhgvcdXqebWuVEyejJR7uCzA5KvZk9/fN9TL6 JO6TNHakeVeSTrB1fTq1ZPDyQzd1nxd2jkxek3v8n4yNbojz+OjLg23pbeQzcSsY+L+iKf5I9og4 g45dQciBaK+DAB0Wlebfd6IpaPZSVx2cSzPxqQJovrqrFL0COzBE6DI4Gw6H3xGMfY+xiufYxYrf evZvZ71VUbNy98jaz2XLm7dctEXaNFznB87KcGrpBd960jgS8Re8XULROyT3XRyUoObeawS62h5i Pjf3HVAZYsTFYw9/IwU0fec24wVGA5qFJjrljw6kXKVlYJ6E0EIyVnq4qbBE2Giort/AQjvQI6LU xs2lvnn9OHRZTUgRzHcgXX93ONguiZ6eB5axEiWSA+O1A9NQg9f8xxC9AvmpMJQgPaTFziDAu6Bf VXfr39sUtEJljmkgMAx1IDtAPkfkrAsuGLz2YC1ZjZ1FWk21WWSTDjh8ZF9s1ltawf7MkmbGQpRC xFEnVJe3OANKV1q0h99kkDfJ9YAV9u3VCA4Ggt3T2Aj94M9cIGUVGb2iDnQOGXgVM6PXmMseGiSd V10jDw86pKB2BhJMqNfLCmP1446bJZKJWqi6QO19eFlfzQ/bj+J9ahRaSTUw661fxNSlTp3W3kCD DPSW1Y3g6RgMCAgggUUCCF7ARo5mLZV7uV/DOI7kTrTQqpiua3FoEqSdkl2sFUmQcdb87b1ZIXV5 V1twuxqk/ULVZLLXfOSL35yWaXNmvKZ6brlLaIFjvB3SLiI9EejS8Onp3ckOL85/ltMnrZwODgiO XKuqfgxfKb/LLmnjrvPdLvWCiHAFCXgselxU0g/S0VwU/WmrKTfn1KcmN+Ku/hf/xo+H/i7kinCh ILTY42A=