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

--===============3397636909234156233==
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).
      
      Fix memory leak introduced by WL#5092 'RBR: Options for writing
      partial or full row images in RBR events'.
      
      Free memory which is allocated for column bitmap associated with
      each row to be processed by delayed insert handler thread.

    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 13:22:57 +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);
   }
 };
 


--===============3397636909234156233==
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\
#   0jya313x7yk4i2b7
# target_branch: file:///home/alik/MySQL/bzr/00.build/mysql-trunk-\
#   bugfixing/
# testament_sha1: d74b36f500de2aeac4163c889fa2cd0274aed5e3
# timestamp: 2010-12-22 16:23:02 +0300
# source_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# base_revision_id: tor.didriksen@stripped\
#   ri0jgqgqweybct6b
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfkcSt8AAZ7fgFAQWOP//3cl
k4C////6UARO7hJcMhrBlsJRNQE01M0TYTTIT00SeQMiaeoNA9T1BJIgZBqMptNE0ZTTbVNGmjQa
ADI9QJQpgjKnplPIptpBBoD0J5TABMjAqeoYhMJoZMT0mhiA00ZAMhiYhzCYBMAJhMJpgAAEyaaB
mDAS5+tTvrypKaoqIurDdq40Q9qs6tXI80suQEYISRqYwAB1Hc6pEgCWAWFcmQiA0vooghQubrqz
D9CSL0oMNP4Quf0hDgaMpetmzV57jbXsOkw/cnYtzuG3h39PylkMonVHP84KX7+526IrTyEY7cIc
+V6xl4kPecO+mUUaUjao3OS5nWz0zC7G48U6YdfYdAihJaM9b1F5V6GJlGA7evcKm0XVQC7P2OKd
hi5+lPmsmQWVVvo0YOwvzsFKArCSnN8pLV46u/UjbrKZNZ02YmTiui2rCIhyDhChPEwsBLXK4SKZ
YxcsLmQkWiNRY6/Yo99GsKssBGEwKmyIvLtSkUwiJPFjMkmTBTTvGqK3i6KiBmvMwu/rq/uwUH+E
nVpuXSEwsNBTAtI3NlZU8nMNdlKvTHUqNBjXitDFQrXPKXqzdeE1WSuuCDR9gqtNVu7g9dDRVRoW
OnUSSuvFjdKi+RhlEsKaLPbY1tGsadzEnLAocQPsiuV4hCCFYU3eNHEv0V99WJRt3PwegELz7wki
qqzn47Ln3xuk39ZNQvn/OTR8cc7dyKHr6uHjUMEIlo3DSWco9PFEHJfvdvGyY4A1wetxsFu/PR/B
VTJ6AVSpNkQ5rG8O8pGhwGg1QeBQoni0+lJdBYvn5WP8Sv3Y3oYUukkVy7Z7bE3tPAnx2bt7pnuZ
I0QSL5KJiiDUtm7Di4eV0LjGlNCacHGZVzq7lSBMpLzD4BUA2kwN9+C82BGdW72x8x40GqXY0i1u
XDhBxTFuW+DFhsidscsRbTriWXKfS3Pfl2Lm+HEBQZUxmcFTK/mUCpoYULZrXqVfNcgSARp3pBUa
6CZKlmO0secbXNMdmXhqyZo62QvvmZuznALfLCg8rD/VNqZ5/ArsQsDFfjtIN84OyJY4nEWqf4bP
r3k3W4kWTEE0Je4kM5RQPuFr34wmi7ODGKcI4LwrJUoXuTZ0yYM29NxicIxVrndwE7jDQG1IYrjg
FwPcD0xPFIYx6PzADNslzudWdwKG5bVRWsZy/KqPVneRgVxPJ7lW0QpTknWVPQyB7g6+BG3lu7Et
U8IBYhhgZX4SIc1W1jYhVbmW9piJzNWuSQwOXa60YlSfKSWsoknV5My3OnIb7Mpp6f9XmZK1EHKv
IYuc4GEMks+GeqhFt8jzx4Jut6RboC5Xz236StqEwgsoKhqrc4xZdaXvCYxc0gWSXS5+pY/lmKFq
zQ2FXFa8ZPojncxS4dUyMabsT6vbbDRQzFGtlS9WBajS1LKjzYmg8OF2AxgX129E0LVqROYF9yLa
sYvp1ddm8hJAKBnJtLpzKg28R9Jz3Ee4DVmIEyZKs/Z7i7kinChIfI4lb4A=


--===============3397636909234156233==--