summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-10-15 16:55:52 +0300
committerGeorgi Kodinov <kgeorge@mysql.com>2008-10-15 16:55:52 +0300
commit747351836c524cb15dfb0c5ed735921ab98acb6b (patch)
treed8a9334b90fd145c59e0959ff3bbd07a79ebd936 /sql/sql_insert.cc
parent017307f2163a068520374b3083895e246b7a4a60 (diff)
downloadmariadb-git-747351836c524cb15dfb0c5ed735921ab98acb6b.tar.gz
Bug #38693: leaked memory with blobs!
If delayed insert fails to upgrade the lock it was not freeing the temporary memory storage used to keep newly constructed blob values in memory. Fixed by iterating over the remaining rows in the delayed insert rowset and freeing the blob storage for each row. No test suite because it involves concurrent delayed inserts on a table and cannot easily be made deterministic. Added a correct valgrind suppression for Fedora 9. mysql-test/valgrind.supp: Added a vagrind suppression for Fedora 9 sql/sql_insert.cc: Bug #38693: free the blobs temp storage on error.
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 3f43c902faa..4eddcd17df1 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2585,6 +2585,11 @@ bool Delayed_insert::handle_inserts(void)
/* Remove all not used rows */
while ((row=rows.get()))
{
+ if (table->s->blob_fields)
+ {
+ memcpy(table->record[0],row->record,table->s->reclength);
+ free_delayed_insert_blobs(table);
+ }
delete row;
thread_safe_increment(delayed_insert_errors,&LOCK_delayed_status);
stacked_inserts--;