# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110518120811-g2jjluvhwhpu8vvl # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 1a9ef2c25659a9444344d89051e9fd0895a72959 # timestamp: 2011-05-18 15:09:27 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110518100538-\ # cqh1wkgckl0nl4sm # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWkP6JMAAz/flAAQWmf/91+j jyC////wBAAIAFAF2PHQyYmqCgDQI5hMAmAEwmE0wAACZNNAwkoJT9NJtNJNqPSNNNGhoNAAAAAS ggmiZJ5U9qT9NR6UBoAaMj1PUwmnqAcwmATACYTCaYAABMmmgYSSI0ACaaYmptBBqTaZTajEB6Iz UX68g4fE+xvMjGeGKDl+UPpcD5MgVVVK5rg7ivF+shgazaKKoqnDeHfAkW16obljBhmZoN/Tk+/m yO/8/u7g/yomn8O11i1U2r8ZW0pPGyRUzBbBg5To7YbOfMKTA53xc/FA+JyXcPFIFz4dbLhfUBWi o7eItelVCC8VBkeNzYMvUkEamVlVOUJSpuApRCxveIVdGJdXK5zngpxto5UjrmrtcgWYoYDoEXTi QlYekMEhqpIi3qCh1wihw9KVdSeMQxGeEKh54i771kLYEcFO9OYZ4qOZYqqo0CoNxSGbyeUTALOq mb3ykxILcTCJWFgEsb5KscD833E98+QoH2LCkQ/NOzOfxFUp/FyQU9WB0QVDCwYnuvzdzV88tg4u G1AWRSIgMItadDyLfXteLSS9kuB0inSIchoaC9Ak7dhAV9qjziWtzEY3xGM50vibpyEhEsTmKUEp qpZN5K6GApGBNnJvtIHK1C6cpH1wKJKAeGQpdTK11y1UojeVKawqEV272eJE8jlM6sZZs9OpA8Cx mLS7AnKxhMOOWxwYSEpMIPEwt+xGmDsbYyVRc241C6ml2N5ZRhfZOMdoWsXIndU0UiRknAnXaNpT oFkRMVhXOgcYQiKPBuKqWTQIliHibgtxYWj0iAiI6tqmK1CrEyJMJgCP2EXUtG4sULzCwkH0m24k 2ELCz8CntpFw1dbVS7Ii3CvbOsJFaFJjEUBMpa75ID/SmFY5GpSTGI5mUFkSES0cIjCKTFiFSJOo UsF6BkfAzCwoNHszzE8DoaFYtwhQKWYZDH0LTs4twluoIeE3SRxg1Vfkfu8O7jv2msyFA9/VAN9l vuIwMeAm68yMo8PDt0D3CFHF4wPj6JCtgQmPftIJfDvEL5ZGRGbakj7EghOqcjj78RNjf42J5m6k g8yPgJ6x8D0NQGCepJlvFLwF500VmjCcJ8nx3mmxj5JyQtlohbDzUWaNupjhcXd1ZYiMumE8iFGX sS7axYxPssbMXYFCXGkl49F2uvzc/dGhLd+2uGV0FWZEpkJOLgXeLT0nnM4CpiNWWojbOfHGWd8o rPC7Qjz0MJnHIwhvkIV0mdTjLn6jwkEKdhg+YmE29Ovdkbu+3kcjgEwEgDjUnFVsN9525cjl+vLg LeogjuD6neTrWxynPNijqR9RarKpBPu7z8JuwDQqb7xiPYT4+grw7LSNVlRaXiYiOAZC2PDctqVN coeuRtIySAGPR5eByPvZIdeovYWf5HBjJJnDLVjEQvwQW9KC0BLVXAw29cAKVaBaPEBLzPJwhOPc uLiOe3Q0OKoJNwsJjcArEx5CFqB/R1GchhwzuZki0eUhxJiIiCtcvJiRcJAwEdBDgjJiCWCT4h5g RJdU8OwIGAh7CZK/PtmTz0CcITIRDNf2Vmm6gErAOggt2HyIU0rRdrhVG7zu1NinbUcMJnhAZTZd YHYK9aCMV3D/RUatWHs5AGg1W+mTdLseIutMiIIzZAEqEYvlOccCEEIYVVS+cV5Ak0r3MmaorJwH EwZMNgvsUBKBRYU6DxjMLC5xSOLA7hldKTzlAcYUJUpRCl8xRsHuMppBYGQsPoeWh1FvmSt2+WvQ eL0EWC4bxcAMxaiI9OIpRFAp/ko8Z2tScyUeFOE4TZmCQjNScSZSXq/+CZ3n+LuSKcKEg0h/RJg=