bzr commit into mysql-5.5 branch (luis.soares:3386) Bug#12558519

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/12558519/mysql-5.5/ based on revid:marc.alff@stripped

 3386 Luis Soares	2011-05-23
      BUG#12558519: RPL_TYPECONV PRODUCES VALGRIND STACK
      
      In RBR and in case of converting blob fields, the space allocated
      while unpacking into the conversion field was not freed after
      copying from it into the real field.
      
      We fix this by freeing the conversion field when the conversion
      table is not needed anymore (on close_tables_to_lock).

    modified:
      sql/log_event.cc
      sql/rpl_rli.cc
      sql/table.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-03-25 12:13:17 +0000
+++ b/sql/log_event.cc	2011-05-23 09:17:17 +0000
@@ -8441,6 +8441,7 @@ int Table_map_log_event::do_apply_event(
                 m_field_metadata, m_field_metadata_size,
                 m_null_bits, m_flags);
     table_list->m_tabledef_valid= TRUE;
+    table_list->m_conv_table= NULL;
     table_list->open_type= OT_BASE_ONLY;
 
     /*

=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc	2011-03-01 16:39:28 +0000
+++ b/sql/rpl_rli.cc	2011-05-23 09:17:17 +0000
@@ -1254,6 +1254,16 @@ void Relay_log_info::clear_tables_to_loc
       tables_to_lock->m_tabledef.table_def::~table_def();
       tables_to_lock->m_tabledef_valid= FALSE;
     }
+
+    /*
+      If blob fields were used during conversion of field values 
+      from the master table into the slave table, then we need to 
+      free the memory used temporarily to store their values before
+      copying into the slave's table.
+    */
+    if (tables_to_lock->m_conv_table)
+      free_blobs(tables_to_lock->m_conv_table);
+
     tables_to_lock=
       static_cast<RPL_TABLE_LIST*>(tables_to_lock->next_global);
     tables_to_lock_count--;

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2011-03-25 14:03:44 +0000
+++ b/sql/table.cc	2011-05-23 09:17:17 +0000
@@ -2188,7 +2188,8 @@ void free_blobs(register TABLE *table)
   for (ptr= table->s->blob_field, end=ptr + table->s->blob_fields ;
        ptr != end ;
        ptr++)
-    ((Field_blob*) table->field[*ptr])->free();
+    if (table->field[*ptr])
+      ((Field_blob*) table->field[*ptr])->free();
 }
 
 


Attachment: [text/bzr-bundle] bzr/[e-mail]