# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505121113-f0y8rxqi83oj9ijd # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: f9e1e42ef48be9e4ce9dd305fdd22f32d8e9ee91 # timestamp: 2010-05-05 15:11:22 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100505110314-\ # 25fyzo9se3179cx1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdg55MsAAgpfgEAwW2v//3MG AIC////wUAR2e2O2tWSnU9zl5CSSap4jJo02hMgmCY0hpBkAPUEkk0YUwaKM0aSbU2oGgMjRkNAJ IggIMmk1P0IyBNPSMaQ9E0GQZVN6iaehNNGjTEaaGgDI0NA0AJJTTSnqfpJ6eUaEyD1MmI9QBiAZ C949+GmWXHg3h2+803St6ZTw+7dXwvWIykzpM6oCOLO41c+AopHjlM9ZI1GGdmY5ea9o0ZdWqI2o aTQ4xxGGye7W901HlnIWs9RT/v1TL0/c4M3qw9TnrZGB/JeGGvTzYlzlU7deJKblxuEXBF2ogRPs +DKcROw/RyeFb15BKOVcrQWar7Vj7JdyaV6eKPZwJ8ndVHmLRegLuaFZkV9U/NFZXMT2O9mV+EkJ kLcmfjeOurQUWRwIAoJFaslWOPEgUELiHdUtqtFmVE3dj34EMuLArYLJy7s0O+bq0TNQJi6pMRFG lyeqKVDE1wPxTaQOFOM91KqfSZpRygMQOkhdhNbdQwJqiBksyC8E7QfYNK99uFqfaHFODf4JYG98 pOFC9mG6xygtxfZSu9R+ZnwVJkKDmFfKwbIOpWDjyjBUMo5h4mYnDMXuLlWedJ50Z09c5fXGwFQa thG2fo0n7VbIisjaaFSjTon+BjYsTF6gcrVv5V6NKdl+JyIxrQsanVJmNZhri18bFR6y9Yqiw2Qo ENhgZiorOiCY4F21dAytMp/BYKmXbFv+OXl621lWScaym4Yzp8hWEckWSZ4zDDci9hdrG7C64pIX 3u0ehiDdPec/GEnJweFxo2HuyR2SLmZm9vu9CWgLMHoDRlTtg4X9spXeeiKp+cTaMbdCrNpT5+Jg hVnegOmXxEvK2CiD6oULDEPCGfGl7kqFJtcsNOVWkDiPOZxXQ2+0+YMz9Wok7cQYzLcYeJAmtBer JK9eBE+Kjb5XwGhsZxLrfOJWjla9jcSOT4ndiGknTk0YHBULE8sU5cUc+78VOeDv00TM5OSWi8zn JRXx5ufEiOd8ZFMDBP3yQq6azqkp4jSmRnjOXSCyoPa+NaSoRRNUIqIJ9jljiWi7TIYEhykOJavS QwwqNr/x04mre4Jeaq63BgmYJOnnk/JpIa1nBodRNWxJOgKmgvFlpXJkqRxhtFXIHp9msGpvwXrk c+CDjvDRQaCe7vFIWIwsU/hmQpBASZhCpwoQZAm1ZsEosLAV8lecZlCLpdJPAgvCDp3j+hBNgsp2 LLOW25YmQek02lODSmsd7pRG4VBMUGffLT3yXRWuvnzEWUmQyj1m9kLpVPwyx+om6ADEBexI/Ewv 2JOCZcHKum/dKmYH/OYhGn2LZs2KEZRIGJzrpZRuvrq7Cos2awmEG4L3pT1YNQyiaVGLUUJKpR1x 6tAN8I7fasqYqx8hWyUkSGbQvFbYsXkNUDoLru1iiKIuu5EB5U/gdn+3XfShZVgVmxjLmOU3+mq6 YMoNixFlmONPxrzfLlOfq2K913SIlACvi9ykSEyYvbZ9hQhPXU1y16TZHcOrZ/8XckU4UJDYOeTL