# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125103535-yrom0ik8nvn80edz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 7181fc699e9ecfc5c94e09a219d6b149a8ab065a # timestamp: 2011-01-25 12:57:12 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20110125072536-\ # px4emoj4edj6a17i # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbU7QCQAG0n/lGAyBAB7f/// f6/fcL////4EAAgAYB3coClAvRr5m552uhxLse7Sr3O5NW7cCuQ13e5d57waa6u3Q7anXsuhiJyx 7jPLeVvbo5uzkLdnCgD00ChJawPQEkgIEnqeI0aVPybSU3lGKPKaNAD1AAAGQAlBAAgiDVPFPU0G iNNAADQGgAAAOGhk00NMjQ0yMgyMjQyAxNGTQBkyMQwkJAiEaGgmiR6JtTR6mhoBo0ADRoDQGgRS IBAACaYgCabSaNT1Gpk9qGk9QGgG0j1AVKIAmRoCJpTzRJp6ZTJ6jJoDRsoAAAyDCoAsIGmCZ+8Z Bph1I9cXpTVhjbfYOIgQCDGk02DQfwOh6FY/IT/A0L6Y9xo1Hrp+4YKepzNwGD9YDg/o/KDFf14d ZHn5a6ruUObdub/BnVjGneWv2SW109qP3dnOQO/pgqVAPiZVQP+1JKrQChig/p8vzMOJIhchxr5v nH/w6Etftz4d+fJ+XkTx9PZFbtOBsNM6EGMhCCW3Df0VUKtIx6dPNnxrPdeZwZu+FuH9/VHtqmNC DdmnwZT41BRhZgbMDLV6gkrZIXquF86p3y2gRjI6Y80S7dMZIVYdqNQzOO2Fzzozp7WdYd71aVmi Wk2u6Ci+zxkm6NVkvnbNjeD4E40UwjQRiLq3URoLJegPKg5K/9BWMecs7BvN4CS9SEu1ITY0MY22 m02hsY0NoYxjTabY2xjG2xsYwbEk2m2+32F/6oEq7thpfq1Vw2cXo0CJoYjGeyMmaL3ZNWxGFVEC zrVE4WNahZzE0zTw7vT1Wa2ZfUJUzgeC20s+KRvp62YU9yxbeyvmW3ti03vvazp2eN06221jO0wy 7Sphs0x2dMzfNG9oGRjerxR7Pak9zN9jGnbMMFS7N6mN5TKGPbVVDess09PfNqu6YZcNKKPDp7O7 y8VDDjq0bbpx7PLqph42kma32g2tmWZp/Qj2nrPnEGRiF+5SO41rQSXNHpMqC0oVCeHyLycD/d+4 noK1bWe2kLwJVOCwvhTMzkGbwkK/I0/ROktp+Jbex3hx4i0E6QYn3yLYGRzElueR+XdXURmJKAD0 5IBxTMMScQSVQ8qpvc70mA8ftHF6Vgu7xMzr4jeZ2fLlCXY904wjDzRlHsJNHcu0R5xgYZCGZkxE XcvH8L9w1aUQjHC0+i7kk5I5nJjTbHY+h8BmfBnwgOG2504aGi6UI2um1UcL/VWV3VaarKI9qiJh tprtdIR0T509iHQlEqUGY6ChQqJ2KJcUXFpWHZPWk+V+V5k86+HZ/pdR9v5DxrC88uAxtM0DRCqx sQLXHXwrmT7T3XvXsWXsPkH1ELX5GBR4b+JwpjdS7KcHVM8qmL3nsfEK3x8XDOc8GyLjs06IJQC+ LjOzyL1vMKJ1PUz7Ot6hUCtqOUVKY9YoljcFCLQDBHaApfcQcAPXa0K11iiW93knKmjQqqLSVJ0s dUGdLHoWT6yF+sThwPZ8mw6C306DvVO7/h8p5nxwt8yqvnIWhJwiOQKEyRQok6A8Z1JNGjRpZzoz rWs6+kkCD1IDXTzj24DTYIIA9yCt8bHxA7B/aG7PERv0SnEREREEDGP3atH74kutcjgN+nlAUkSJ IpISQ8LwT/DEy22/2Zu6miw69+cGngBN8oQuSEmYRmwpMGxWZZhh4GCsMtRFTB5gXaFdgaYoME2A aqCuawLcy70tklalvc95Bvh6ZLmh8OGJYTGg9hki93JsjDDPuftW60XEhi2gkkqrbHUVd8XxEhEh SYIS+h+vF72M6UYE7Ew2MzroepQIaOWchiZsSYcaIHdBLm6Uq96Iw6ZOE32lYzIu1SS5xdCuJ2GE QQgL7WhMGNPkpMdy/BE0KDwumR1LFAUiy65GLiSHx2Ni9rHEa0ZQlMm3E1HwZsWo0rZeklwJIhUh gA0g7C+T8HacZg24XOox2RNwRPLOTYobk0Sg60OCg5A78nxtBdHIGUnjSMxoMFxfMpeNIolf03AZ VtFums15RO5L0iA1w59/K6SJTvR2c81ZYIVXb3WFtL4tbERh4ZDExqbWvtanfMKbtA1tFV8dizN7 XpUv0oazsGPjRFYDyMxCYNpjBCXnd2BWo1VqLqn03suCjzR60efE9rBxe+MeDTGkvoiCIlEM1IEa p6lSkRenMnss/QoF0ESCTFfDeI60pRRucUdaLiQjB6TBG/LPfhdB3udZROGnTY80i6AInArSVBfB C5giXrWE94s676Xl1lu+l3xZqMRjvhaVQyXkaPYni4UVBE0PIYc4Hau8fRk4r3zu1k6gEcF04OJQ 3IJseHGcjqNFcFBpI5hPlQ0h2pdZC6M2SyqqZbd9hTk0dKWs5pUOFSjB8ol5DEgNcsb+j3FR0Lgo uhtoxqLek50KNVnVuEkOURlC+W4rkPMcHZ0YFsM91dlMrdyl3aUWPK7rEbOAOqixIjRZ0Yu9RRVz UixordYqzwsYOLR2aM2ixo5MnbRtYYag5kI+p2IWPir3G+mExBbuGOZiOOM4c2Vm01p4rPbTqZvb Oi1njF8vbXdWTog7kcIuYkfWTSElfwZ1YjOsdnsehk35lccuxU9cOsmTv4EIkznm5qpY1pe4WxIq tyadMJj4ASJTilCUTqLxPe5N1MFCZuQinvpskcwNhU9NaLincl2HCsSRvUIu22sXzvV24pXyuzZa waU37uLOKlDBM3nQElCY+Ludw5kU6QMzJkcEYWLcOX04LlUiLq6rozs2WrV33V7gte3xrCNk7jGM YwGMYwGMYxjBjBjExpt9yQkFRcP22mtjXSSME2gucXVkoYDGA8vHm/fVrlk3vMkjuy3a07mq1jWW k4dHkCemJLK9iWrm3U63XDUlSIk14is3dR4spI09BawaFnirTmqoIikms9S0wYme4yNk3LW8pVHw Yccxe5g9hqtK0x4TN5mTqSiXFiRxZaSgG5ElsJ4jchdEjM8BgkVGhMubAQghrgChbYuSKFhYiKmZ i0VOMjcxJm5ctMoU4vdOBthEENe9aY4G+uUeZfdaGjJvmhixfeluaKc0HHRSRsTMV4XJRIL2+YJv eTZgsVnJhrOarlvwXsMWYgVG0MaShkXv+DHqd+5RevdLdsp0kzTVRX6crjp1sW2xdZtzLhkxDB2E W4UuCZwAXmhgGTXDeyi0GUyhvx8DxoWH1weDVjJxFo3PAigUUqF8UtfQs1dnEoNa5RHILXN6Coqi 2EoKxdSBk2JVJEjRCdzCImJDKSDTjkajk4KurTWR4OMdtm0SSYsr23kY8BTJY0bkb031O49TEckH JyNFE6EGLilBjtkvHc2LjoehSL5BxI2Z3tVVlrgu1bmC54Oth4JCCnQqdQwXGOe+W1zMyhUgObbD nyI509icmKFIzpdHRctM6Dv1eHCroNJqWwpjcM7XdtnhKEXYppOabOHVjNU9O9niraLbJHj5T2q5 6gxAPA8VIQwknjgMCuM25Mmyg21UGUjKipXIkLnIAnnREbr1bknTIph7utljUuQ12KI9082eIhxF JkulzJ7wm5YL9MjzTdERblRuCwIZGHKFNO6rfFkL4esHQ23A3x7YOHh4arqr+ssvZZUxphiEi+Vw 403asLmdASQ7faRIlJN+0169risy2vGvopSQjbq09KwlcbX7ilVFV7hi54wjNMnLm4qsGHNR3PJN 0xdWLNwXOiRFLclVGHftuZt7zQl7GJe9fdJZ7zkujL83y5nHpYtV6ZiDiolEwVo9pOPNHs0JP4r6 lxty7Egnyd/v6PA30Wkzt3m/FJXREQ8zclKO4uwtrYJQjF7tiuR6ilDdBaEkmRY5jbocikTB13JD kDmsEsL555SmR9qTIEJlC/M6ILyIggxQJ1q9ayxHI/m5uXyVxRlWlxnLF2isyApQ6Gs0OnVDqCBu nqmCxsMdzTe5Obq22z17dHbcxWJEbObg5b28yxUudGElUruUL6PU6eWPP3Rj4rsvtMu++m5vHyPL fmsZsotwSjtwjpiEARpWMWfDF+jI4+SZkwd5Q86VVvdl+B1KM09GDJmx5+fuo5WG21uTIKuRXMfA iCHJwcPvKqKT2PMtFRIGsFY1kJJFAPcGHDFITnUct1RLsxqqIMD6C8nISQ81CQiJqiPnMVpSyERQ gKHQ5O8ieOxbOFaxYsKZPSGIzi0oC2Li2GPFiyCy2Eqy8xRpARsxLTX0mpzb3N1YsGbRlXNVk6cL GDXnTarRR4NmaqVUCgqKkTVjRJPjsn1K/NTC1x0h2vLEI8PCM1aG8xuVcsQj7cJJG4lgSEO135Yz rfv3VeHIz6BIIXqTId58IG+JbJNcjEyRHw3cp8i3KlubHY7CTnWdCI2ZBEkUUh08SaTVyKCJ7Ry5 WNIb0ZtiPUkkHIOQVTYu7k7fDMsQJkyRcU6+FLywYmuwyEPBBzgsc4NT7isRU5PeTPJsRNymT3fd yUkiZZKVhSU6boa7DoCsuUx5xbiBcCzSXedu4SR3+XhtXOefLqzV+erprVGbx5tNaqr31kv07hIR JLWbmasnZLkSTrKKj+Kd43TEUwbOMrpKpUje7gPFuE3kMrqWuGZfhofWXEhG/IqxfVSNnoqTkbj+ daWmsYM2y2L4REmZPOg6HYwMdMUOGJijC6XGQsRyxuOKeo041FQ8eBzg1gOtksc3FRpzRYtdVFrZ eZNMHOxi+3zzcFzzebVwHUkdxnoOSNaMlCYKKNsd45ySNyZxCPkZn3vOdBEScJVGJYV6oIhDJn1T TCQkkkAViyKJbHSKYRcnSEc4tkF8VEUjGKXyDOEUmNrKKxlAY0pQpdBu+ZQL/EfaoG9PQJwSICAT Il/WayIIUlDDImxAoQYxsTSaaGIGI6AqaQ4YgiCJoQ1BUMB5huTyFaOYOpIA1jqA1IIcrxDjAyJM gglJ72Sgv+vzfmejmdbECwQQkKwgRCsQYn0j1fbEo+8tHQ1J5MFX6v6x9JEr1LhD/j+gfM/S4NY4 m5kIpkIUZ/n4i5i+qOGUfUXyWmcmEJjOBtCxm+ta7Sboxheq/gpNH1smi/vmrrHCEob2byWzCWcX ZgshqxVnSXR9E1ktjIthKsIqmZKh+hleUxv3ClxSfTVjJBrcb+Kl9mW/sIgkKSR6X4vyPFyJ5RAw QsC1rIYGBgIGBgggggIIj3JJkgn4J3twJQ2WF3p+LSK6qJJ9JumzQ1ie6e+6TT31fmfLV7nzvoY0 cRHte57po0XJJcwbmKrusZ2pEWrGE97J+ReRPvfafISFKGDhi445axIhgciMo5IgUIdUBESMjkib HJEchuP9Ejjjg0cFRRTZSZE4KtHxvDyyEMJa5smzRmvzblXgvYYMmFGq261q0ki8TpK6OUwgMJhQ Sp+CCvOeHSpCWO8VreZCET3R8h5kNGEATzTAgrd0FDI+CBFA3g6SSc2N+V+5+rSdMcBRJMi+QdRm RMszeR3lNDzrMyokcKCgY4njlSdBUSOXJ5EtMpv6EB/UhqJA9szFCpHYiTKGStjguTOnT4h5ksC1 uUH44k5g7hxjYgTMDm2PoTTbQNGwV4OCOBEEFgRYkOZKlOOOShg5wXKluRvcyh12FZevBhoM5t+8 o8DfCRBDEIP90vESR9Qqdz8DSiYfrEMy2sg1nxkEiUgkSoWYhCI43KC5eBCQISBCQISBCWtpfC5B iGUOAMgqAqDYMDinwXjv9IQUxuxQAgSRCpBCGfbmUmNEbTcKJbUbpHl6kLc93ceJ2WpM4tIuVq5I gY9ShoY8oepS4x59WuvncVy/ZqoookRlRo5bls3mTJa4yrJrr8mqRFzZR9mbus8TosSIubOumlji kQxHk4sL3dxA+u5A7yZpxzY2F6qK9zvNFf1/vTxxqwWOLaax4UDe8qG1EktikSshC1E1qwKmtQQ1 JuD5hBwaTKeSLjCZpXu6U7QRAj3kOGqV4SUcdVRIoKjIxK+vgdyJws3kWb0KPP5mNGODxXvT9jk0 YzkwdY6crVWredSBFziKdSZ1AQUjwZJTMkLIWIkiZyYK6sXNXBzbQHadllrViZMlFFVjf4uVG9XP g7Msl7CPHCa8ZYkRqscmTykmS1sxUXKq6TekRuWLS18cg9EHZfMkkdY27SWwOo78J4hN9pwkFBtF Zz8TtCZVVO4Y3zmDMJELYoIQzZCstmncchQu42Ft06cUs2VwFtwqlihM8RyBIcUgQY7ERj2eyudw iOMeObHmWdPtO0dJc9RzdWxdhHhAcw2NI8nsds3lx7heZGgcrGRruMyuPORooN5Po5cNJPAQbS+T zFBU3VG0oNZuFcQrNrgghXWRBCkQyeVCbIB2DJZCOiOrJubTieM8bnO52Xfhnr1nodzSrZqzd69z bmTBxb6c16rDl51Wsx8gyNHPhznwRsA5CDBkbkwkZOfbNKkwGM26IJzgvU5Xp5ky4cO7BWmDPikT SWmVsu5JiXvUgriTYbZpwRJudpPPIFOugEJvUrIBIc3XSi8ANte2qSc/3VfWYsdTfAeVLAC8kYkx EJBYdQtNDtpRS1fIpAdpJdF49RRR0Tv7qk6pEUE8TiOBLyG9wk9SnF0VmPIJ/AaQ1JMz4hhScnSL kiMlIl5KZwXPgJFsGXLinoMKKXwcw2LL16xm2hJd8JRm9nr5Vrq5OKrjfwYYZLWHBIjPjluzWVXX uBlXZUwkHNmqN1XNpNnVQMoGj9BXiK9orsg2t+Q6U6/aUikGPPSlRW4L7dA4BkyXN7ZgTfZzF5Vo QhBMIut52jo7C5W3nOniLamDmP6E7hQPyQ6dF+48WE1xYARgi096L27wUKEyxjxuBOz1NOzgb5Ol ad8ZnfHhAUj457c4rmzpFHskF2o6QOZ6BFO1FtuE4g8w3IHxvmCE6iB94hORsQTkxaWjbnQ62YaD 7O5OhLkzJeEWDuFe9tdKKYanzN+k5k4K6TJWgEUA0PhU9hkHTt1dmDZnFSxQmghArnhK6zr9nN4A VI+pF3oK/qm3D7vDuQTBv8XgKru2o7iBIwhjQOKu6E2VqpUnJFCbYTkgS6IWFFfWXIBqUEIFZQKz TO9c0XF3VGxg609U1JphUmivevU4JC3YLCwsSpE5mhxlmzA2pSwOQVAgCAIXgDSdGQxipUnFBX3x fGfdQmCiQMgJpEBkBqCZEyIgkwS70rUxZFcIr3DkXjILi6dyaUrYS3K6kmD2GzInRQPlVWzQIbUg Ki5QNdMyj37JpQ2bej1R6d6YHDc3aFZRShST1KRWceELqtqApahUoLRXUKkwzF0KnpWieAqfidJT BFCCVl4hL3mrQnQVK+7pSjPcghK8whcTekHsN+akqbJMhyojEAJWZ/QuKVfDiBU5RU8+9MpxJIK9 /lhbHWeACEkJXzM0/Ql+SFYmjn3B7VdTrVecVAwAQLqM0IrIakxkyb7TpBIgDysG3Ia09FBDyQip MmNkk5aMc2b2TYipHak+LZEtjjIkEGrvHN6BEBOYcS9Nr9iSFYASXF8ZAhjTpBlfe7Ii2gWAmnrr LyazqteHn9jit3dqLtRecK59dgM7DjmAkc4DeICGIgiZIAILCE8MCvvrVVLHeiR7ieps6DKIyzGy nwqtykQ8FzyRfF8gvnGXUmAD5mkjnYv3L+Yx0jN6YUonpnpsb9W4NJQK+pJ21gIawYUoVz9hjedn aLCkHHkL1bS26Dem21MVksFupufNbiyDMa3k29PsuoYhIhYhAiGkkl7FDpHFQRpI1l4L+vMfNQKU h7ZBsjjOhtcOgLYNgsuSBEViC+qhLHwOF3TsvZry7Nubkui6fA+HOboySXwPAkmdGgLKYNUUpW0k zzCt2Zkta00griSckM1yZsupNAmgmUyNdhhQTMrtHOQDAQJECwsLjaGi5BDUpfmAl9L749RSL64y YNusxLoRLMs0RD8Bh0HJoMhsTQQUmJBCbnIr1LXYQFtjDjTPiebEW8p3FqBsQIarytTziY36jgY/ zJkjQ7cnBFL2kgDIWBvV0+vhmBG0Fk4J+ratvV5TnSGga5hmDAzWAJew3OSiMW3ySAHh1z4t5OSE 2PYukZp117RU6RUx/aPq3+au7SryCpai4azaBzPJkCy7jPI2ppYL2Vru5UApgpyeIvWSO1fE7DkF S9vBO6hfm/O5P/CZE+Kf/F3JFOFCQtTtAJA=