Commit 0b54a5c3 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix error handling in last patch (BLOB's in temporary tables) if 

create_tmp_table fails.
parent 302a43f0

sql/sql_select.cc

+5 −0
Original line number Diff line number Diff line
@@ -3749,6 +3749,11 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, 
    DBUG_RETURN(table);



 err:

  /*

    Hack to ensure that free_blobs() doesn't fail if blob_field is not yet

    complete

  */

  *table->blob_field= 0;

  free_tmp_table(thd,table);                    /* purecov: inspected */

  bitmap_clear_bit(&temp_pool, temp_pool_slot);

  DBUG_RETURN(NULL);				/* purecov: inspected */