merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.

mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 8762d3dc8fa..de58b506940 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -830,7 +830,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
       info.copied=values_list.elements;
       end_delayed_insert(thd);
     }
-    query_cache_invalidate3(thd, table_list, 1);
   }
   else
 #endif
@@ -2754,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--;