From: Date: January 29 2007 8:48am
Subject: bk commit into 4.1 tree (holyfoot:1.2599) BUG#25492
List-Archive: http://lists.mysql.com/commits/18933
X-Bug: 25492
Message-Id: <20070129074834.108F02C380B7@hfmain.localdomain>

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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-01-29 11:48:31+04:00, holyfoot@stripped +1 -0
  bug #25492 (Invalid deallocation in mysql_stmt_fetch)
  Operating with the prepared statements we don't alloc MYSQL_DATA structure,
  but use MYSQL_STMT's field instead (to increase performance by reducing
  malloc calls).
  So we shouldn't free this structure as we did before.

  libmysqld/lib_sql.cc@stripped, 2007-01-29 11:48:30+04:00, holyfoot@stripped +1 -1
    we only should free data->alloc here, as the 'data' is a member
    of STMT structure

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/25492/my41-25492

--- 1.135/libmysqld/lib_sql.cc	2007-01-29 11:48:34 +04:00
+++ 1.136/libmysqld/lib_sql.cc	2007-01-29 11:48:34 +04:00
@@ -269,7 +269,7 @@ int emb_unbuffered_fetch(MYSQL *mysql, c
     *row= NULL;
     if (data)
     {
-      free_rows(data);
+      free_root(&data->alloc,MYF(0));
       ((THD*)mysql->thd)->data= NULL;
     }
   }