From: Martin Hansson Date: October 7 2010 8:20am Subject: bzr commit into mysql-5.5-bugteam branch (martin.hansson:3096) Bug#56423 List-Archive: http://lists.mysql.com/commits/120195 X-Bug: 56423 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1539105356==" --===============1539105356== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///data0/martin/bzr/bug56423/5.5bt-null_merge/ based on revid:alexander.nozdrin@stripped 3096 Martin Hansson 2010-10-07 Null merge of 5.1 version of fix for Bug#56423. --===============1539105356== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.hansson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.hansson@stripped\ # i0by5bd4otz8c2wl # target_branch: file:///data0/martin/bzr/bug56423/5.5bt-null_merge/ # testament_sha1: abec2c4c50a166f25b6fa5d46001b39166b7abff # timestamp: 2010-10-07 10:20:05 +0200 # source_branch: file:///data0/martin/bzr/bug56423/5.1bt/ # base_revision_id: alexander.nozdrin@stripped\ # ls60rb2tq5dpyb5c # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQz4Z90AAN1fgAAQWGP/91JD AAC/7//wQAJOYYZ04NETEmU8DSekJ4TaJPRPU9T0hkwymg0QKe0ajFNqADQB6gaDJJ6iDINPUNHp GEDQMjRkCSRMUyeqemjRpppqaZGgBpoNM7TsKJRNGwhTUhQfp2771DqrY0eNfOlP0yGuKPFh68W7 ESwqz719OswizWARkixNHLmkDmRfgF8EszPYBkmhNMuTBe3EG41JpLaFDskE06GXhsek/1cl57TW t6Nc+3Kw3jGW0pzU9M3ZvFKDBPLICfEmUZIhfLCmxxAgdLFkGI4bssbb03wjdNrGBGRAZneh1ufU 0aO4v1Az3H6MqcD9msHDRKXV3xuMCOCZrVBwyV4jvaBHRysjyAisxveL6CpVVujTVRHxYsAjkDIM cpgrOPP2zYZYgBdRHtCk7wpJNs6OMTUNr6PAEW5BexW1J6l3kIWxF+OAD4SyKy6d4E53gWL33gYL Hg8LuFRmAMgBJLJyhjAt3RCVLAmDPJJScZiuJmumIAi4JQjNrzUXOBdNaveA2URoyNX2gX+SMcgG zvFi63QCEpCYlw51XIa7nHm41I4V9oNrLTBEe74C02ZCdHRoYMVsKK5Kn7/ZvrDFYXbbSxf49rQy J7gaAFGoLsrGlRxA/jnZn0q7Org3FlVXkQIQiFAXmFCxkTioOgBUCsOmGENIaYJkNvgR6AYJy4OV fMNy0dmhOhK+jcqVC20Tkj34KhSxnJX1KlVPnApFAMVG6GW9tWtRJyFK0TKBW2aP2jY62yQYCpke 4sawWwAt+OT9JIaTNYFSAVmYGJmBfzFV/xdyRThQkAz4Z90= --===============1539105356==--