From: Alexander Nozdrin Date: January 27 2010 8:46pm Subject: bzr commit into mysql-5.5-next-mr branch (alik:2961) Bug#45989 List-Archive: http://lists.mysql.com/commits/98398 X-Bug: 45989 Message-Id: <20100127204611.386012796E@quad> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_Acfsf4JJM/7jlssTUGWf7Q)" --Boundary_(ID_Acfsf4JJM/7jlssTUGWf7Q) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///mnt/raid/alik/MySQL/bzr/00.merges/mysql-next-mr-merge.2/ based on revid:alik@stripped 2961 Alexander Nozdrin 2010-01-27 [merge] Null-merge the following changeset from mysql-trunk-merge: ========================================================= revision-id: joro@stripped committer: Georgi Kodinov branch nick: B45989-5.1-bugteam timestamp: Mon 2010-01-18 17:50:46 +0200 message: Bug #45989 take 2 : memory leak after explain encounters an error in the query. Fixes a leak after materializing a GROUP BY subquery to a temp table when the subquery has a blob column in the SELECT list. Fixed by correctly destructing temporary buffers after doing the conversion. ========================================================= --Boundary_(ID_Acfsf4JJM/7jlssTUGWf7Q) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/alik@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/alik@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alik@stripped # target_branch: file:///mnt/raid/alik/MySQL/bzr/00.merges/mysql-next-\ # mr-merge.2/ # testament_sha1: 8700dd54c4f7261e961cf3dc41acb3ea7579d70c # timestamp: 2010-01-27 23:46:11 +0300 # source_branch: file:///mnt/raid/alik/MySQL/bzr/mysql-trunk-merge/ # base_revision_id: alik@stripped # # Begin bundle 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 4UJBe3pn5A== --Boundary_(ID_Acfsf4JJM/7jlssTUGWf7Q)--