# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110119121347-j6uhwoi0jjge8din # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 1c5cd7cefa15f58baa7876a309fcfbe89d5bf118 # timestamp: 2011-01-19 14:14:18 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110119112245-\ # e0zpbgirk1c4t6d3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWet7GbYAAm5flCAwe3f//3/v n6C////6BAAIAFAFLJ7RHabrqGVYtUCSUyDU0DTEjT1PSm9JlB6npNBpoDIGjGhGmgSiQp7TSan6 p6empPUAAAABpoAAAACSIRomlPZMk2qeiPKaPQQAAANA0GmTQOGmmCGQ00yMmEA00AYTRpkwAIGg kkRomJ6Cap+UNop6TTDU9QyBoBPUwAAaHOScMwFnfTm/tXXJvyXOYbp+Z0lslgyz270+QFLIxJCj o7EouxoWjkqs5dRaWDMyZrfqHNGfZcLtW2mh5BJv7xG3g1dLr7a7fLCiPO8D9T++HLk/LUqRiSyy auZZQiFTg+MaOCaGb3v08de5vo73Xx+bkQOZHPlUoymPRpxZIdg/dNdFJ0Ujjn45r/Fn0sRP8wuX uQu0XwFqJRigVqry+nugV8dk9Bw0TZaxmbtCUORCu289piNGctjKk1bmZPc+4Q2+LORiyFQCuExM CGMjGDEaqGBlkq0Tjzi5wMQzrsWq3Pa5RYKd1QJ3f5uybq5QV6wMHgpYOFSmgBQolMl742bJioDl D1vYmefmN8nrEzvFPMdFz0houJBhYK+TDTotmMpEJxFgJmWN52J1vEiqE07FjijayOrwsM3sEQfd sqL5DwOnZdjlfCL72CrAxsFnKLCqkWUkDj02F8Ky9lAm6re6KwISmAxrtc3FLSKy2sJq8nLKtFEC O9Tn9tUQwjWaxLiD0JCcS8TsmnyoNmtdYMi8R1Y59QTFYl6yWI8p2q79Aa9ON4G+w6SNeIoJ14tO Fpbe4MBiybNnMSpi2IkpkCTDLmMOu0LRBBS48W1ccjEoKVpog8CIkl0VEG4aViQFthJEnlpFGm0N i9J1WDBzlbhVIuiqHBptJVInU1QqzY3pVu7gFmDNwkHMd827wsYrBL8fzlwmKdmGYbkOzbtUze7t 6oXjCIf1St+4HXsJuhZapXSzUQhNmk/PxvzNnDNmK26OfYdf4J9xm2ep0SCS6oBxkDoCsvIBmO6O OflFuJSPQhTDuvv0+nyCTpxZW4yF8kXy/ndQvNTPKUzIZEpzQvmqB8GubGpbNItvSMdJj0vsYdiL RTcobur0HgSYMRViZZ9YVoI9kUoecURSmw6+Ahqtb2jhKsSu4Xy7HDaOHeIihoqDf9BOEw6SCKLm VNflE/W2oWS9IGabl4O0cRQw4QUqv4RqfqNhWQA5TjJ4a2HUkETmBEUWf1ZdeWzhyNXdbrBqLmp7 oixCkTUKJMGUp4DM6ksz2FiUESJDnzCv6FcMeNVMZRbhUvFeXR4Go1ljE+BvIRfcBka1RxBviwRO yW0CpHMA8twy4C1ua1DTbtKjqnFGPK8MSqYo0Iiffv8W7LHgRPVrWDSiinn0QOGzGBqA4QNmugTa VvuGEvxvIkEqjWAyM7kBdE2bcglAIlTMsmLac8jJtsTythvoU5PxoW8HIfJMPr0KZC41VRisy7d7 MxStfedhgmwwTek4kKEERY0NgKD4U4KLKLAy4ODtAyFpJ39QDUkpo4rISHfESoQ6lanqiNUFi2LD BUnqSXPmtm4q4XF7I5HpBbwVJ1/YJ8yU92RT21wUoleTn0PUhHGLQCYiU2QXrSSwm44vZas4+hDi onDb7lmTHbu69Ef+Mh1iHtMoJiENh4YgxY6Dec672J2McbQaXykdkerRmgKsMmRnYrCiivAmgEUV pmkE8leGbg8QHjs5JhUOPAMJ4tLCySpTIsosDtgSKAwFroJjw1IB9gQpVsf6Uef/C7kinChIdb2M 2wA=