# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101111095535-nmwbjfcenfjhdpg1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 52aa642dd995e4b51c017726ada7d2b87f7a91af # timestamp: 2010-11-11 11:55:48 +0200 # base_revision_id: marko.makela@oracle.com-20101111093909-\ # 2e0ttrplgxxno7ph # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdUffjgABLrflFA4+nf////n n0C////+BAAIAGAJXL7ajaKAACzGQA0UakAMJRCT0TTUn6aZNKeTE9U9T2qfqGmoeoMg0aM1NA8m p6nqDjI0yYmgyZMJpkDIaA0Bpk0MAJoDHGRpkxNBkyYTTIGQ0BoDTJoYATQGEiKNEmKeU9qIfpI0 xDJkaGj1A0aNPU0NAGmQcZGmTE0GTJhNMgZDQGgNMmhgBNAYSSBNAAjQBAaUxpT0jehNJmSbU9NT EAPUXCViK0grQxmMhcpXCyMbrG22kwbBibJymsc5rFR2wPF8pNqswFNd1wyLWhuBro+lg2rNFX3w A1dLGOYoy6qRdvZILnz2WpSyXUVkNsLCC/y9TuZqSOU2Zwgg7b8YuprGfHJzoE5wjJiG7UY0Qg/O RMHXPCbaS2kaT+abgx5uXmNctKFRwKxXDExpFVEJCzvESq4bHs8bDBhw5HRQKYuN0D2EawLEPGq4 dlKCMDwWVzDmyFqVQQOpw8D1KoCym3089zvvzVdYo27x6SlNpH0cXFABo6e5p8VQhKyXcuzI901V TpLNDrweWmPTwU9I8x3ydsBaZbO0sRrZvsORiU4GhyTxmqKaF4nGYrTp8PiLk9wLwy2Sei/GdCBq KzyS5wWnmrsYm2F/dJxESawZBWHkH+juVwzi43hqN5AccRgelqcHOSobBoJaDcz+S6SiqIrZAQ86 zHEQMsNb+83xUR0EiJ2HI9oexhOB5gfD4OFEiTC8ceB1bczvQezsx+nvSXeuiBkEw3gDM3PkgbSr 2eVoh/pk/r9LsGyzGZmaIA3ikp6CN5yDgeYPkXqtZLcK3u/jy23DwAPsQephc1UzgfpaC9qpjdLZ GgmQDhLRAzDzYNeWOGqJO/GCCyQ0rK5wtU0KUGQykWVk+dku35IMgzC9RSWQj6xhXfe4zrcWuzsm FPwi9UVM3hBAeuH3eXQz99glaMJUiWNI+VEUEIGx1cN/mbjp9MuOhVxRqfWONo3sx3q+oj8wxYL7 cisbLhq6cI8pTfIt1JyDhykGzOKbhTsISUOnIA2Z3EtX7rGMa4mM79WrExOE5D05VlVT8kGuAqq2 PmAVF2a3YKdZdhO1nPdS6EN9A+QYzcp8yAiqOtqqMkEtcaVBkQZGhRX1FpAlspUqJ0QjCvVfjQaM ExmfQPCis2FRwmK7IoJlz75MMfNiMsx3WzgoNqC8NDuye0avdIRTvdRpRrwoKqmgIh2ReY5CHkA3 aENVVA+pBAiVVItLSWzVJBIsPTjjbK1mc6iy3jaZ3GVZTMzpH8KsTiZoMB5c6zNFaC0yxfSZzfrj LFh9b+yCCCahwOwrQQVkXMUjLJ90Uf9oNDG8xs0kQN0c1npHFsGcgc8exgxvQOlga35wJkDiQpNt T8j6UWl5O1tIxMPG6zDa659WrY/NXoJTWMXk6LqaU5BOVcBDjKiBfvjViRJcC/yyLsC4+pqWrwQ6 tjGLURwRnAJOQ02kFQpwpdSFgL7GBHV5jdCPaSMbbaabbjRnResTZqqZHQogZ6irmSqoBHGAoKAx 86iJMbj3bdkuxx9RpB8koiRQVV2DxLSc/h+B3hIYHOQ0JwQ1oR695vYxIWl1C616D0a4mK2lqP5p wlUizYSJkz++SL0QLUSTwPIqQsa1jJh5o/QeSRohkMiCClxe/Konu2QL0PprMiYTpplJ+hrHfqZo c+CM0PRACSHIwReYuhFuG/p1cxmuRvJJc3xN43zl7So3LrJFyaRFi3GfNIpxWwE4YRI5SORJSKeP zsgrGES2hkMEDgx4lxSBU7yQfan0pL7j0n61LCms99LZgHsI96STLyMZGqgVGTJLbUgW0SO02usi pmDCsP0rWFyR5XJKc5RIGSUWSBzjz/higbZqwPxTxvag99bjmIxX13bD1iY0/McW+pITPDFvcDkD xrj49nrr/JBkYdNRNBbfHTHBAqEEKUDaxvjAR8eyrpKqCKh8XCRrZCeAdZK4Ay+0ogSKbcKweSI1 PePSSgGO3w3ENCaJyRkPilSRRLIuIiRlM+CBxrN89CuwyQRcdodwizmV90fPx9MDR1Kios6LbHID fMhFILTA61B1T0/uNVciw78zZ6F3qXFjJnXLAGFgV9nWsfVaPLiDtMVO5Hp79c27pHM50Z7ly72G lETMuFmsmELwaUVBaxiE6Y7uRtK1KUg9c9x3IYgkfxqKEoSUjpmM8kg56HYePb1RDoeE+wig/MRW UFVpsRAL/8rxXNdyQyw7+p0dZJiYcBDyhMmS865UszAN7V45iOJ6GI1FznMj1QQi9CCk9ITOWNBV ORpmHmh15xMQlh0ORHCIMh05R55xwckETSK3MVnoFYYOLI48tsq+Am86PQLzfyUVr7+gjUIr3c1v BkkaJL/egnnokAOBbuhQzJLrC8V7geIZJXeCaYA5OZdyigWzw49wcu3mF0kJsgRBsoIE0sUykZcm XHfMZklw7WidQxcKS4h8j1Ayd04rqtW6PB43ba7XlyJUB+RUIprKaWqcjjuu+SEx1XLCLYZ1KAMo xEEtrYrDRAjkVeL1rIGjCsIUabQ1j3XTs74NJbNVSsakQA2rZHM+AWKCAsS8WcfVsJl/7AGApPTS fYx/UvspQIrCSbwv1jHJkyGIh3qfqEfUqlK7l5qnVG09zCr63LiAyYQ8SHm0WmhCKyLqEHmuT7dx 6DHHpIMK+dgBcqwjgfZjOxiotcrxhhJ494KKqrqc9GtkDgf1si6gHDJEYJETfHj3YwM7BlBqlyEy rDi2x9cy4kPxNByKhfoQcUZXFQVQvSScsYncKISpaCHoRByOywwpkTFmwfwTMePi/vMzeh95Tgxl mcOVAZiwTDYp0gwUWMMLa6UbvUrNQXFC17qdP2R2r8AkRDNtSM+sQmGVPVdBFqA6s1jEVe4HMhB0 EdjzRXoOpPS9i35EVNv34uSHlyxhkDJJQVG44NwuF/xi7P+LuSKcKEhqj78cAA==