# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100614065030-tebecnjv316n8l7b # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 68599477bdb34718f557867d39a69963711f498f # timestamp: 2010-06-14 10:00:58 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100608122645-\ # psnrclg7j7n1ynvs # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXKkFWIABZFflEAwWn///3/v 3qC////wBAAIAGAK0+AACiiqUBJVUABQUAAI4yZNDEYmjAIwEwgDATTRpkaAYSSJqp7NGlNhDUm0 0NNBMgZGjTJoHqAzUA4yZNDEYmjAIwEwgDATTRpkaAY4yZNDEYmjAIwEwgDATTRpkaAY4yZNDEYm jAIwEwgDATTRpkaAYSSAgCGImCZDQASYTTIRtBBke0oeJ6Mnux/j67pXAqeZNvNhvkJOTNHF2fPv /J3Gm6vTPZd+iV+osV78kw7hf8LxS4nY8J56aMBzIZipsB6FTmcgoCsxqgOf12yIjyjVfJPHm0QS QYL9dIQrM435EMi6viGwMwMMMzAzH+v4FtgVnYOgNz6vE/b+uaRsZRKnbHOz8R2ki+dsSU5WQ3fZ aRblsOJ0B4HrIOcP4DR0J4OxG+J9Bh2BnHPO06g4Bx5yDH8kB5eRTj/YwTXjoHkVTQmMIOHlkjQO /o+J2hVaUFVvnIPl8DQPFYqihV4H6n7jg7RjaMPKQLT+cjMFZnIpvFbTePJomQ6/Cb+zf5lJbR9f B3SXntbNDM2kRCLhB3d7MN7U16sKU8OADC5dPyXu8A1GcwNB0w+4as+9kazzAgGJ8wZWms59qvHb g3MQPASWeK3rvTyw4qgyVhaorphpCRnC4NI5Cr1j1UthYK4uIg8YoiwohalYmQhmNywkvESUgI+X yltDJ2ElXU5Oc5xxiRH58xSkXsD2E8eGBkKDDnmsYGGTDJItciZghSeAG5SRk0LzW8LCgX3ziUkr JSaIezaUwgWqb/fIkioZBWmSCSQOVc40FI0C0eih9NL1IYiESAhkOVVXw3wJkiVRUtIQdgJ0I3ZE UOcEJdQPD8QqEnCh4jygYSVntZYsVFuOc93ecQ6YELNE5oUiZapRMqMFNHaMb80asGbxj3QVm5XX ckF4FYs5sLikyDFOA3vVYs42Mp537NxhghcctV04g4xByzYWGY1FnrcbdIU9ClX3cDSMFfE9hI6E GAwknFIz3S0wKRlyca+F5tm8aopGmZiqx5YZKS3FMU5TUZBkn4Es70F5SZ+dvejSVGi+qPMpWbfH DimFG0y5x9Blyie0uvaXk4iuFrsLlTVtLH8wsEJ44rYttXQhZKtjwJu/ANGSlXdy1rPdnIE6HrLU NPUScV0kdtskgqYOcYKJRcZjm0GRAeSMR9lIpmpai9chpjFyiVDUE5eOKWJCvVuMbekRM00qojZT iNxXSWkwQpiYsYcOyM9OyVhXlhAgUnaI0kO5Cy3ZjmMKFmLpqrgTipZVAmcZtBKZCrNRKV8XUFTl oTIwKxwi3yUB4ZhkgukVPQnKZXCArFI4Uvka1pnUYs80216jSlQQWBgQPsVFgykLGxCuOBvLC+dp WUz0jEUxB092m95SFKuKXlrpElcXAbpJ6Ga4LBnys3ntWXqoxozfkaSIPWlSJEVibHpTy1ToL9sS OrOaMSlUFdaE05BkQyLTi1hYR0HOLWVoXgmtoTQWcfmgtLGDIhFVM9+fDEzF7EaRlnhK5EH5x2gI 2GI3PTAqrKL2PsuyomOOndJvM2Q7R19hzXNqV7IhB2JYOUjIaRMFMeKI4BiY0RUIJ0DGpe6E3O5h 7D083+gmQXmRmGoZkzmOdOZhzB8g2HsDuOlhqlYuAkuwPmL8QqD91as6ZhgZmZwfQU0QgDjuOBDy gPA7xww4Y8AcFLzYRDvBwtgPLUTg7q/gRDYEggB16wcHALA/wfUIe0GTggDAsQrCR6kgkH1DmD1N pANoSzGIOXrSWBAJkRTE8HTGREIh8e7ecg5wwyD1dQKE0y79bwPjVoCQxnBx5eWcF0edMWfAZXjy QXiSbkfEovPpVjgvpl+Ikr0XJh0QZB0CS9KKUwqAwCCMheWk/WndNaQdKgJLWig/uD6RjYFicSwX lkQkOKExiXwNUR/zPw9Nx86CgdkxVkwlALDsUjtLwxcBiFOWPP72Eg1mg5CvAZVm8cHI7SSExE1q /kOMebFPItqsMFaGSyJqBQX7zH6QC46kcrD9TBUQBhJdaeLIQGo1FCII6KlpOaFIyUEmcmU+wdr6 eBTzDjMGutLpzWAPIgq+wOJtHjgCm7emyWR9dW9Vizfo0C46S3aZ8/MN/B17x54hAaPemPR4knkG cGcjw3dHQd8acDqohOiHZ0nadWd7qrOi1wx5BiEDDqcDnGISQaFRYdmqRMsKjQMSKxVByVQnI/OB 25jgY3Ji4t66KAtNdji01LUyaw3kwnKwy2uNz+Q8P2QBtzKzU9VgeImA7lsWjXSHofoYB3kDyB4w 43nEuB4DA1og5nCOiIwRO3K9McA36+c5HUQOP78DZVA4uVCmov2pdRIcqNItS+IegegROs2PF3DH VaPHrnOVFYOXApNIk5FwRDtUkSRxNaOhNWCYeMNawR9hBdqOJ0h+fmakHXpK1A8h1IxiWhgOGOgQ xaQOMXIGgFgTCz2shlFFSCySIfZwWg/3e545zhyYefDpNpSUFq3AtC9gKBnGN4x1ZBMOC714EhUG R4dLQTjsQskLcPOwSXqqUXnBBQcDnQB4ZzMl1AwDAYCHjjwEwnQcJLvCu8STgOA9f86r65rQBnOc ZBUNaNAWIft1pr14AB5Jg8hJdXJLHtO4GTwYcM7tW1HDTE2gwesReXiqIYagoDUcxSD1EXMZ+UpS cB4VFpQmTMXuDaDD1nXidB3iiKdYXopTFIl3SIvgMj0iQNSJhMkLpE9fqh4g0HikjvOxPLkiIwmY Cs+F5AWtZjoqbFbU4YSWo8z4ZkqhhBld5jjIQGAyUlFgUzxJKJcv6ElcIeh6PF4tedFiFQBmHAxj c5dByHg4DaEBUkkw4j0KyTyZvXpmcuEi0AxNRvWkkZnmZPDue7uYcFClueTARQilORMks5oNAygQ AO8MDIJCYrAn6HmihAFaGRs2krT9FgzNjWU0LkaB4oCsYGCw9o8nxXMDyJrcVejHvDJaZnQOFvMg sBMFormG06VUckLVpZuwA0AEUzWoIjw5A/26dGgHGtPNBefOakwxcOJlkC0Qeowx5xKxgnSBNKAV jzSJxCCyDQHH7hlMa0CopHJUHPCB3mJ0jHaoUGYvEMlFTcBEPQ1bi1rBdi/IHA4rM49FS2EKBk3i 4Hq8Lky4w7h8T+fHS6s6nCjAPfNbGFiUC6gW8Y5zOQVKEe+hHywN482HmhP70LEwJlyQ4Zwxi4cD E+6s5zmMwDaVoBAMMQ83N5LhkMXLVQf4W+u1f8XckU4UJBypBViA