summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-10-15 01:52:41 +0300
committerunknown <monty@hundin.mysql.fi>2002-10-15 01:52:41 +0300
commitfab06ac587b5a0714fe962e687ae28f68c205bfd (patch)
tree1b7f1b433636f0fd762fb93a0561e3848cf10fde /sql
parente11dfa3763b66b43de3acabd27288867d0841988 (diff)
downloadmariadb-git-fab06ac587b5a0714fe962e687ae28f68c205bfd.tar.gz
Fix error handling in last patch (BLOB's in temporary tables) if
create_tmp_table fails.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8cf51e13759..49502a7a116 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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 */