# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110130200528-09fy58zzr5v1i1xm # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 428212514d4f70cb52be19ec1d17281bbb0a9404 # timestamp: 2011-01-30 22:08:35 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110130172240-\ # mcwwhxxpqyrn0mva # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbChLdEAAYlflAAQUmP/91Mi GAC/7//wBAAIAFADeu26mb1a0a294SSTKelN6TFH6mqP00o/SfqU2jSeUaaPUPKBtUVPU/VP0n6p tU9imk0PKGmgADTQAZJpoUzSeplH6Ij1AMgGgAAbVUw1D1GT1NDTQaaADQAABJJDKn6ps0JgpjJJ ptT0mCNG0GilmI3+I2tQ33Vs3oMUIbF0quXRqtoiILPAez4JsS4Kju3t118+lXL7P933PXf0ZmK2 Lyczrft1eaHMrVAz+SXumAmrqYCEkjnjO95j9eIckTEyFG6JrKIEY9g9lQBkXgFiBAQ0g0PAHvHC u4FZIULQirG43nDSRs0HFkGzA+dLEihkPg9FbXvZyDAw9KLkWnSXgaaHkZzU0OqjKLlc4rj9oejM yI8gKTzgKbMykjKCqquxqDLm3JFhC7GKCyEqlCwmrX7XrKVbiZMmtxaVi9XuVLlZvK9aDoU1K44c t+c3XsqNUgiuJVzWDLWiKipqRX6WlDn4ZMp5P0Wz0kClCSrYXKWGdyML84mJ1wswL2m8zyQNGFoN Sms6uEtM2umkhrtUKDfoOyjV1ChhVyzDsVwBWriHaGvuSGkTUScUijFYRra5PX1J+mstl5VVa93C 1bCiZKyIMezoI1bGGolRUweHfOQcFitMNiDntId3aCdTcRG1VPC9B2XXs/CxH6ig7STpNW3jRb95 fkbqPeqqXjqTPjm2fBgYkoktxTUtU67e5TKvnbZmYyfMwKsFryMlvT799wWZqxcp3x7DdgzsgG5h qLS5OnNCDEY0fb+8eYze5A4zeQMOHDZVA0dXIN0+WlsGP1k6rWzt00oXNH/uP4Iq/t1fEvyTk7CN M86yKIJ0UTWGJE/e/hiYuPIoLJH52lwNb2EJpz9qkeWC3YHfXXx5ql0cipYqYmUDeEoe+WufpRnq NEZz8K7U2xB7XBhQyDHRMEQi5CmiCYjLwc8fyDRIZuKDqv/p6DOysWxU9Op9ZhU5Pgwp1FhA2FBp 3CTAPScjYtXEuQodmZIfbtyIL0ZznIF+AiuLlJ0L0a72ZOKKOduKf0HI9CCxswTCkATei3Tm4j4w ERUl3vlog8Ey6Eb300WZMadYkcCFkNySFJER4kREqEmMlkyRHSi38dg0AWAOPhQVFnZCVbbp34Rv OdEBIRDzS4J1JKWBKlEow2HPxQJocsTVgv22OtG1H8m8/8XckU4UJCwoS3RA