bk commit into 5.0 tree (holyfoot:1.2527) BUG#29687

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 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-07-16 19:08:07+05:00, holyfoot@stripped +1 -0
  Bug #29687 mysql_stmt_store_result memory leak in libmysqld
  
  In embedded server we use result->alloc to store field data for the
  result, but we didn't clean the result->alloc if the query returned
  an empty recordset. Cleaning for the empty recordset enabled

  libmysql/libmysql.c@stripped, 2007-07-16 19:08:05+05:00, holyfoot@stripped +1 -1
    Bug #29687 mysql_stmt_store_result memory leak in libmysqld
    
    we should clean result->alloc even if we have nothin in 'data' field

diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c
--- a/libmysql/libmysql.c	2007-07-06 11:34:06 +05:00
+++ b/libmysql/libmysql.c	2007-07-16 19:08:05 +05:00
@@ -4945,7 +4945,7 @@ static my_bool reset_stmt_handle(MYSQL_S
       Reset stored result set if so was requested or it's a part
       of cursor fetch.
     */
-    if (result->data && (flags & RESET_STORE_RESULT))
+    if (flags & RESET_STORE_RESULT)
     {
       /* Result buffered */
       free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));