Commit 7b9dce58 authored by kaa@kaamos.(none)'s avatar kaa@kaamos.(none)
Browse files

Merge kaamos.(none):/data/src/mysql-4.1 

into  kaamos.(none):/data/src/opt/mysql-4.1-opt
parents 289d3e82 367e7e87

libmysql/libmysql.c

+5 −8
Original line number Diff line number Diff line
@@ -4522,14 +4522,11 @@ my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt) 
  {

    MYSQL *mysql= stmt->mysql;



    if (result->data)

    {

    /* Result buffered */

    free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));

    result->data= NULL;

    result->rows= 0;

    stmt->data_cursor= NULL;

    }



    if (mysql && stmt->field_count &&

        (int) stmt->state > (int) MYSQL_STMT_PREPARE_DONE)

libmysqld/lib_sql.cc

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag) 
    DBUG_RETURN(0);



  field_count= list->elements;

  field_alloc= thd->current_stmt ? &thd->current_stmt->mem_root :

  field_alloc= thd->current_stmt ? &thd->current_stmt->result.alloc :

                                   &mysql->field_alloc;

  if (!(client_field= mysql->fields= 

	(MYSQL_FIELD *)alloc_root(field_alloc,