Commit cd70db66 authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/home/hf/work/29687/my50-29687
parents d5f2133b 02c81671

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -4945,7 +4945,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
      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));