2677 Georgi Kodinov 2008-10-21 [merge]
merge 5.1-bugteam -> bug 38693-5.1-bugteam
modified:
mysql-test/r/log_tables.result
mysql-test/t/log_tables.test
sql/event_scheduler.cc
sql/log.cc
sql/sql_class.cc
=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc 2008-10-15 07:55:15 +0000
+++ b/sql/sql_insert.cc 2008-10-21 07:55:03 +0000
@@ -2753,6 +2753,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--;
| Thread |
|---|
| • bzr push into mysql-5.1 branch (kgeorge:2677) | Georgi Kodinov | 21 Oct |