Merge 10.2 into 10.3

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f8b91df7941..201567c0853 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1266,7 +1266,18 @@ values_loop_end:
 abort:
 #ifndef EMBEDDED_LIBRARY
   if (lock_type == TL_WRITE_DELAYED)
+  {
     end_delayed_insert(thd);
+    /*
+      In case of an error (e.g. data truncation), the data type specific data
+      in fields (e.g. Field_blob::value) was not taken over
+      by the delayed writer thread. All fields in table_list->table
+      will be freed by free_root() soon. We need to free the specific
+      data before free_root() to avoid a memory leak.
+    */
+    for (Field **ptr= table_list->table->field ; *ptr ; ptr++)
+      (*ptr)->free();
+  }
 #endif
   if (table != NULL)
     table->file->ha_release_auto_increment();