# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20100809121129-02aw7a0ll128llv1 # target_branch: file:///export/home/x/mysql-5.5-merge-test/ # testament_sha1: 0d647af3b86268b79a635b077b78a365aea2a829 # timestamp: 2010-08-09 14:11:44 +0200 # source_branch: file:///export/home/x/mysql-5.1-bugteam-bug54106/ # base_revision_id: georgi.kodinov@oracle.com-20100806135217-\ # ar2ebh3uiwe3yhhr # # Begin bundle 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 1Cgf6tV+AfOe4LDUrQqMKU6yGnuW0XMW0XIIrmuQRsIRexYpQt+i8AtTRYp/M+LLgIPhTsKG0udq +UYL2xqmu8n/KUUOI7MmqcYGqlTAOFaNFeA+gXBqoZRSHEXi4q8S5lcXCIQW0oVHeKlNC9dtYQl+ IVUyXMsXQXqTn75BOYT8x+qitXd6qWjATvMKDaa+8t+QVAqB6DoF6C7IX94J5zpPT5zpPN+GZjfm bSh0eguz/d9kRzMmRMiZman33ybEdGJ9ffTrL7ZMMxE7cur98ztlwXq3nJ6+4nX6w0NN8SalcJkS nq9Yjt6nYI3+z2GMXEzKrluCGHKOoVewtVCobjFN/tc2Xgk/u67izgvUZPKq2lfJ4cl3nm/mvej0 1uS1k0PKwZV/kYtV7T5ejY6JkZ1dzVMp9fo9TY2sbZYrzexV+aQ7kxb6k1/6Ny3Q6+DiucZ1O3bo LTekYNL32xxpPVDudqjJuYHjtzvjnqpXtvYaWoX2KvnmkWxIumU2JE3v5LX+5lDB2H9PQt0qRqsX 2Deih0dMvDwWO9/85MnSrvZmDR5NDY2RMGZqSd+zwXtjQySNykkLZgyfZOWZu5m7a3bW6vjccTOT onn8r3kajrm91Pc4qM3Z3voYpHmY8D6+++qikpSPyuRb9bKF996yt3b+VfhMpInVOjvu1PK3redr zamF7nMzbct8Kfajwz002PRnebuLmt5tWlaq9GDyePYjsRY49la0itCvYjXJKLedFenJpmvzOJiv wFO6tWNm/yLU3TI5OHlv7HXdV6b7XknWmY9J6fBizae14dtVNvusOHDiNnLfG31l3HGqsxWKSPJK JO9OjK3n4exau9cJmXM/89R/b4uipQukTyU/Pz3b2gs/s2yLFLkwbKhxktSMl7L2ef+NfEjood73 ey1LHw8lWTBZ9lXs8cL/bscrF/yaFhPz9fQ3YNd7gTa7kqd/6I8UbJGo9DYOiR83TapXifBa7jT2 vudj3yilVGKmov8qUoopJMya5oM8uTCEcp9VsnWmf8z4fc2Oh7Gd93onudR5ntNJjZ9ROk+v4khW fNBTtvWLt8uspLTBccX3nr5oYpb3JWbsDwd1thXk2u16pFZIVdIrMHn4k3GRZJdPmms8u+Zkkrqx zxqM0ft8+vpJOOKzCtG1N6fLgUUM9lM/w7mdnD8tB0MaV0dQW9R2LvhcWzrizMjl8PX8VWGY+5y/ 83/8uxKRWFFUpFeLBieM+T8pWm02pXaanT1O6Sbvs+o5tHtTMzmuequRNqWpKL0i8LGK0fV6TBDV /FeXHczsafNEaIkUIqshWv0N2tkcPtCMpbPekZzNV4pPZa9kmMqm44OBRJ8Px3NHDJTCImn3ir6V jqstkXFnfRexOB4K50ybDuTOxJn0DYYBZnOx1CzQJmRyaFCGYxBOUhqKQHXMTW/BitjhLi6zdFzP AGLhjf0pNizljkliYJvLCPMpqJKUSZeRYnw2/Y7E00nm0eIbEpkKS1wGn3b4WPb3PsC6go/xD2n2 7NhjJCi5QnUxn4PDW2FprobaRTwiRtkm6xOtPg5Rrxi/BKTCPokePovnNcmD/DzOjkknu3dSiKJK eSXE4rzU1Jn0nP6Y7viZ7EyNDStehbnoyNyWLk5lxpfsbtqDJrSi8OWBz0okqTxELGDi9wLlV4yW GyyhUkCtwNkF6PIPCcZcDgGAzObXHa7wcfPuxQ4xvvh4h8biZfZrU2iHxcgzz3leuFU8VEXxtfTw A43c47UlkISaLeajF2TyS4cwwavL5R/afIGQczMzDU2yPv418vM93NeQEvsLA/KLJeJVu3gCAxmH gcQbNCuGfxGPiIQhCEIQi4ZD+I1KBCBCBQNgXLFd2rjXfVxoPkGuYcw7na7dg585Yxdnl0xgRPUV INGAQDDQk0KvhcpQpBrSeT7L2e7BGGKv95FXjRNZ7spLlvRSw09J7SbTttIq4JFSdlNCn70yXW7X YcrWEKS2aZJuTm/dw6mMuwok0aFseh4rDkmb7zG7TyMT8P4c6KaYRSNZbNy0vYp1lE/Z9/FLL1p3 tU79F0aqXJsPzbFr8NSSmwWOeCed7UuoWB1mw2HNU0FMehkk3ucmTnK66PyMDieP0OJSdpujuNa1 4ZGm9aUSPyLjqSOFVM2SxeowtdRqO+b3qeJpRzaz7nsdDsOf0MkjqMScjQdT8aSw4s3A8Go/Ue5/ +LuSKcKEgx8Bfzg=