# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101020125959-i10zgevdps2yra23 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 9c4f7d7368830c1ad1091d1711523516292f1e44 # timestamp: 2010-10-20 16:00:46 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101020115325-\ # awy8g543bms81hhz # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbJElPIAAy9flAAQWmP/93cn BEC////wBAAIAFAFtvdAdEgNbGKAawkpNTTSfqntJMmbST0bVPQnqD1AGQA0CSk0GTJqZqm1NNNN BoANDQAADVPFCG1ANDE000NAGQZGhoMHMAmAEwAAmAAJgACSIImCZMjQmamhMmRlNoRpptJkOwzD 2EvHWXmBiYvpRZtltEUkzKwqaWPa0bjrcQrPAOKlzBkRCbosPSLhgELiiBohmh0i2/1HvIPySs9o L9fZh5fenI9mFJg5/aqR9cCQUDmOOh8AIQcDujMGUTQdcWR1RN+j2FUAqRfF+YTE4VwhonFZK9u+ hbzQq34cKVbbQbhC2sLmAs6uLmyibu9cREiY/grxkCgAmF3iYAe3QHAXfqoThBxaqISiDkGJAMjs Djhs4MBVm4WWGo+IuQiIoCvMEXUOKBU3aRAXmwCr9fI0OYZQAmJyA4pTcAoGxN7sVteIoL1+Cowg o7vUUfTJePH21huKwuOpxbccVuYhyWimccI05WjcgE4kccLMdGhgjB343K7WIqYU3NFAlULdBLae Yx6iMgw1iiXUsYyhWjH40SU32Ovc4MBNvaKtrFbfCoscKIwVZzhsaJlZJbiG2a1iOWsoKL9VAOET MUY1hbLB6svzOS5FXQhSBtDPNrL43Bn2qR0IZNtgL9ni1pn9LjIWCQ+sTibfcC4uDBCQteFMKb67 1DQ/NuwTsW3Csyk0SyCZC0RHROYqivDAqiKp+ZUmeRIUIBJ9sIDKbRSVhFRFWGhWRBhe9IirRngG 0Jk9Y2QVRuoXRchFHVbhAmK0V1kSqzHIKhQLgvqE3LfqqOEeaeiieQNxtvuibApYixYOOcC8aZMF WQCQ4mKBpBSkxRSMYC/gOJ8S0yBis8YM3adx5lwtDiAv6D8L2Cxa2YYGIB970Qj7KoRpR9D59i/I NJVFa/Pskby0zGSx9IhS2gcXF4BIDwFEUjn7tfu3B7u8Ben0rELCvAgl6HYAvWO0iIyJnbZWI0Kg F+ze68EmOHyTmkYizwzdbO0oETV3ikXGNWIfclOLeixiIdzdMQiKTh6pxRCqYrha/X5dZ2aMZuIU BZiFkV/3MpDHUNmzkMQvCRchwphQYOCoV32Gw3MjFwicGcXpTlFgjtDgKgddklt1m7sqE0QpRMH8 31M2jRXglw4mU4cTAmvHlppGF5JQPS5Lp91rXvsNhk29GEbnkGkKiXqykJ5CMfwaHyIUCwLRMFIP 1VnfVE1nOHNdYqwKRRKhY832DQdt3AXQLA/R5HkZtMRyddBmPfBeIjJQx5oOAvfuXcMwbjBuIEbc lX4LFGJMvE2swIH1ExE4BLMXIiG74C7EpWeFhoWBoLb7Ck4iAGwDxcY6JR0RFeNJhQAv0qSgIXsc QKgKhwAprEaDiEwbhjnZiOeWooFDesKzsSF2ALeL8HmM6GHGfqMkZnIwUjYHmdRYSBSByK6ydxEC BMiJQGC8rMEoCYsDSBYIaoQzCYUTf1nRgF3iIhVFsxJUASIL8iFJKlHc4tdhhiMMJw+aXVIgUbJn eLl0M9oZMdFaKxAHAmkVHQvCk7fCYhUoYxylsKCckmFOItmKvJ4FmondyZmVhwAYpDaw2JSE0qxD K50wxkDpWjlJaG4pVkKDDeVhT1QSilSK+tonnQndIut4ieQXky7VnJSSctk9oWAmA6XqK2eiZzBT F11hqGL16LeI/kWh0VdiqFwEPHfwMPI/xdyRThQkLJElPIA=