# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110216134146-qgx5b63yyjxc3kc9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 65cb466d1e94d44980fa19ea65f3d51b08da7b98 # timestamp: 2011-02-16 15:43:18 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110215101815-\ # jibmb0mfx04lp8g0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTAb0oQAAz9flAAQXHf//1JD AAS////wBAAIAFAF3uWw7cdXatdAuhlddcEVJTaZU800T1NiaNU9oyp4RlPU0YgGgSSRT9TaniEa Taj1GRpk0AAANASRTCaExGVP1TyJ+qep6QMQ9QyYg0DmAAAAAAAAAABJIJkBMamTTU0maT0moPUe SNA0yKG5sDHzfxbjsaP5aag4flyvQRaDJVk7HlQTjKAwVRzO1g/hHcdZeMMMl3cw1YPKJOTW1BcM YkCFT4OZEiQ5/Shz0PJzv3D/aTyyJzcVGDKXvNehhiZwGzzNykPI/QsFeVcPiHUiIZLMG39g+ZvK gs8KoB7Kmo3Fnsd54EhZhCAbD1JVKIBcb0WTNYjl6BW48UCmL0lDC2sd4xSWAzK1L151OeAw4yQs B0osrWSFBitH4MsK2ZLzWihSdJqyvlGblowmFFpbOH1oVjElQmqimKHYR9OZYbyPi6V17q5IUTka hjh19hlNIXeMSJkOMETGouOHQU2pLLWNF4pKoGefBMhNSBPhUkUJa6CuerI+UZFAM5DvCWGvTfgW UWhZbKUxAumijPJkkJyIFpQha4H9NEQCRDRyWq7qjGn1yyVO595ZRqjEKr8djMekZ1A4LEit4nhz K4vYOJNDMWuzH6BIOFL8h5UWo0G2fhgksYq457PCooPO+FHYUoimjAoRXFEdpmaFS28GZwVy2VZw zxF3AXqhfyi5iU7WEGWRkFxtG6KHZktrghtckXhSH39grDWM0lsNuB0BwM+jHAgxu0JIoZk6aFxW zDjHOmhPQxZB/ERhiayRirNaReOtICyWYaEjIyGLfqfYljTNyqCbEx0biN466SNMx1h1XnAmEXRH AZkTMpm18tNWcqIYcFhG0zBGZjfKWGRI/2EeA4XJi5sS0tLBpFEKY8JDhMSGiFaU6xjsMjuDiFO0 zHY6TeMEzxORqgUlYMMwzN/lr5HMHjg/oPAUS4wOo9JsD8oA88TSADGmw1bfhNcg+/dMXjzQdcsu i2qgkX+bEHl0KyOcYxM+/JIsLBJeh6cVqUK+0l26bEBT82F0nsPJ4wTxnGq2PmL4gvh0PULj3KEU ZGRgeyZm08iEqesfAzVBMMgXkeyBaG6Rx96rdexSzeg5vV2A/giqYnGsQKbbLuYWgw4xtgOq73dQ xSGRYV7/Ib27+ZBIWVehmcZxixy8SG+ZPsXFCLN8hzsCaWN5v44+BuRzcYnYeYRpgWTcPh/Y8NUh egfcTC8LLq4jnfcai42GNYEIRKZALjrGMZfqvurMW42xxhqmH4bCZpZbS1ixdG0rThXVoPILSjO6 8DSXk3DeUAYnbjMnNhaUnU6AQJSpTeFo9wWOCzyZodjzhCEROffaUkpUBxA1Ftx4pGV1nWd8lKU9 AygcAvEf0fFaVHAsAzgZyJAOJkQYB4nAy1lRQXqcnNMSExgqZimI7INoG43JhwMOd4GiKLske5eV Go5j811LyBEI8jzL3n3JJK1DBEmRStRAdsQHJHkkbocaiGYYDy5GEEGgkU06zjMpsUcgYlIB2Mae 6CtSuR1cLJcytccENzGGFAPFFRprCzXcmUR1L4cCxgzuACrUYRWUMAn1N7ryaQqIzgoESCXqOI3m A8uRwKzmAxIPgw01JIkk0HfQvkQLyRqYHDbw4vCZSOHxibBXYMDDGMloLAzRG5LBKLCdcdL0in05 iqiVodMUgLLzAeSPJPUIB0J0jW40DbepsD5aDG9Az/QyuU8/8FB6H/F3JFOFCQMBvShA