MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:guilhem Date:November 22 2005 1:27pm
Subject:bk commit into 5.1 tree (guilhem:1.1972) BUG#15132
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1972 05/11/22 14:27:25 guilhem@stripped +2 -0
  Fix for BUG#15132 "RBR: memory leak when updating large rows";
  just a bitmap_free() in Rows_log_event's destructor.

  mysql-test/std_data/rpl_timezone2.dat
    1.1 05/11/22 14:27:20 guilhem@stripped +2 -0
    resurrecting this file needed by rpl_row_timezone test

  sql/log_event.cc
    1.193 05/11/22 14:27:20 guilhem@stripped +7 -0
    If the Rows_log_event's bitmap buffer has been my_malloced we need to my_free it.

  mysql-test/std_data/rpl_timezone2.dat
    1.0 05/11/22 14:27:20 guilhem@stripped +0 -0
    BitKeeper file /home/mysql_src/mysql-5.1/mysql-test/std_data/rpl_timezone2.dat

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1

--- 1.192/sql/log_event.cc	2005-11-21 16:40:12 +01:00
+++ 1.193/sql/log_event.cc	2005-11-22 14:27:20 +01:00
@@ -5061,6 +5061,13 @@
 
 Rows_log_event::~Rows_log_event()
 {
+  /*
+    This test is the same as in the constructors; if it is true then
+    m_cols.bitmap was not my_malloced so should not be my_free()d.
+  */
+  if (m_width <= sizeof(m_bitbuf)*8)
+    m_cols.bitmap= 0;
+  bitmap_free(&m_cols); // To pair with bitmap_init().
   my_free(m_rows_buf, MYF(MY_ALLOW_ZERO_PTR));
 }
 
--- New file ---
+++ mysql-test/std_data/rpl_timezone2.dat	05/11/22 14:27:20
20040101000000,NULL
20040611093902,NULL

Thread
bk commit into 5.1 tree (guilhem:1.1972) BUG#15132guilhem22 Nov