From: Alexander Nozdrin
Date: December 22 2010 12:46pm
Subject: bzr commit into mysql-trunk-bugfixing branch (alexander.nozdrin:3465)
 Bug#59022
List-Archive: http://lists.mysql.com/commits/127504
X-Bug: 59022
Message-Id: <201012221247.oBMClmQE030256@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0440048646589003570=="

--===============0440048646589003570==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/alik/MySQL/bzr/00.build/mysql-trunk-bugfixing/ based on revid:tor.didriksen@stripped

 3465 Alexander Nozdrin	2010-12-22
      A patch for Bug#59022 (Valgrind warning in write_delayed() after InnoDB merge).
      
      Free allocated bitmap.

    modified:
      sql/sql_insert.cc
=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2010-11-29 16:27:58 +0000
+++ b/sql/sql_insert.cc	2010-12-22 12:46:55 +0000
@@ -1843,11 +1843,14 @@ public:
     : record(0), dup(dup_arg), ignore(ignore_arg), log_query(log_query_arg),
       binlog_rows_query_log_events(FALSE),
       forced_insert_id(0), query(query_arg), time_zone(0)
-    {}
+    {
+      write_set.bitmap= NULL;
+    }
   ~delayed_row()
   {
     my_free(query.str);
     my_free(record);
+    my_free(write_set.bitmap);
   }
 };
 


--===============0440048646589003570==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   rho3rlrkdbfz3fnv
# target_branch: file:///home/alik/MySQL/bzr/00.build/mysql-trunk-\
#   bugfixing/
# testament_sha1: 8a345420fd1ee8ed8642ce39581a11c471420246
# timestamp: 2010-12-22 15:46:59 +0300
# source_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# base_revision_id: tor.didriksen@stripped\
#   ri0jgqgqweybct6b
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT4K8NgAAXtfgFAQWGP//3cl
AwC////6UAPHve9VXjvak7i9wSiE0SPJpPQyGJqnqfqelNqeykH6nqamnoh6gyRMlPGAhJgRoAAA
aBoAZETAU0xJkyYjamgaAAAyANqSmBGQwTJo0R6gxGgNAANBJQhonqmm2ppqZpMI2jUyAADIA0M0
e3tsZl5+5Ruini7NG6V0CFGxWbe5zd0wIwH5teFKqqdMU93PUjUzyPse2CLqWrNjiuXT/Oq56sy8
1CCOeGfTo0PiNYKZ1hGu5vCBwEcK6Z82PSKKyYN5etOV76EUpK0mxuCh0r+Z5EbXXDuVUSrQhQCG
ZZdbjZV8YHlivQMPzJdRdWDfUAe54UYn8AwK2wsbc0gTqBpJr5Sxcb4uDTUM0LXHC/C8jMuHaK70
ep1wnisTrbZYCFAjflIOLQUBwJegKwOVlSJhUDfsyh6ZNn8J5IvWsMpeKgurQFNmJGsWgpe4F2Fg
gULUGeY0tSQSYKUwYIxFuYWhFwbnsBdKdasONfzStAVM7B4PzjCK4JmopaEBfcwxKBvEYCFWMSs7
tDpRmU0fYdyL4NUMiB6TUHCDYsCiBoXZzIXOGagumJyvRYvcsJqMbUcLFDoGorFcRA+FYU8fbTec
Ns/GiVRt2PJzxC49YTvUU6SfJzmy9WHXzfhHM3eih/fswcU1FsAXVi1kGDaq70QjS01SuDeWC1+3
x94qJ83YC1KNCHZozBm2Ipv8iudRat2ffk1j6c21HDM1vDYKk7m3QER41absbMCgBSTkSnT5m23Y
NcshB61wonUkoeAnwLiw/XgcSpXOXgeAurUZ7FyYCLr/C488ikdHx+fetbFjjBhwOL291sHIpnmw
MhlM2WuOxku9po1LjHpiwyIMbccwZ87hw8LAJlySDWZyRMrdkpNSb9BL4YePLdDKJtcme65km8Ty
hW6WFBzR/ZOKVSYHFLAulsziXzhwaljBh4XzpKzeivYPTSjh5kkYwC4ISYYLvzxmqC4LCCzLZTNV
tXQQcZYszkBXohatBlC+F5oOTJKEhh8cwFrKitraL4mdZI0Fhq0Ypi3JDr1weIwG5il4FxUlZvYQ
gAYpv0KPLxt6AqfiJBMxMhw086GiphrSIdDGl5R1n8CZJxucU+cgZlj1DrM7MM8odWGx6CPaqzEK
FxHWpHDkJgL+Mz4sXJlW2PWJNzYAUmQ0ovRkJ5d9mGiRJ7UKbzNhukYBRYukBIG3x9Ud5KomIkdo
to0ajrLW9gnIVLUVaJZxl72ZHRFhQ3AOAkxRZrxiPTW6gQUtdo4kSUNDEEpVqWmcd3f26cDEYmrY
aqU1yi3aYRO5CwCgoJ9x2H+LuSKcKEgfBXhsAA==


--===============0440048646589003570==--