# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101021080318-5baog5z7a1o0q90j # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: cd4f6efdbf629dc20434894cf437f2db9d82bade # timestamp: 2010-10-21 11:03:25 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101021075006-\ # elz43uh9qp015wle # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfmPA6EAA0VflBAwUm///3Pn Xg6////wBAAIAFAFrInnNaAuHYwTW3OEkiAKYTaAyDUzUYUaepo2o09QyD1PUxAkkJNiaNCMhTTQ 0ABoAAABoBIkmQUeqeyGqZkxRo9Q0DCAAAaAHGTJkxGJgBMmCZADRhGAIYBJJE9NNJgEaEaajymn qHpqDRoaDQ0A9Q949kwraMF4qkyW2Hrx8O84k2Rgnpx37eLpCmWXK7LDa0KlKWV1SVUp3TiMll9u k+5bxrQuwm22Ngvb9PigrnWzBmLz54wYZdyIY3W9M7ZDZFkWN1ETdHEz/WfJZVg0r7X149Xl6Q85 6lzlcqrQ5ItQdEOC/TlJ2Zo/02KuxZ8ua1F2gotLgGxqcnBwp0V+URtw5JUHIA/aCQRYg5Kh6DGr 1Gp+OurhHJLruKfEAXtCgVaSo5FqVma1Y4TSg2QEMBtZNZpxDiEzB7QBiT3IIl1qBLmJCXKdZLiq QThDUDSOzzcFdhNgy1mIoFpcUP60FwjQIgr0PYIUUyFErnQySV3wMrCVjCUZVqYRu2G+X3TSSuQQ YhXPfYYEcyGYYrvpPGicU3yPUghtvHePYIxMTvw2UtaaZBpmamBrvwJyETh0gDPpshPuM82psL99 hfbthk+KCzijTMUvS0236ElIx5DZ3sCDZplR4ktC0QIuKQNRtmVuT9UGkpEyUEDwldU0OjsQUlrH BUNWCnE0SBXyVV9DJXsiiDggnhOYeDmQbTIXYqYdfF1MCErttVFbGDLmhwhaxDnq4OO65AxVa0Rn vz3CN3JIzQWmeayES2U21dhY9c27ZKLFBrZPWVSw4PrognuKU0ejbNAxJbY3ktkMoDYoHwtgmuQS LCVSRgYwi6jmLjDBF5xEXlkzHgQ3uzpfnJI0QPpmwjEN6DEeWGBEn3HEx7FRnLBpXXjrc3T0jXd2 nOzndq9mkgd0CGvgWTEa8NH25NFjEyMqla6E7pHWWr4XuWjLCLTubO21F0Ai5DWtYEhRk0kHn7G7 AzR45zMJpBlwUm3eurYrEGsAj3xpZhgY5q3v8Yfz5hxDoSXly5oiUkamP0G93KDDGQ9AQQqVXeZu CQNa4n9VsOawNjzjYmGHML3r2TQigOx6O03DkwixBmPWGmnYdsbXN6Sb42jw7wC73PogFuSXGzdO sUQ1AiCVB5ypL5spN/u1cEGI4HALVMNfB8BjrMsryUhFSpag1nDXcRdvV4mdpjY9S15eFIHDdyDS V60FV5JggttQbXoM1o0N8ppqpZgBwq0BhdSXbJyQnsJ0PRWaJGsHpUWHdm5kGogXivmQajcbAqKc vb4g5ZxOSCwz2DiOHP0ufYaMSe0eW5FpWeZlY64ohVmuYuZ71okIa3XZ26cf1gjarm48klWm37qv BwZ0yM+WnDHEyfXmJBPSdpUqBklXSa9WM0mIvykqjcUoNIXA9FrWxHetDjaOLNgjqAfZlGMOG8oE 9gJb/dh13UGfVmM9tNcqwJNDSGRA4xXfaKwVuMo65rXplmkjFRQLYXpdUSgrQXG0VSIG26El56Rb qQDw7V0BWKtyQbl1UgDhfZdBVj0un7wgLaigKQB7bklzh3HqBk7ZgplJaa54mTIHlfHkTYsN47Ka VwykC4CcBvdiB7qqUSqGicLPy8euEl5hEcsRFCxEERcXcU8/ABwFUpXKDaD7puvMUsmQ8OT43LrU uGGPaI4KjIuyOcSNNc0aCbreEt9+2sAuT0TnSdSBp6pBnctsZr2hrc7lfaKFYjn7crBupEXI1DGA 19r17BWDXQvFdHHluJCmhyC6D0SlxUwqwtUI4LlpNBF3NdFFaj0ztoufzq+OTF6WVauEyyqcRCOA T/4f2/8XckU4UJD5jwOh