# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505101406-u4low2x26q6itck0 # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 7da5ed0f07d4fd02092a8e0023dd897dda262f90 # timestamp: 2010-05-05 13:14:31 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100504152556-\ # c4w9u17fafy98lem # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWftBnQoAAnJfgGAwW3///3cn H4q////wUAV4Pdo2wW2rbsoOt2QSVKfqn6SH+qMk0PUPNUP1TI09T9UAGgAAABJQEGhPRqNJk1PU aPSntI00yENqHoEaM01BKaQRNNE2pqfoAApiepo00DTTRoeoNADjJk00wmRkDAjE0YIwg0aYABBJ JNNCYJTepsk1PaaRplGNEaGmTCMmmTRocsk4zEmBMkJC93J2CbDiVuLTlzbdZ2ifjYXttzBqpu0b K9vbMmXmwCapXNVUIg1kt0HuwLlx8jTzGYRAgJAkIXdfKLCRfRWaDGYoJIbj3t4RqsWGXfkjMLZP NSSfLEUZyerOS5ip8H9FtFRLjGT4SEXibqTCXPtKfG4eE4rnT5EO3SOQIOfnlpN1ep8/IfzHBaEu tk4ucI5Qr1A9SnmdZUQPAZjpo0I5iNHjsG8ojoClOVVXguxT9NfamRB4MXFVzW3HpMHcKhRlxHRJ qttYzLYMc7cC0oRyRo7GJahXldpZnQJZJNDljB3uiQxf63CT2oXBWPE5h19NddYYG0chOAqlFdWw TIPgwaPHdda186yUWFsm4DZUaCuS3Ffq3VRTiLbcYSKQFpO4zI3Kr4Kr8LGw7NbGlByyNB953X5c Gcj2BM7P1BY8HrcKD1FVGPhFQE6cGXjbrRmLCibQNXXdcEmv6IwjexNZwIUlbWm+BDDJ7+m9EYQL KVQsV5AsbEjUcisMDcLwctXLQ42bBm98v4bNQQuZgHClHNWfoNg9ta1LIeqmaiBYuXw27b9bm3K0 UJvL043qJgnF5rN9xtFrgL814LQn/1PIcXLkU1vLVr6sdGRslVpTcWRTYQM3ZmgzNM6rQtsVlibK My0rUKVtLx3mTtiqwLjFVyy5/05uvTbSmRhqgMJp+ZqCMU7vUkRHQhe05UNuRhwLAUFkMBHqRBc3 Aze+EnJweGlIsWs1dqcB/PUNlkwzM352fp/Yj0ClHni/aPOYiRahtN3gi+ARCQVhWfgPsiVaHvBh PfuxRpR4B8w9IaaaU7JiHUu5NKpp66ZS2ImRNwhNqOBQI7Tx9qXRxYJY+9aE4O/6CM2qhkQKLIxu S1lojgmtRfR2QsbrHMZ6xzxEWc0GW8/RNmzo7ukBxyhTF2c5lAqXxR0HEH9rLVOoHT20mAaar0Do hM4SZcGQlcOndY1UoaBj05MilAO0x7qDDaQMV6+TBcV+6WGBzYVbz4SwckqR0CJO6PdomXTKccZt hr0FJGDus4kjWeWmggG4HZJwNOazlTCKiJMDI+5GciZEk8DbNoDYWWoesgTziJlHIFt5SrdhkyLK rlShC+YlbQUHpu4h7NXF4MXcatlOtWh6TmMqPwQOLhSwBtDYDFbBfM1qUeDGMrN6KzKJxA1DGWu4 LkoI71Dep1hXWVLbe+SlBTlQb4pjhN4jhcse/mIsymTC42n9DAR7QtBaTw94OWE+NaIBqBiAiFIk yuO9NQFORln07RSpayK2egqZhLmEZCo7zMmuVA8kJSsihpguTQSkQSF5MF8Fi4xSfWaRDBFBItqK GJkngGKdpETdDtv1tvz3WJJhM/OUIRPIFs5ebc4PYS7RidBwPR4iVAUrW5UbuWQWyKaWOl5nqMdh M8YJgvVyX9nE2mzE3VIVKVVcAqmIPQTSuQyKV2HUzBicy0q8tQK1S2wkHijodvtJWJV7olpe8ZrF zrPSRuMRVOgdKqLkpFgxTMjnxPW+lhujh5jfF1D3kArE95aFYxIxRAlpHD1MzwtTWXphFiiNPguI uHdvSznIrVzIYX3qWjnmIiC5+31Jx7xaeNSsMMTOSdjRPd2LZFJlUg5Xfrdb/4u5IpwoSH2gzoUA