From: marko.makela Date: June 21 2010 9:51am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3516) Bug#54658 List-Archive: http://lists.mysql.com/commits/111666 X-Bug: 54658 Message-Id: <201006210952.o5L9q5xL025223@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1121765665==" --===============1121765665== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMTA5NDAwOC1vOWZh MTUzczNmMDltZXJ3CgogMzUxNiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIxCiAgICAgIEJ1ZyM1 NDY1ODogQWRkIENoYW5nZUxvZyBlbnRyeQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu bm9kYl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w bHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJl dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjIxMDk0MDA4LW85ZmExNTNzM2YwOW1l cncKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtl bGFAb3JhY2xlLmNvbS0yMDEwMDYyMTA5NTE0OC04ZzczazhrNjhkcGowODB1CkBAIC0xLDMgKzEs OSBAQAorMjAxMC0wNi0yMQlUaGUgSW5ub0RCIFRlYW0KKworCSogZGljdC9kaWN0MGxvYWQuYywg ZmlsL2ZpbDBmaWwuYzoKKwlGaXggQnVnIzU0NjU4OiBJbm5vREI6IFdhcm5pbmc6IGFsbG9jYXRl ZCB0YWJsZXNwYWNlICVsdSwKKwlvbGQgbWF4aW11bSB3YXMgMCAoaW50cm9kdWNlZCBpbiBCdWcg IzUzNTc4IGZpeCkKKwogMjAxMC0wNi0xNglUaGUgSW5ub0RCIFRlYW0KIAogCSogcm93L3JvdzBt ZXJnZS5jOgoK --===============1121765665== 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: 1875072221f484b3e76efefa9084dd392d576950 # timestamp: 2010-06-21 12:52:00 +0300 # base_revision_id: marko.makela@stripped\ # o9fa153s3f09merw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfo4VLEAAaXflAAwWnf/938m BIC////wBAAIAFADrU2zF53dnGpwaTQVM2hIxpmk9ET0ZT1MjT1DEG1NDQJSQYmTEjahMTQZGhoA aAAASSBGgQNU/IJNk9U0008mo0DQNGmgcwAEyYAEwmCYQwBGABJJGkYKNqZNqZlDTGSaAyAYho0I EaBK3e1Wccbrw/NmniDmqaRKCAtxnBctmTlcEo9+AvhRVZGEHu/uNP88LoYcXHDTul2fjzqWHkyc xv1VDael3JOZFSxzDwkpMWrBQ3kNvTECGi8WBoApqy/SiN1kMa3fdBEMhFN+Nsro0dtlCLhmSLla RBYEO++GiRP3PETiOV8/IUxyDYqB3a4csB5S+o1X3Cst0FdLlbPN32ZKBOTY9A13GGqOJ6pVrcWO orjk/HmErZ9pzmKQmuLxZcBFI2WrZFSsYUB6WTY8m55EMCgcZASxwSb6J4Q1hvGSAfIK+NsKGNbF W6tYFMdJF3JXCeqbJJpFzElrkM/fdM1mUc7AMTMR1Jvxqh5wt1VGgXz4PThyrh03m4ZpTC0auUCw wm6+2hk0fmpEGTMlRqEiYVJCJMajFUOcs6hIpUXF99zIxQt1XyjKsSwghTlKBLaXaaFlNFufY0wC OExCPiYJLH1FY1AhjrgY6oItGzG4VapIruL33TaUbAzQJOTUtImFM2yMezDaVe150dfdQX6REuyW dkw7bDlbczTVF3Aa2IiALjiFoKL7g0aoBlYmwrEUleQRrcXbTSkck88AVCO6h9EcS1UBVCQ5tBD8 6GLUC0xJLhCZRWYrYt5VF4MFDK9PcEqpC29Aos31lTRpKL7tpo0b6hdCkQgiF9Jc9hpUyJPhXMm0 yxSWc5PkokL78OZ+sLM8zr7uo3CutLMsULhzOexLJkOt1PmtQcAEKAIv2NowVWq19aOyHRrOtDbz FxENo4lSZG6bG6icpQ+dIgA6iOKAWFYN3flKtThn0jEEyauexI52JjP0MmLBPNDAwZCsN4Wxwkq5 sZUSYzt4JnwGETjb8YCwJpI/wpvPvhYWhm9bz7NAo6SoVoqxG/EGNIyqsJgmcJZIZUhjskwN1Zoz dZLFFKkeYjUuw4jO6NK6p8VHSdFbowHQYgEop4PYcjhT5kMleQ4YGXRmSILieco104BsqBSBnefa RpCdZ3LRKg1beHowZlAo4iqoj4a8FQksk9EcqyXqikUJs4+uMWTKEXnrT8z9tbMT0A0lnkoonsxH O4max0JwM9MsrhoWCUqSPGDVRFeaZstNi2pdgCVqWkb7lpqWQVxKntY42Fh/F3t/i7kinChIfRwq WIA= --===============1121765665==--