From: marko.makela Date: June 22 2010 11:59am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3518) Bug#54686 List-Archive: http://lists.mysql.com/commits/111764 X-Bug: 54686 Message-Id: <201006221200.o5MB59iT019963@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1967441793==" --===============1967441793== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjExNTIxNS1reHR6 eDd4dXVnY3hkMzc1CgogMzUxOCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIENoYW5n ZUxvZyBmb3IgQnVnIzU0Njg2ICJmaWVsZC0+Y29sLT5tdHlwZSA9PSB0eXBlIiBhc3NlcnRpb24g ZXJyb3IgYXQgcm93L3JvdzBzZWwuYwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9k Yl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn aW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlk Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjIyMTE1MjE1LWt4dHp4N3h1dWdjeGQzNzUK KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFA b3JhY2xlLmNvbS0yMDEwMDYyMjExNTk0OS14a24yYWtranBwd2hoczVjCkBAIC0xLDMgKzEsOSBA QAorMjAxMC0wNi0yMglUaGUgSW5ub0RCIFRlYW0KKworCSogaGFuZGxlci9oYV9pbm5vZGIuY2M6 CisJRml4IEJ1ZyM1NDY4NjogImZpZWxkLT5jb2wtPm10eXBlID09IHR5cGUiIGFzc2VydGlvbiBl cnJvciBhdAorCXJvdy9yb3cwc2VsLmMKKwogMjAxMC0wNi0yMQlUaGUgSW5ub0RCIFRlYW0KIAog CSogZGljdC9kaWN0MGxvYWQuYywgZmlsL2ZpbDBmaWwuYzoKCg== --===============1967441793== 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: e4d80f74eb5f7b9aa098dddeaeafe34159903322 # timestamp: 2010-06-22 15:00:01 +0300 # base_revision_id: marko.makela@stripped\ # kxtzx7xuugcxd375 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUxvdYoAAZLflAAwWnP/918m BAC////wBAAIAFADrXt2qJ71sg9dwlEp6FPaSeo2psEamNR5PVPUGgaHqNDQNCBGjZU0niajQ0NA 0AAAAJSJgmqPKb1J6EMnoCaGIeoGmjamA2qSm8qep5Twp+lPJqemU9RkeoPU9RoMgBgkkE0TU9qa TNT0GUaehI0YTEAMQpKpRj6YNsN+5pZPVoqMmdXIlbWEGRjJVbM4iXf5mZsL4tYyZfGw3f6+vTSN KBtW3hj+oQUl1R5FyJElKrS9FqNYqQnycBuHVH8HbxuENWJcR0nAYWVTyJ9MsjEbzMjkbWkdSRr1 YTro9zmwaQTGZI0HaCrH0WuIne8R2eeOd9tqxoKRb1wKSNAxSMsdnUCapGqnx7Stly65AKkIzCTR +rR+zF5bA3LapPyYgJS8hG+Fox4NTyrMXCi6rv2JEdUEE1TGCDm9NvTgVXlTVlrw8wwyFGFAY46z ybekMRMohURHiFJk4lG44cQswD3zBRRTyFhM6DYSPaS3s/UVvD0OoLrCwdEWzQjMWRK27kSOvAhf um17lQwQqNMMRSg11qJZ0KYeF2w06WuMG8OyHWuYrhEoDakzEyiq8ZtObuKTRFjtIRCnNHJOx9uy FK8WYKCxk0BRAS6EcJY66gwz3UfbVaZiGASw4q1FiLHkXJqWiVBKlsi/xO6+0ryeUHTx1nexpMUj 8VzZMfnMfrk3NvlcebEnhJxB+jTY8OXlAqtesW6Dac6arwTfS7xxBQqXumzJWgpkZOoe4kFRxi/I gVSKqj85bFQUVrfOVxQI+E2IqONUDxrjbpInGApJxZDzaGJ8DAXwmgpXZF2lUdE+ORyyw0la5CIY 0wT13jWm8o2SlA6+dwwKUyTr5mm60ux7N92BxdQGdg0e2umRmmZbK5iDLar9jDciHSK89UVF6Lqq OV5sYUkmgkCJGRmFE1pSWDh5w25tCpaXhcXqlsIKGspDxj+w410H3FuFNde4wJ9vumvI4jk4z8Az Sl667Y0moMjiGXlDlymK8x4YpH90hQJ4vAWwFcus3CmE3IDhNIY3ZujKXKmOZI8UjaHE5DOx0KT5 m2qEDtIwC4TG+hQBnucF3s84K1DmTLhUCfBWe4axKQsoFLH8SOIPWTlniEjTo0syceoUY1YeopPF 4OTBUC0RLEmQdkoHZ2gj0lNGR+QrJ0IAo1iT6JunxM8Bh9l4NJXU2jSQ5Ys3YZmlnOyjPz1DFIVB AwksXEoySfarC2NxNGXvSnSrRNeNKkOOk7DCkqCW2vKdw6FP4mx/xdyRThQkExvdYoA= --===============1967441793==--