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

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

create_tmp_table fails.
parent 302a43f0
...@@ -3749,6 +3749,11 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ...@@ -3749,6 +3749,11 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
DBUG_RETURN(table); DBUG_RETURN(table);
err: 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 */ free_tmp_table(thd,table); /* purecov: inspected */
bitmap_clear_bit(&temp_pool, temp_pool_slot); bitmap_clear_bit(&temp_pool, temp_pool_slot);
DBUG_RETURN(NULL); /* purecov: inspected */ DBUG_RETURN(NULL); /* purecov: inspected */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment