bk commit into 5.2 tree (cbell:1.2548)

[cbell]

Below is the list of changes that have just been committed into a local
5.2 repository of cbell. When cbell 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@stripped, 2007-07-03 12:00:03-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3570 : Default Driver
  WL-3776 : Snapshot Driver
  
  This patch corrects a memory deallocation issue discovered by valgrind.

  sql/backup/buffer_iterator.cc@stripped, 2007-07-03 11:59:49-04:00, cbell@mysql_cab_desk. +2 -1
    WL#3570 : Default Driver
    WL-3776 : Snapshot Driver
    
    This patch corrects a memory deallocation issue discovered by valgrind.
    The method get_base_ptr() was setting the memory pointer to 0. It should
    check to see if memory has not been allocated first before doing so. If
    memory was allocated, then the reset() method frees it. If memory was
    not allocated, setting the memory pointer to 0 is correct.

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.2_WL_3776

--- 1.3/sql/backup/buffer_iterator.cc	2007-07-03 12:00:15 -04:00
+++ 1.4/sql/backup/buffer_iterator.cc	2007-07-03 12:00:15 -04:00
@@ -198,6 +198,7 @@
   cur_bytes_read= 0;
   ptr= buffer;
   cur_ptr= 0;
-  buffer= 0;
+  if (!alloc_used && buffer)
+    buffer= 0;
   DBUG_RETURN(ptr);
 }