From: marko.makela Date: May 24 2010 11:44am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3480) Bug#53578 List-Archive: http://lists.mysql.com/commits/109079 X-Bug: 53578 Message-Id: <201005241144.o4OB33IL031821@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1657417022==" --===============1657417022== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExMDQzOS1mYXpp NzBybG10MDd0emQ5CgogMzQ4MCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTI0CiAgICAgIERvY3Vt ZW50IHRoZSBCdWcgIzUzNTc4IGZpeC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v ZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1 Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZp ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExMDQzOS1mYXppNzBybG10MDd0emQ5 CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxh QG9yYWNsZS5jb20tMjAxMDA1MjQxMTQzNDktNWthdzUyc3oweWg0c3prYgpAQCAtMSwzICsxLDkg QEAKKzIwMTAtMDUtMjQJVGhlIElubm9EQiBUZWFtCisKKwkqIGRpY3QvZGljdDBib290LmMsIGRp Y3QvZGljdDBjcmVhLmMsIGZpbC9maWwwZmlsLmMsCisJaW5jbHVkZS9kaWN0MGJvb3QuaCwgaW5j bHVkZS9maWwwZmlsLmgsIHJvdy9yb3cwbXlzcWwuYzoKKwlGaXggQnVnIzUzNTc4OiBhc3NlcnQg b24gaW52YWxpZCBwYWdlIGFjY2VzcywgaW4gZmlsX2lvKCkKKwogMjAxMC0wNS0xNAlUaGUgSW5u b0RCIFRlYW0KIAkqIG15c3FsLXRlc3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QsIG15c3FsLXRlc3Qv aW5ub2RiX2J1ZzQ4MDI0LnJlc3VsdCwKIAlkaWN0L2RpY3QwZGljdC5jLCBoYW5kbGVyL2hhX2lu bm9kYi5jYywgaGFuZGxlci9oYV9pbm5vZGIuaCwKCg== --===============1657417022== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marko.makela@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@stripped # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 209cbce69fef76c411d27d8db903e54999a02a5a # timestamp: 2010-05-24 14:44:10 +0300 # base_revision_id: marko.makela@stripped\ # fazi70rlmt07tzd9 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSSS47QAAZRflAAwWnf/918m BAC/7//wBAAIAFADoy9rtblk06toSSTRqYmVPMhkelTJ6h4hlPU2ptQ2p6J6gSkmJlJ+U2Rqnqek NomjQNAAA0AZEanqp4T0npE9I0eoMT1AAAAA5gEwAmAAEwABMAASSIGU0wTSYo/QGpimmjNRpk09 TRoYysXU8qXxPTj5GGBG8jRppSjM4ZznUQt3kG9OR6vmxVSvfI7ty92t3Ov79JW+j8/3nMTW2fyW RSsP8NBbbhX5JzI+c3Q6mh+7Ns+Km6FXQ+nbcIdkNoFIy1aM9FLozwl6w6uvJGqMLyRK+NCMsrF/ cjgSCqpIxmO8A6BHCM7bmPaighhR1wuLahFUKGA0pjRGVQ2xdWd4G4hu6nWgCppXDf4VFklirYUH yzk847T3N2nvUZt5jFhZtrv5l08KaIYd+15WxXnNGwe7wwSJL7HzIPLXbaU6dQ8wJC5geIFSoCwW QUG92CDMczGoOXhYtNaCBASahFQSKMGfgJlUWnMUv9o25HFUXIPfEXmbgrzT7hgeZmGCES6qZiUE 4WQeuLNCt7DIQm5JVm/eXZSLDQXYSK3XTFc7AkpGpstRUUClVEFpuEZxdzZVGuA53lUxHmVF22FR KBRpAjY1IPIO3FsqWp0Ciy1qq7EWPJXJqGlIBPQ20zcqqyPc80b++03pHrClkx+sp1KI64WnmxCR PcPkyWRkDz2PJLpA43EEjjrxtw8UijvkqeGpI+22GXLMsijQj3oSK2X3FuyJwbhtue3YXbDXxo5G xYrwWUvrKzI1JNIZCb5fSD6aPhgxI5khxFIsrahPoxXeXaZJxtdFK0VaakakNhaULykCZnNiaSEO I8uV6kQmKqoxUr+DNhfqyZ9aqoJFQa5fkXDjHTcSua6U1unlaTq44ArqzmmTZL7+w1Xmq+JEJ06B sxMXk9xntNpJp3cF840EpST2Ehw4Dfvi42MRO3iw1ZKmDWY+YmwD2Wr60ymutXzFXyXcfDBG2PZN ieRQONB9WqCqf1k1XS5M4WHjyDt6WTXaDEUBa0j2hSGkFw9GDAKQpcD2SGpSGIluEFPMW9O6MMUj FI0BsHKEXTkLyjlGfCuhhM4uGIwoMAYIpf8hsEwVQoGve5kh8lfm53utQLLQG3oTHVI5hlXi5XKU oOyIvRCoZ9EcePRnLkm0ziQ/HYH1sAdJpNs2t2sKQ4GK4M6NUjOaegGmXjwxFbQRYLmJ+iJWZi5M pX9S1qsxuaaEcpQEAeyu4ryzZD0G12RfAH3g/KVCpHrZWoizZrqhT51QOXAeKn/Ffr/xdyRThQkC SS47QA== --===============1657417022==--